X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbootstrap.mk;h=ff9f6456f465bafad006acd9d0f46d75a72a8110;hb=56e57eb56cb12c5d85dcddd3118069896e2e2471;hp=fa5e846b576cdc50f737f927f96c27634ebd5c1c;hpb=a7373b8dfea393881f129dad25ebc2aebd43af35;p=ghc-hetmet.git diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk index fa5e846..ff9f645 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.19 2002/05/14 08:25:46 matthewc 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,23 +49,35 @@ 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) 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. +ifeq "$(LeadingUnderscore)" "YES" +UNDERSCORE=_ +else +UNDERSCORE= +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 \ + -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 \ @@ -76,40 +88,40 @@ 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 "__init_Prelude" \ - -u "PrelMain_mainIO_closure" \ - -u "__init_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)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 -lHShaskell98 -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS) ifeq "$(GhcLibsWithReadline)" "YES" HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline)) @@ -137,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 $@ $<