X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbootstrap.mk;h=930d4bee56d24c59dfea946d49571e0d48d2dc1a;hb=6e5df3a4551b8d8b83e936b3f7b52edfc778ca8a;hp=614878b626ea2e3de0fd7286ee4add9343ce5612;hpb=dff6ab2d210ff6139aaea38bef16c0ae2d1a005a;p=ghc-hetmet.git diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk index 614878b..930d4be 100644 --- a/mk/bootstrap.mk +++ b/mk/bootstrap.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: bootstrap.mk,v 1.18 2002/01/15 05:39:15 sof Exp $ +# $Id: bootstrap.mk,v 1.22 2002/08/14 14:06:25 sof Exp $ # # Makefile rules for booting from .hc files without a driver. # @@ -57,11 +57,15 @@ ifeq "$(sparc_TARGET_ARCH)" "1" PLATFORM_HC_BOOT_CC_OPTS += -w endif +ifeq "$(BootingFromUnregisterisedHc)" "YES" +PLATFORM_HC_BOOT_CC_OPTS +=-DNO_REGS -DUSE_MINIINTERPRETER +endif + PLATFORM_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) HC_BOOT_CC_OPTS = $(PLATFORM_HC_BOOT_CC_OPTS) $(PLATFORM_CC_OPTS) $(CC_OPTS) -SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/ghc/includes -I$(FPTOOLS_TOP_ABS)/ghc/lib/std/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/lang/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/posix/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/util/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/text/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/hssource/cbits +SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/ghc/includes -I$(FPTOOLS_TOP_ABS)/libraries/base/include -I$(FPTOOLS_TOP_ABS)/hslibs/lang/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/posix/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/util/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/text/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/hssource/cbits # ----------------------------------------------------------------------------- # Linking: we have to give all the libraries explicitly. @@ -72,12 +76,16 @@ else UNDERSCORE= endif +ifeq "$(HaveLibGmp)" "NO" +DASH_L_GHC_RTS_GMP_DIR=-L$(FPTOOLS_TOP_ABS)/ghc/rts/gmp +endif 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 \ + $(DASH_L_GHC_RTS_GMP_DIR) \ + -L$(FPTOOLS_TOP_ABS)/libraries/base \ + -L$(FPTOOLS_TOP_ABS)/libraries/base/cbits \ + -L$(FPTOOLS_TOP_ABS)/libraries/haskell98 \ -L$(FPTOOLS_TOP_ABS)/hslibs/lang \ -L$(FPTOOLS_TOP_ABS)/hslibs/lang/cbits \ -L$(FPTOOLS_TOP_ABS)/hslibs/concurrent \ @@ -88,40 +96,39 @@ 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 "$(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) + -u "$(UNDERSCORE)GHCziBase_Izh_static_info" \ + -u "$(UNDERSCORE)GHCziBase_Czh_static_info" \ + -u "$(UNDERSCORE)GHCziFloat_Fzh_static_info" \ + -u "$(UNDERSCORE)GHCziFloat_Dzh_static_info" \ + -u "$(UNDERSCORE)GHCziPtr_Ptr_static_info" \ + -u "$(UNDERSCORE)GHCziWord_Wzh_static_info" \ + -u "$(UNDERSCORE)GHCziInt_I8zh_static_info" \ + -u "$(UNDERSCORE)GHCziInt_I16zh_static_info" \ + -u "$(UNDERSCORE)GHCziInt_I32zh_static_info" \ + -u "$(UNDERSCORE)GHCziInt_I64zh_static_info" \ + -u "$(UNDERSCORE)GHCziWord_W8zh_static_info" \ + -u "$(UNDERSCORE)GHCziWord_W16zh_static_info" \ + -u "$(UNDERSCORE)GHCziWord_W32zh_static_info" \ + -u "$(UNDERSCORE)GHCziWord_W64zh_static_info" \ + -u "$(UNDERSCORE)GHCziStable_StablePtr_static_info" \ + -u "$(UNDERSCORE)GHCziBase_Izh_con_info" \ + -u "$(UNDERSCORE)GHCziBase_Czh_con_info" \ + -u "$(UNDERSCORE)GHCziFloat_Fzh_con_info" \ + -u "$(UNDERSCORE)GHCziFloat_Dzh_con_info" \ + -u "$(UNDERSCORE)GHCziPtr_Ptr_con_info" \ + -u "$(UNDERSCORE)GHCziStable_StablePtr_con_info" \ + -u "$(UNDERSCORE)GHCziBase_False_closure" \ + -u "$(UNDERSCORE)GHCziBase_True_closure" \ + -u "$(UNDERSCORE)GHCziPack_unpackCString_closure" \ + -u "$(UNDERSCORE)GHCziIOBase_stackOverflow_closure" \ + -u "$(UNDERSCORE)GHCziIOBase_heapOverflow_closure" \ + -u "$(UNDERSCORE)GHCziIOBase_NonTermination_closure" \ + -u "$(UNDERSCORE)GHCziIOBase_BlockedOnDeadMVar_closure" \ + -u "$(UNDERSCORE)GHCziIOBase_Deadlock_closure" \ + -u "$(UNDERSCORE)GHCziWeak_runFinalizzerBatch_closure" \ + -u "$(UNDERSCORE)__stginit_Prelude" + +HC_BOOT_LIBS = -lHStext -lHStext_cbits -lHSutil -lHSposix -lHSposix_cbits -lHSconcurrent -lHSlang -lHSlang_cbits -lHShaskell98 -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS) ifeq "$(GhcLibsWithReadline)" "YES" HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline)) @@ -149,7 +156,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 - $(FPTOOLS_TOP)/$(GHC_MANGLER_DIR)/$(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS))) + $(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS))) %.o : %.s $(CC) -c -o $@ $<