Modify the linker script to match the generated binary

[pintos-anon] / src / Make.config

diff --git a/src/Make.config b/src/Make.config
index 4dd2eb1cd6fc9e5ceaef2a7777c3f4a780e55923..14219b68ad462db8fdd16b01bfec577c5bb0912e 100644 (file)
--- a/src/Make.config
+++ b/src/Make.config
@@ -8,7 +8,7 @@ VPATH = $(SRCDIR)
 # 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 = i.86\|pentium.*\|[pk][56]\|nexgen\|viac3\|6x86\|athlon.*\|i86pc
 X86_64 = x86_64
 ifneq (0, $(shell expr `uname -m` : '$(X86)'))
   CC = gcc
@@ -33,12 +33,22 @@ endif
 # Compiler and assembler invocation.
 DEFINES =
 WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
-CFLAGS = -g -msoft-float -O
+CFLAGS = -g -msoft-float -O -march=i686
 CPPFLAGS = -nostdinc -I$(SRCDIR) -I$(SRCDIR)/lib
 ASFLAGS = -Wa,--gstabs
 LDFLAGS = 
 DEPS = -MMD -MF $(@:.o=.d)
 
+# Turn off -fstack-protector, which we don't support.
+ifeq ($(strip $(shell echo | $(CC) -fno-stack-protector -E - > /dev/null 2>&1; echo $$?)),0)
+CFLAGS += -fno-stack-protector
+endif
+
+# Turn off --build-id in the linker, which confuses the Pintos loader.
+ifeq ($(strip $(shell $(LD) --help | grep -q build-id; echo $$?)),0)
+LDFLAGS += -Wl,--build-id=none
+endif
+
 %.o: %.c
        $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES) $(DEPS)