X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbootstrap.mk;h=ed0197016f56bb1a6af39e992f09358d5cf07a24;hb=fb7a723bfd7650a705cb226e07c5b08b7a8e9279;hp=30dfa3f5dc74006d1269a5c05492bb551ba7a764;hpb=617febd6097125325ea78502edcf369849e472d1;p=ghc-hetmet.git diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk index 30dfa3f..ed01970 100644 --- a/mk/bootstrap.mk +++ b/mk/bootstrap.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: bootstrap.mk,v 1.8 2001/05/01 09:22:45 simonmar Exp $ +# $Id: bootstrap.mk,v 1.14 2001/09/04 18:29:22 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 +PLATFORM_HC_BOOT_CC_OPTS += -w +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) @@ -59,6 +68,7 @@ SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/ghc/includes -I$(FPTOOLS_TOP_ABS)/ghc/lib/st HC_BOOT_LD_OPTS = \ -L$(FPTOOLS_TOP_ABS)/ghc/rts \ + -L$(FPTOOLS_TOP_ABS)/ghc/rts/gmp \ -L$(FPTOOLS_TOP_ABS)/ghc/lib/std \ -L$(FPTOOLS_TOP_ABS)/ghc/lib/std/cbits \ -L$(FPTOOLS_TOP_ABS)/hslibs/lang \ @@ -70,6 +80,7 @@ HC_BOOT_LD_OPTS = \ -L$(FPTOOLS_TOP_ABS)/hslibs/util \ -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" \ @@ -99,11 +110,11 @@ 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 -lHSutil -lHSposix -lHSposix_cbits -lHSconcurrent -lHSlang -lHSlang_cbits -lHSstd -lHSstd_cbits -lHSrts -lgmp $(EXTRA_HC_BOOT_LIBS) +HC_BOOT_LIBS = -lHStext -lHStext_cbits -lHSutil -lHSposix -lHSposix_cbits -lHSconcurrent -lHSlang -lHSlang_cbits -lHSstd -lHSstd_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS) ifeq "$(GhcLibsWithReadline)" "YES" HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline)) @@ -116,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/'` @@ -124,3 +146,5 @@ endif %.o : %.s $(CC) -c -o $@ $< + +endif