From: Simon Marlow <simonmar@microsoft.com>
Date: Mon, 15 May 2006 09:00:31 +0000 (+0000)
Subject: match up more closely with compiler/main/DynFlags.hs:machdepCCOpts
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=f0c000ef6c996a3654f64f97b39e58d3b3d68dd6;p=ghc-hetmet.git

match up more closely with compiler/main/DynFlags.hs:machdepCCOpts
In particular, add -fno-builtin to x86 and x86_64, which was missing.
---

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index e1eb3a7..d071331 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"