X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMake.config;h=becc4744728a84bad482f1dec78d3d638c951968;hb=2dc702a30822c4773989f3bf5bc730848c0f473c;hp=fdf6ce164901a928f195355aadb1d588dc34baf5;hpb=8d59042da241701a5167acd38b08217977a93138;p=pintos-anon

diff --git a/src/Make.config b/src/Make.config
index fdf6ce1..becc474 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)),)
@@ -24,9 +32,8 @@ endif
 
 # Compiler and assembler invocation.
 DEFINES =
-WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers \
-	   -Wdeclaration-after-statement
-CFLAGS = -g -MMD -msoft-float
+WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
+CFLAGS = -g -MMD -msoft-float -O
 CPPFLAGS = -nostdinc -I$(SRCDIR) -I$(SRCDIR)/lib
 ASFLAGS = -Wa,--gstabs -MMD
 LDFLAGS =