summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marlow <simonmar@microsoft.com>2006-05-15 09:00:31 +0000
committerSimon Marlow <simonmar@microsoft.com>2006-05-15 09:00:31 +0000
commitf0c000ef6c996a3654f64f97b39e58d3b3d68dd6 (patch)
tree853096040df8487b1bf1bda6707424441f076fac
parent3a7fa9bb3cee6c1b4c26bc5ba91f9afe97fa502f (diff)
downloadhaskell-f0c000ef6c996a3654f64f97b39e58d3b3d68dd6.tar.gz
match up more closely with compiler/main/DynFlags.hs:machdepCCOpts
In particular, add -fno-builtin to x86 and x86_64, which was missing.
-rw-r--r--mk/bootstrap.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index e1eb3a723b..d0713311b9 100644
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -18,11 +18,15 @@ PLATFORM_HC_BOOT_CC_OPTS =
ifeq "$(i386_TARGET_ARCH)" "1"
PLATFORM_CC_OPTS += -DDONT_WANT_WIN32_DLL_SUPPORT
-PLATFORM_HC_BOOT_CC_OPTS += -fno-defer-pop -fomit-frame-pointer
+PLATFORM_HC_BOOT_CC_OPTS += -fno-defer-pop -fomit-frame-pointer -fno-builtin
+endif
+
+ifeq "$(x86_64_TARGET_ARCH)" "1"
+PLATFORM_HC_BOOT_CC_OPTS += -fomit-frame-pointer -fno-asynchronous-unwind-tables -fno-unit-at-a-time -fno-builtin
endif
ifeq "$(hppa_TARGET_ARCH)" "1"
-PLATFORM_CC_OPTS += -static -D_HPUX_SOURCE
+PLATFORM_CC_OPTS += -D_HPUX_SOURCE
endif
ifeq "$(powerpc_TARGET_ARCH)" "1"