Add i86pc to unames detected as x86 (used by Solaris).

[pintos-anon] / src / Make.config

diff --git a/src/Make.config b/src/Make.config
index becc4744728a84bad482f1dec78d3d638c951968..16db6d5271a25cc4dcb11373ae088be2653e722f 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,13 +33,14 @@ endif
 # Compiler and assembler invocation.
 DEFINES =
 WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
-CFLAGS = -g -MMD -msoft-float -O
+CFLAGS = -g -msoft-float -O
 CPPFLAGS = -nostdinc -I$(SRCDIR) -I$(SRCDIR)/lib
-ASFLAGS = -Wa,--gstabs -MMD
+ASFLAGS = -Wa,--gstabs
 LDFLAGS = 
+DEPS = -MMD -MF $(@:.o=.d)
 
 %.o: %.c
-       $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES)
+       $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES) $(DEPS)
 
 %.o: %.S
-       $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES)
+       $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES) $(DEPS)