X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbootstrap.mk;h=614878b626ea2e3de0fd7286ee4add9343ce5612;hb=dff6ab2d210ff6139aaea38bef16c0ae2d1a005a;hp=03b4eb1dd82166b299e919fd38558f41cdcb28a4;hpb=a5840900804a5e44e13c35c0acc9bb11d65d0da5;p=ghc-hetmet.git

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index 03b4eb1..614878b 100644
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.15 2001/09/23 21:29:35 ken Exp $
+# $Id: bootstrap.mk,v 1.18 2002/01/15 05:39:15 sof Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -50,7 +50,7 @@ endif
 
 ifeq "$(alpha_TARGET_ARCH)" "1"
 PLATFORM_CC_OPTS += -static -w
-PLATFORM_HC_BOOT_CC_OPTS +=
+PLATFORM_HC_BOOT_CC_OPTS += -mieee
 endif
 
 ifeq "$(sparc_TARGET_ARCH)" "1"
@@ -66,6 +66,13 @@ SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/ghc/includes -I$(FPTOOLS_TOP_ABS)/ghc/lib/st
 # -----------------------------------------------------------------------------
 # Linking: we have to give all the libraries explicitly.
 
+ifeq "$(LeadingUnderscore)" "YES"
+UNDERSCORE=_
+else
+UNDERSCORE=
+endif
+
+
 HC_BOOT_LD_OPTS =				\
    -L$(FPTOOLS_TOP_ABS)/ghc/rts			\
    -L$(FPTOOLS_TOP_ABS)/ghc/rts/gmp		\
@@ -81,38 +88,38 @@ HC_BOOT_LD_OPTS =				\
    -L$(FPTOOLS_TOP_ABS)/hslibs/util/cbits	\
    -L$(FPTOOLS_TOP_ABS)/hslibs/text		\
    -L$(FPTOOLS_TOP_ABS)/hslibs/text/cbits	\
-   -u "PrelBase_Izh_static_info"		\
-   -u "PrelBase_Czh_static_info"		\
-   -u "PrelFloat_Fzh_static_info"		\
-   -u "PrelFloat_Dzh_static_info"		\
-   -u "PrelPtr_Ptr_static_info"			\
-   -u "PrelWord_Wzh_static_info"		\
-   -u "PrelInt_I8zh_static_info"		\
-   -u "PrelInt_I16zh_static_info"		\
-   -u "PrelInt_I32zh_static_info"		\
-   -u "PrelInt_I64zh_static_info"		\
-   -u "PrelWord_W8zh_static_info"		\
-   -u "PrelWord_W16zh_static_info"		\
-   -u "PrelWord_W32zh_static_info"		\
-   -u "PrelWord_W64zh_static_info"		\
-   -u "PrelStable_StablePtr_static_info"	\
-   -u "PrelBase_Izh_con_info"			\
-   -u "PrelBase_Czh_con_info"			\
-   -u "PrelFloat_Fzh_con_info"			\
-   -u "PrelFloat_Dzh_con_info"			\
-   -u "PrelPtr_Ptr_con_info"			\
-   -u "PrelStable_StablePtr_con_info"		\
-   -u "PrelBase_False_closure"			\
-   -u "PrelBase_True_closure"			\
-   -u "PrelPack_unpackCString_closure"		\
-   -u "PrelIOBase_stackOverflow_closure"	\
-   -u "PrelIOBase_heapOverflow_closure"		\
-   -u "PrelIOBase_NonTermination_closure"	\
-   -u "PrelIOBase_BlockedOnDeadMVar_closure"	\
-   -u "PrelWeak_runFinalizzerBatch_closure"	\
-   -u "__stginit_Prelude"			\
-   -u "PrelMain_mainIO_closure"			\
-   -u "__stginit_PrelMain"
+   -u "$(UNDERSCORE)PrelBase_Izh_static_info"		\
+   -u "$(UNDERSCORE)PrelBase_Czh_static_info"		\
+   -u "$(UNDERSCORE)PrelFloat_Fzh_static_info"		\
+   -u "$(UNDERSCORE)PrelFloat_Dzh_static_info"		\
+   -u "$(UNDERSCORE)PrelPtr_Ptr_static_info"		\
+   -u "$(UNDERSCORE)PrelWord_Wzh_static_info"		\
+   -u "$(UNDERSCORE)PrelInt_I8zh_static_info"		\
+   -u "$(UNDERSCORE)PrelInt_I16zh_static_info"		\
+   -u "$(UNDERSCORE)PrelInt_I32zh_static_info"		\
+   -u "$(UNDERSCORE)PrelInt_I64zh_static_info"		\
+   -u "$(UNDERSCORE)PrelWord_W8zh_static_info"		\
+   -u "$(UNDERSCORE)PrelWord_W16zh_static_info"		\
+   -u "$(UNDERSCORE)PrelWord_W32zh_static_info"		\
+   -u "$(UNDERSCORE)PrelWord_W64zh_static_info"		\
+   -u "$(UNDERSCORE)PrelStable_StablePtr_static_info"	\
+   -u "$(UNDERSCORE)PrelBase_Izh_con_info"		\
+   -u "$(UNDERSCORE)PrelBase_Czh_con_info"		\
+   -u "$(UNDERSCORE)PrelFloat_Fzh_con_info"		\
+   -u "$(UNDERSCORE)PrelFloat_Dzh_con_info"		\
+   -u "$(UNDERSCORE)PrelPtr_Ptr_con_info"		\
+   -u "$(UNDERSCORE)PrelStable_StablePtr_con_info"	\
+   -u "$(UNDERSCORE)PrelBase_False_closure"		\
+   -u "$(UNDERSCORE)PrelBase_True_closure"		\
+   -u "$(UNDERSCORE)PrelPack_unpackCString_closure"	\
+   -u "$(UNDERSCORE)PrelIOBase_stackOverflow_closure"	\
+   -u "$(UNDERSCORE)PrelIOBase_heapOverflow_closure"	\
+   -u "$(UNDERSCORE)PrelIOBase_NonTermination_closure"	\
+   -u "$(UNDERSCORE)PrelIOBase_BlockedOnDeadMVar_closure"	\
+   -u "$(UNDERSCORE)PrelWeak_runFinalizzerBatch_closure"	\
+   -u "$(UNDERSCORE)__stginit_Prelude"				\
+   -u "$(UNDERSCORE)PrelMain_mainIO_closure"			\
+   -u "$(UNDERSCORE)__stginit_PrelMain"
 
 HC_BOOT_LIBS = -lHStext -lHStext_cbits -lHSutil -lHSposix -lHSposix_cbits -lHSconcurrent -lHSlang -lHSlang_cbits -lHSstd -lHSstd_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)
 
@@ -142,7 +149,7 @@ else
 	$(CC) -x c $< -o $@ -S -O $(HC_BOOT_CC_OPTS) -I.  `echo $(patsubst -monly-%-regs, -DSTOLEN_X86_REGS=%, $(filter -monly-%-regs, $($*_HC_OPTS))) | sed 's/^$$/-DSTOLEN_X86_REGS=4/'`
 
 %.s : %.raw_s
-	$(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
+	$(FPTOOLS_TOP)/$(GHC_MANGLER_DIR)/$(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
 
 %.o : %.s
 	$(CC) -c -o $@ $<