X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=3e86da98ec62cf72e81948b25d3da8c5ca3b321e;hb=3b9019a60acb7bc9da184c8df9fdeecd2bbb7235;hp=d6e489972980196f1a958c0a9dd58928a92f7951;hpb=f1696a9df009542ef44c05cbe15faf7e93fa3d5c;p=ghc-hetmet.git diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile index d6e4899..3e86da9 100644 --- a/ghc/rts/Makefile +++ b/ghc/rts/Makefile @@ -1,16 +1,15 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.12 1999/06/29 14:18:14 simonmar Exp $ - +# $Id: Makefile,v 1.36 2000/09/04 14:39:10 simonmar Exp $ +# # This is the Makefile for the runtime-system stuff. # This stuff is written in C (and cannot be written in Haskell). # -# We create two libraries. One, libHSrts.a, is built separately -# for each "way". The other, libHSclib.a is built once: it is just -# .lc files that end up the same no matter what, i.e. completely -# ordinary C. - +# .c files are vanilla C, +# .hc files are "Haskellized-C", compiled using the C compiler and +# (possibly) the assembly-mangler. The GHC driver script +# knows how to compile this stuff. +# # Other sorta independent, compile-once subdirs are: - # gmp -- GNU multi-precision library (for Integer) #----------------------------------------------------------------------------- @@ -19,11 +18,19 @@ TOP=.. DoingRTS=YES include $(TOP)/mk/boilerplate.mk +SplitObjs=NO + WAYS=$(GhcLibWays) -SRCS_RTS_C = $(wildcard *.c) $(wildcard hooks/*.c) $(filter-out gum/SysMan.c,$(wildcard gum/*.c)) +SRCS_RTS_C = $(wildcard *.c) $(wildcard hooks/*.c) $(filter-out parallel/SysMan.c,$(wildcard parallel/*.c)) SRCS_RTS_S = $(wildcard *.S) -SRCS_RTS_HC = $(wildcard *.hc) +SRCS_RTS_HC = $(wildcard *.hc) $(wildcard parallel/*.hc) + +ifneq "$(way)" "dll" +SRCS_RTS_C := $(filter-out RtsDllMain.c, $(SRCS_RTS_C)) +else +SRCS_RTS_C := $(filter-out Main.c, $(SRCS_RTS_C)) +endif #----------------------------------------------------------------------------- # creating and installing libHSrts.a (in its many flavors) @@ -43,7 +50,7 @@ WARNING_OPTS += -optc-Wmissing-prototypes WARNING_OPTS += -optc-Wmissing-declarations WARNING_OPTS += -optc-Winline WARNING_OPTS += -optc-Waggregate-return -WARNING_OPTS += -optc-Wpointer-arith +#WARNING_OPTS += -optc-Wpointer-arith WARNING_OPTS += -optc-Wbad-function-cast #WARNING_OPTS += -optc-Wcast-align #WARNING_OPTS += -optc-Wnested-externs @@ -53,7 +60,7 @@ WARNING_OPTS += -optc-Wbad-function-cast #WARNING_OPTS += -optc-Wredundant-decls #WARNING_OPTS += -optc-Wconversion -SRC_HC_OPTS += -I../includes -I. -Igum $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS +SRC_HC_OPTS += -I../includes -I. -Iparallel $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS SRC_CC_OPTS = $(GhcRtsCcOpts) ifneq "$(way)" "dll" @@ -78,7 +85,8 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes # ../driver/ghc (a better C compiler :-) to compile the # different RTS pieces # -CC=$(HC) $(HC_OPTS) $($*_HC_OPTS) +CC=$(GHC_INPLACE) $(HC_OPTS) $($*_HC_OPTS) +HC=$(GHC_INPLACE) # prevent this value from leaking into the GMP makefile unexport CC @@ -87,9 +95,12 @@ unexport CC # # Building DLLs is only supported on mingw32 at the moment. # -ifeq "$(way)" "dll" DLL_NAME = HSrts.dll -SRC_BLD_DLL_OPTS += --def HSrts.def -lwinmm -lHS_imp_stub -lgmp -L. -Lgmp +ifeq "$(way)" "dll" +DLL_IMPLIB_NAME = libHSrts_imp.a + +SRC_BLD_DLL_OPTS += --output-def=HSrts.def --export-all -L. -Lgmp -lwinmm \ + -lHS_imp_stub -lgmp_imp # # Need an import library containing the symbols the RTS uses from the Prelude. @@ -100,10 +111,10 @@ SRC_BLD_DLL_OPTS += --def HSrts.def -lwinmm -lHS_imp_stub -lgmp -L. -Lgmp # Note: if you do change the name of the Prelude DLL, the "--dllname .dll" # below will need to be updated as well. -$(DLL_NAME) :: libHS_imp_stub.a +$(DLL_PEN)/$(DLL_NAME) :: libHS_imp_stub.a libHS_imp_stub.a : - dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSprel.dll + dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSstd.dll # It's not included in the DLL, but we need to compile it up separately. all :: Main.dll_o @@ -118,10 +129,22 @@ endif ifneq "$(HaveLibGmp)" "YES" boot :: - cd gmp && ./configure + cd gmp && ./configure --enable-shared=no + +# DON'T KNOW IF WE NEED SOMETHING LIKE THIS ANYMORE: --SDM +# cd gmp && ./configure --target=$(HOSTPLATFORM) +# Slight cheatage here to past host as target, but x-compilation isn't supported by ghc. all :: gmp/libgmp.a +ifeq "$(way)" "dll" +all :: $(DLL_PEN)/gmp.dll + +$(DLL_PEN)/gmp.dll: + make -C gmp gmp.dll + $(MV) gmp/gmp.dll $(DLL_PEN) +endif + install :: gmp/libgmp.a clean :: @@ -133,6 +156,7 @@ endif gmp/libgmp.a :: $(MAKE) -C gmp MAKEFLAGS= + @$(CP) gmp/.libs/libgmp.a gmp endif #----------------------------------------------------------------------------- @@ -141,7 +165,7 @@ endif # ifeq "$(way)" "mp" -all :: gum/SysMan +all :: parallel/SysMan ifdef solaris2_TARGET_OS __socket_libs = -lsocket -lnsl @@ -149,12 +173,12 @@ else __socket_libs = endif -gum/SysMan : gum/SysMan.mp_o gum/LLComms.mp_o +parallel/SysMan : parallel/SysMan.mp_o parallel/LLComms.mp_o RtsUtils.mp_o RtsFlags.mp_o $(RM) $@ - gcc -o $@ gum/SysMan.mp_o gum/LLComms.mp_o -L$$PVM_ROOT/lib/$$PVM_ARCH -lgpvm3 -lpvm3 $(__socket_libs) + gcc -o $@ parallel/SysMan.mp_o parallel/LLComms.mp_o -L$$PVM_ROOT/lib/$$PVM_ARCH -lgpvm3 -lpvm3 $(__socket_libs) -CLEAN_FILES += gum/SysMan.mp_o gum/SysMan -INSTALL_LIBEXECS += gum/SysMan +CLEAN_FILES += parallel/SysMan.mp_o parallel/SysMan +INSTALL_LIBEXECS += parallel/SysMan endif #----------------------------------------------------------------------------- @@ -164,6 +188,13 @@ endif # Just libHSrts is installed uniformly across ways # INSTALL_LIBS += $(LIBRARY) +ifeq "$(EnableWin32DLLs)" "YES" +INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll +ifneq "$(way)" "dll" +INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBARY)) +endif +INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o +endif include $(TOP)/mk/target.mk