projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-09-04 18:29:20 by ken]
[ghc-hetmet.git]
/
mk
/
bootstrap.mk
diff --git
a/mk/bootstrap.mk
b/mk/bootstrap.mk
index
30dfa3f
..
ed01970
100644
(file)
--- 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.
#
#
# Makefile rules for booting from .hc files without a driver.
#
@@
-41,13
+41,22
@@
endif
ifeq "$(rs6000_TARGET_ARCH)" "1"
PLATFORM_CC_OPTS += -static
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
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)
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 \
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 \
-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/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" \
-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 "PrelIOBase_NonTermination_closure" \
-u "PrelIOBase_BlockedOnDeadMVar_closure" \
-u "PrelWeak_runFinalizzerBatch_closure" \
- -u "__init_Prelude" \
+ -u "__stginit_Prelude" \
-u "PrelMain_mainIO_closure" \
-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))
ifeq "$(GhcLibsWithReadline)" "YES"
HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline))
@@
-116,6
+127,17
@@
endif
# -----------------------------------------------------------------------------
# suffix rules for building a .o from a .hc file.
# -----------------------------------------------------------------------------
# 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/'`
%.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 $@ $<
%.o : %.s
$(CC) -c -o $@ $<
+
+endif