X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbootstrap.mk;h=cbd604116c6e93a3138e89acfb925b75ddbbfd69;hb=7fe540d8c382712d2eab02a05556ed168311ae2e;hp=fa5e846b576cdc50f737f927f96c27634ebd5c1c;hpb=a7373b8dfea393881f129dad25ebc2aebd43af35;p=ghc-hetmet.git

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index fa5e846..cbd6041 100644
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.13 2001/07/24 04:45:59 ken Exp $
+# $Id: bootstrap.mk,v 1.17 2001/09/25 18:08:48 ken Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -41,7 +41,7 @@ endif
 
 ifeq "$(rs6000_TARGET_ARCH)" "1"
 PLATFORM_CC_OPTS += -static
-PLATFORM_HC_BOOT_CC_OPTS += -static -finhibit-size-directive
+PLATFORM_HC_BOOT_CC_OPTS += -finhibit-size-directive
 endif
 
 ifeq "$(mingw32_TARGET_OS)" "1"
@@ -49,7 +49,12 @@ PLATFORM_CC_OPTS += -mno-cygwin
 endif
 
 ifeq "$(alpha_TARGET_ARCH)" "1"
-PLATFORM_CC_OPTS += -static -Xlinker -noprefix_recognition
+PLATFORM_CC_OPTS += -static -w
+PLATFORM_HC_BOOT_CC_OPTS += -mieee
+endif
+
+ifeq "$(sparc_TARGET_ARCH)" "1"
+PLATFORM_HC_BOOT_CC_OPTS += -w
 endif
 
 PLATFORM_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) 
@@ -105,9 +110,9 @@ HC_BOOT_LD_OPTS =				\
    -u "PrelIOBase_NonTermination_closure"	\
    -u "PrelIOBase_BlockedOnDeadMVar_closure"	\
    -u "PrelWeak_runFinalizzerBatch_closure"	\
-   -u "__init_Prelude"				\
+   -u "__stginit_Prelude"			\
    -u "PrelMain_mainIO_closure"			\
-   -u "__init_PrelMain"
+   -u "__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)
 
@@ -137,7 +142,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 $@ $<