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

diff --git a/src/Make.config b/src/Make.config
index b1d480e..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)),)