Make Pintos able to build with "gcc -m32" on x86-64 hosts without the

[pintos-anon] / src / Makefile.userprog

diff --git a/src/Makefile.userprog b/src/Makefile.userprog
index 447088e8e7896212d8b5ce91879a0854b43f4cd4..3631cf1b221b2a3bf3e5e0fb02457338a39132db 100644 (file)
--- a/src/Makefile.userprog
+++ b/src/Makefile.userprog
@@ -4,7 +4,6 @@ $(PROGS): CPPFLAGS += -I$(SRCDIR)/lib/user -I.
 
 # Linker flags.
 $(PROGS): LDFLAGS = -nostdlib -static -Wl,-T,$(LDSCRIPT)
-$(PROGS): LDLIBS = $(shell $(CC) -print-libgcc-file-name)
 $(PROGS): LDSCRIPT = $(SRCDIR)/lib/user/user.lds
 
 # Library code shared between kernel and user programs.
@@ -13,6 +12,7 @@ lib_SRC += lib/random.c                       # Pseudo-random numbers.
 lib_SRC += lib/stdio.c                 # I/O library.
 lib_SRC += lib/stdlib.c                        # Utility functions.
 lib_SRC += lib/string.c                        # String functions.
+lib_SRC += lib/arithmetic.c
 
 # User level only library code.
 lib/user_SRC  = lib/user/debug.c       # Debug helpers.
@@ -32,7 +32,7 @@ all: $(PROGS)
 define TEMPLATE
 $(1)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(1)_SRC)))
 $(1): $$($(1)_OBJ) $$(LIB) $$(LDSCRIPT)
-       $$(CC) $$(LDFLAGS) $$($(1)_OBJ) $$(LIB) $$(LDLIBS) -o $$@
+       $$(CC) $$(LDFLAGS) $$($(1)_OBJ) $$(LIB) -o $$@
 endef
 
 $(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog))))