X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMake.config;h=91c14d00623696983a47483f970e55a590f9bea3;hb=c4d3a0df42588f919931e786d398e418b6ce6179;hp=910ef121099486fc8dc0377a4f70523f6f128343;hpb=22acef028a140604f5b34705263ba70959fcf4f4;p=pintos-anon

diff --git a/src/Make.config b/src/Make.config
index 910ef12..91c14d0 100644
--- a/src/Make.config
+++ b/src/Make.config
@@ -6,16 +6,24 @@ VPATH = $(SRCDIR)
 
 # Binary utilities.
 # If the host appears to be x86, use the normal tools.
+# If it's x86-64, use the compiler and linker in 32-bit mode.
 # Otherwise assume cross-tools are installed as i386-elf-*.
 X86 = i.86\|pentium.*\|[pk][56]\|nexgen\|viac3\|6x86\|athlon.*
+X86_64 = x86_64
 ifneq (0, $(shell expr `uname -m` : '$(X86)'))
-CC = gcc
-LD = ld
-OBJCOPY = objcopy
+  CC = gcc
+  LD = ld
+  OBJCOPY = objcopy
 else
-CC = i386-elf-gcc
-LD = i386-elf-ld
-OBJCOPY = i386-elf-objcopy
+  ifneq (0, $(shell expr `uname -m` : '$(X86_64)'))
+    CC = gcc -m32
+    LD = ld -melf_i386
+    OBJCOPY = objcopy
+  else
+    CC = i386-elf-gcc
+    LD = i386-elf-ld
+    OBJCOPY = i386-elf-objcopy
+  endif
 endif
 
 ifeq ($(strip $(shell command -v $(CC) 2> /dev/null)),)
@@ -26,7 +34,7 @@ endif
 DEFINES =
 WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
 CFLAGS = -g -MMD -msoft-float
-CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib
+CPPFLAGS = -nostdinc -I$(SRCDIR) -I$(SRCDIR)/lib
 ASFLAGS = -Wa,--gstabs -MMD
 LDFLAGS =