X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=8feddbf72aa8606535700b618156dc07ed369d9b;hb=6c42179eb1c7e0643485f99b4b6e24b213c1fa90;hp=0a556e891089b38972bda988c64f87d77c7d9cda;hpb=d60b28998f765ffadb10df4929669e748bddee7f;p=ghc-hetmet.git diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile index 0a556e8..8feddbf 100644 --- a/ghc/rts/Makefile +++ b/ghc/rts/Makefile @@ -1,16 +1,15 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.7 1999/03/03 19:26:31 sof Exp $ - +# $Id: Makefile,v 1.43 2001/01/26 14:40:18 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,16 +18,23 @@ 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 "$(DLLized)" "YES" +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) # -LIBRARY = libHSrts$(_way).a LIBOBJS = $(patsubst %.c,%.$(way_)o,$(SRCS_RTS_C)) \ $(patsubst %.hc,%.$(way_)o,$(SRCS_RTS_HC)) \ $(patsubst %.S,%.$(way_)o,$(SRCS_RTS_S)) @@ -43,7 +49,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,16 +59,35 @@ 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_CC_OPTS += $(GhcRtsCcOpts) -optc-DCOMPILING_RTS +SRC_HC_OPTS += -I../includes -I. -Iparallel $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS +SRC_CC_OPTS = $(GhcRtsCcOpts) -DLLWRAP = dllwrap +ifneq "$(DLLized)" "YES" +SRC_HC_OPTS += -static +endif +# SRC_HC_OPTS += -optc-fPIC ifeq "$(way)" "mp" SRC_HC_OPTS += -I$$PVM_ROOT/include endif -C_SRCS = $(SRCS_RTS_C) $(SRCS_RTS_HC) # $(SRCS_RTS_S)??? +#----------------------------------------------------------------------------- +# Include the Front panel code? + +SRCS_RTS_C := $(filter-out Vis%.c, $(SRCS_RTS_C)) + +# we need GTK+ for the front panel +ifneq "$(GTK_CONFIG)" "" +ifeq "$(GhcRtsWithFrontPanel)" "YES" +SRC_HC_OPTS += `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL +SRCS_RTS_C := $(SRCS_RTS_C) $(wildcard Vis*.c) +VisCallbacks_CC_OPTS += -optc-Wno-unused +endif # GhcRtsWithFrontPanel +endif # GTK_CONFIG + +#----------------------------------------------------------------------------- + +C_SRCS = $(SRCS_RTS_C) $(SRCS_RTS_HC) $(SRCS_RTS_S) SRC_MKDEPENDC_OPTS += -I. -I../includes @@ -75,7 +100,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 @@ -83,13 +109,30 @@ unexport CC # ----------------------------------------------------------------------------- # # Building DLLs is only supported on mingw32 at the moment. -# -ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -dll :: - $(CP) -f libHSrts.a libHSrts_dll.a - ar d libHSrts_dll.a Main.o - $(DLLWRAP) -mno-cygwin --target=i386-mingw32 --export-all --output-lib libHSrts_imp.a --def HSrts.def -o HSrts.dll libHSrts_dll.a -lwinmm -lHS -lgmp -L. -Lgmp +# +HSLIB = rts + +ifeq "$(DLLized)" "YES" +SRC_BLD_DLL_OPTS += -lHS_imp_stub -lgmp_imp + +# It's not included in the DLL, but we need to compile it up separately. +all :: Main.dll_o + +# Need an import library containing the symbols the RTS uses from the Prelude. +# So, to avoid bootstrapping trouble, we build one containing just the syms +# we need. Weirdly named to avoid clashing later on when compiling the contents +# of ghc/lib/.. +# +# Note: if you do change the name of the Prelude DLL, the "--dllname .dll" +# below will need to be updated as well. + +$(DLL_PEN)/HSrts$(_way).dll :: libHS_imp_stub.a + +libHS_imp_stub.a : + dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSstd.dll + endif + # ----------------------------------------------------------------------------- # Compile GMP only if we don't have it already # @@ -98,10 +141,20 @@ endif ifneq "$(HaveLibGmp)" "YES" boot :: - cd gmp && ./configure + cd gmp && ./configure --enable-shared=no --target=$(HOSTPLATFORM) + +# Slight cheatage here to past host as target, but x-compilation isn't supported by ghc. all :: gmp/libgmp.a +ifeq "$(DLLized)" "YES" +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 :: @@ -113,6 +166,7 @@ endif gmp/libgmp.a :: $(MAKE) -C gmp MAKEFLAGS= + @$(CP) gmp/.libs/libgmp.a gmp endif #----------------------------------------------------------------------------- @@ -121,7 +175,7 @@ endif # ifeq "$(way)" "mp" -all :: gum/SysMan +all :: parallel/SysMan ifdef solaris2_TARGET_OS __socket_libs = -lsocket -lnsl @@ -129,12 +183,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 #----------------------------------------------------------------------------- @@ -144,6 +198,10 @@ endif # Just libHSrts is installed uniformly across ways # INSTALL_LIBS += $(LIBRARY) +ifeq "$(DLLized)" "YES" +INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll +INSTALL_LIBS += $(patsubst %.a,%_imp.a,$(LIBARY)) +INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o +endif include $(TOP)/mk/target.mk -