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

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index e712ed5..03b4eb1 100644
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.11 2001/05/25 10:53:59 simonmar Exp $
+# $Id: bootstrap.mk,v 1.15 2001/09/23 21:29:35 ken Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -41,13 +41,22 @@ 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"
 PLATFORM_CC_OPTS += -mno-cygwin
 endif
 
+ifeq "$(alpha_TARGET_ARCH)" "1"
+PLATFORM_CC_OPTS += -static -w
+PLATFORM_HC_BOOT_CC_OPTS +=
+endif
+
+ifeq "$(sparc_TARGET_ARCH)" "1"
+PLATFORM_HC_BOOT_CC_OPTS += -w
+endif
+
 PLATFORM_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) 
 
 HC_BOOT_CC_OPTS = $(PLATFORM_HC_BOOT_CC_OPTS) $(PLATFORM_CC_OPTS) $(CC_OPTS)
@@ -101,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)
 
@@ -118,6 +127,17 @@ endif
 # -----------------------------------------------------------------------------
 # suffix rules for building a .o from a .hc file.
 
+ifeq "$(BootingFromUnregisterisedHc)" "YES"
+
+# without mangling
+
+%.o : %.hc
+	$(CC) -x c $< -o $@ -c -O $(HC_BOOT_CC_OPTS) -I.  `echo $(patsubst -monly-%-regs, -DSTOLEN_X86_REGS=%, $(filter -monly-%-regs, $($*_HC_OPTS))) | sed 's/^$$/-DSTOLEN_X86_REGS=4/'`
+
+else
+
+# with mangling
+
 %.raw_s : %.hc
 	$(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/'`
 
@@ -126,3 +146,5 @@ endif
 
 %.o : %.s
 	$(CC) -c -o $@ $<
+
+endif