projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Also clean bochsout.txt, bochsrc.txt.
[pintos-anon]
/
src
/
Make.config
diff --git
a/src/Make.config
b/src/Make.config
index 63d6a226ea5fb3d61c33ae4ef5ce3f8175010e11..becc4744728a84bad482f1dec78d3d638c951968 100644
(file)
--- a/
src/Make.config
+++ b/
src/Make.config
@@
-2,29
+2,41
@@
SHELL = /bin/sh
SHELL = /bin/sh
+VPATH = $(SRCDIR)
+
# Binary utilities.
# If the host appears to be x86, use the normal tools.
# 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.*
# 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)'))
ifneq (0, $(shell expr `uname -m` : '$(X86)'))
-CC = gcc
-LD = ld
-OBJCOPY = objcopy
+
CC = gcc
+
LD = ld
+
OBJCOPY = objcopy
else
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
endif
-# Other utilities.
-DD = dd
-RM = rm
-CAT = cat
+ifeq ($(strip $(shell command -v $(CC) 2> /dev/null)),)
+$(warning *** Compiler ($(CC)) not found. Did you set $$PATH properly? Please refer to the Getting Started section in the documentation for details. ***)
+endif
# Compiler and assembler invocation.
# Compiler and assembler invocation.
+DEFINES =
WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
-CFLAGS = -g -MMD -msoft-float
+CFLAGS = -g -MMD -msoft-float -O
+CPPFLAGS = -nostdinc -I$(SRCDIR) -I$(SRCDIR)/lib
ASFLAGS = -Wa,--gstabs -MMD
ASFLAGS = -Wa,--gstabs -MMD
+LDFLAGS =
%.o: %.c
$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES)
%.o: %.c
$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES)