projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
random: Fix behavior of kernel option "-rs".
[pintos-anon]
/
src
/
Make.config
diff --git
a/src/Make.config
b/src/Make.config
index 3279301160d7462aa3017c011a76a920189200db..e0afafbc9d77e15a98e3d0423a7d0d9344d3f5b7 100644
(file)
--- a/
src/Make.config
+++ b/
src/Make.config
@@
-33,10
+33,10
@@
endif
# Compiler and assembler invocation.
DEFINES =
WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
# 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
CPPFLAGS = -nostdinc -I$(SRCDIR) -I$(SRCDIR)/lib
ASFLAGS = -Wa,--gstabs
-LDFLAGS =
+LDFLAGS =
-z noseparate-code
DEPS = -MMD -MF $(@:.o=.d)
# Turn off -fstack-protector, which we don't support.
DEPS = -MMD -MF $(@:.o=.d)
# Turn off -fstack-protector, which we don't support.
@@
-45,7
+45,7
@@
CFLAGS += -fno-stack-protector
endif
# Turn off --build-id in the linker, which confuses the Pintos loader.
endif
# Turn off --build-id in the linker, which confuses the Pintos loader.
-ifeq ($(strip $(shell $(LD) --
build-id=none -e 0 /dev/null -o /dev/null 2>&1
; echo $$?)),0)
+ifeq ($(strip $(shell $(LD) --
help | grep -q build-id
; echo $$?)),0)
LDFLAGS += -Wl,--build-id=none
endif
LDFLAGS += -Wl,--build-id=none
endif