merge upstream HEAD
[ghc-hetmet.git] / rts / ghc.mk
index e684f62..53bb72c 100644 (file)
@@ -1,21 +1,33 @@
 # -----------------------------------------------------------------------------
+#
+# (c) 2009 The University of Glasgow
+#
+# This file is part of the GHC build system.
+#
+# To understand how the build system works and how to modify it, see
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Architecture
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Modifying
+#
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
 # Building the RTS
 
 # We build the RTS with stage 1
 rts_dist_HC = $(GHC_STAGE1)
 
-rts_WAYS = $(strip $(GhcLibWays) $(GhcRTSWays))
+# merge GhcLibWays and GhcRTSWays but strip out duplicates
+rts_WAYS = $(GhcLibWays) $(filter-out $(GhcLibWays),$(GhcRTSWays))
+rts_dist_WAYS = $(rts_WAYS)
 
-ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)__way).a)
+ALL_RTS_LIBS = rts/dist/build/libHSrtsmain.a \
+              $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf))
 all_rts : $(ALL_RTS_LIBS)
 
-# The per-dir options
-$(eval $(call distdir-opts,rts,dist))
-
 # -----------------------------------------------------------------------------
 # Defining the sources
 
-ALL_DIRS = hooks parallel sm
+ALL_DIRS = hooks parallel sm eventlog
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 ALL_DIRS += win32
@@ -23,13 +35,16 @@ else
 ALL_DIRS += posix
 endif
 
+EXCLUDED_SRCS :=
+EXCLUDED_SRCS += rts/Main.c
 EXCLUDED_SRCS += rts/parallel/SysMan.c
-EXCLUDED_SRCS += rts/dyn-wrapper.c
 EXCLUDED_SRCS += $(wildcard rts/Vis*.c)
 
-rts_C_SRCS = $(filter-out $(EXCLUDED_SRCS),$(wildcard rts/*.c $(foreach dir,$(ALL_DIRS),rts/$(dir)/*.c)))
-rts_CMM_SRCS = $(wildcard rts/*.cmm)
+rts_C_SRCS := $(filter-out $(EXCLUDED_SRCS),$(wildcard rts/*.c $(foreach dir,$(ALL_DIRS),rts/$(dir)/*.c)))
+rts_CMM_SRCS := $(wildcard rts/*.cmm)
 
+# Don't compile .S files when bootstrapping a new arch
+ifneq "$(PORTING_HOST)" "YES"
 ifneq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" ""
 rts_S_SRCS += rts/AdjustorAsm.S
 else
@@ -37,6 +52,7 @@ ifneq "$(findstring $(TargetOS_CPP), darwin)" ""
 rts_S_SRCS += rts/AdjustorAsm.S
 endif
 endif
+endif
 
 ifeq "$(GhcUnregisterised)" "YES"
 GENAPPLY_OPTS = -u
@@ -45,58 +61,82 @@ endif
 rts_AUTO_APPLY_CMM = rts/dist/build/AutoApply.cmm
 
 $(rts_AUTO_APPLY_CMM): $(GENAPPLY_INPLACE)
-       $(RM) $@
-       $(GENAPPLY_INPLACE) >$@
+       "$(GENAPPLY_INPLACE)" >$@
 
-rts/dist/build/sm/Evac_thr.c : rts/sm/Evac.c
-       $(MKDIRHIER) $(dir $@)
+rts/dist/build/sm/Evac_thr.c : rts/sm/Evac.c | $$(dir $$@)/.
        cp $< $@
-rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c
-       $(MKDIRHIER) $(dir $@)
+rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c | $$(dir $$@)/.
        cp $< $@
 
-rts_H_FILES = $(wildcard $(GHC_INCLUDE_DIR)/*.h) $(wildcard rts/*.h)
-
-#-----------------------------------------------------------------------------
-# Building one way
+rts_H_FILES := $(wildcard rts/*.h)
 
-define cmm-suffix-rules
-# $1 = dir
-# $2 = distdir
-# $3 = way
-
-# .cmm files depend on all the .h files, to a first approximation.
-
-$1/$2/build/%.$$($3_way_)o : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-       $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
+ifeq "$(USE_DTRACE)" "YES"
+DTRACEPROBES_H = rts/dist/build/RtsProbes.h
+rts_H_FILES += $(DTRACEPROBES_H)
+endif
 
-$1/$2/build/%.$$($3_way_)o : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-       $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
+# collect the -l flags that we need to link the rts dyn lib.
+rts/libs.depend : $(GHC_PKG_INPLACE)
+       "$(GHC_PKG_INPLACE)" field rts extra-libraries \
+         | sed -e 's/^extra-libraries: //' -e 's/\([a-z0-9]*\)[ ]*/-l\1 /g' > $@
 
-$1/$2/build/%.$$($3_way_)hc : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-       $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
 
-$1/$2/build/%.$$($3_way_)hc : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-       $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
+# ----------------------------------------------------------------------------
+# On Windows, as the RTS and base libraries have recursive imports,
+#      we have to break the loop with "import libraries".
+#      These are made from rts/win32/libHS*.def which contain lists of
+#      all the symbols in those libraries used by the RTS.
+#
+ifneq "$$(findstring dyn, $1)" ""
+ifeq  "$(HOSTPLATFORM)" "i386-unknown-mingw32" 
+
+ALL_RTS_DEF_LIBNAMES   = base ghc-prim
+ALL_RTS_DEF_LIBS       = \
+       rts/dist/build/win32/libHSbase.dll.a \
+       rts/dist/build/win32/libHSghc-prim.dll.a \
+       rts/dist/build/win32/libHSffi.dll.a 
+
+# -- import libs for the regular Haskell libraries
+define make-importlib-def # args $1 = lib name
+rts/dist/build/win32/libHS$1.def : rts/win32/libHS$1.def
+       cat rts/win32/libHS$1.def \
+               | sed "s/@LibVersion@/$$(libraries/$1_dist-install_VERSION)/" \
+               | sed "s/@ProjectVersion@/$(ProjectVersion)/" \
+               > rts/dist/build/win32/libHS$1.def
+
+rts/dist/build/win32/libHS$1.dll.a : rts/dist/build/win32/libHS$1.def
+       "$$(DLLTOOL)"   -d rts/dist/build/win32/libHS$1.def \
+                       -l rts/dist/build/win32/libHS$1.dll.a
+endef
+$(foreach lib,$(ALL_RTS_DEF_LIBNAMES),$(eval $(call make-importlib-def,$(lib))))
 
-$1/$2/build/%.$$($3_way_)s : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-       $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
 
-$1/$2/build/%.$$($3_way_)s : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-       $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
+# -- import libs for libffi
+rts/dist/build/win32/libHSffi.def : rts/win32/libHSffi.def
+       cat rts/win32/libHSffi.def \
+               | sed "s/@ProjectVersion@/$(ProjectVersion)/" \
+               > rts/dist/build/win32/libHSffi.def
 
-endef
+rts/dist/build/win32/libHSffi.dll.a : rts/dist/build/win32/libHSffi.def
+       "$(DLLTOOL)"    -d rts/dist/build/win32/libHSffi.def \
+                       -l rts/dist/build/win32/libHSffi.dll.a
+endif
+endif
 
 
+#-----------------------------------------------------------------------------
+# Building one way
 define build-rts-way # args: $1 = way
 
+ifneq "$$(BINDIST)" "YES"
+
 # The per-way CC_OPTS
 ifneq "$$(findstring debug, $1)" ""
 rts_dist_$1_HC_OPTS =
 rts_dist_$1_CC_OPTS = -g -O0
 else
-rts_dist_$1_HC_OPTS = $(GhcRtsHcOpts)
-rts_dist_$1_CC_OPTS = $(GhcRtsCcOpts)
+rts_dist_$1_HC_OPTS = $$(GhcRtsHcOpts)
+rts_dist_$1_CC_OPTS = $$(GhcRtsCcOpts)
 endif
 
 ifneq "$$(findstring thr, $1)" ""
@@ -106,18 +146,59 @@ endif
 $(call distdir-way-opts,rts,dist,$1)
 $(call c-suffix-rules,rts,dist,$1,YES)
 $(call cmm-suffix-rules,rts,dist,$1)
+$(call hs-suffix-rules-srcdir,rts,dist,$1,.)
+# hs-suffix-rules-srcdir is needed when BootingFromHc to get the .hc rules
 
-rts_$1_LIB = rts/dist/build/libHSrts$$($1__way).a
+rts_$1_LIB_NAME = libHSrts$$($1_libsuf)
+rts_$1_LIB = rts/dist/build/$$(rts_$1_LIB_NAME)
 
 rts_$1_C_OBJS   = $$(patsubst rts/%.c,rts/dist/build/%.$$($1_osuf),$$(rts_C_SRCS)) $$(patsubst %.c,%.$$($1_osuf),$$(rts_$1_EXTRA_C_SRCS))
 rts_$1_S_OBJS   = $$(patsubst rts/%.S,rts/dist/build/%.$$($1_osuf),$$(rts_S_SRCS))
-rts_$1_CMM_OBJS = $$(patsubst rts/%.cmm,rts/dist/build/%.$$($1_osuf),$$(rts_CMM_SRCS)) $$(patsubst %.cmm,%.$$($1_osuf),$(rts_AUTO_APPLY_CMM))
+rts_$1_CMM_OBJS = $$(patsubst rts/%.cmm,rts/dist/build/%.$$($1_osuf),$$(rts_CMM_SRCS)) $$(patsubst %.cmm,%.$$($1_osuf),$$(rts_AUTO_APPLY_CMM))
 
 rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS)
 
-$$(rts_$1_LIB) : $$(rts_$1_OBJS)
-       $$(RM) $$@
-       echo $$(rts_$1_OBJS) | xargs $$(AR) $$(EXTRA_AR_ARGS) $$@
+ifeq "$(USE_DTRACE)" "YES"
+ifeq "$(TargetOS_CPP)" "solaris2"
+# On Darwin we don't need to generate binary containing probes defined
+# in DTrace script, but DTrace on Solaris expects generation of binary
+# from the DTrace probes definitions
+rts_$1_DTRACE_OBJS = rts/dist/build/RtsProbes.$$($1_osuf)
+
+rts/dist/build/RtsProbes.$$($1_osuf) : $$(rts_$1_OBJS)
+       $(DTRACE) -G -C -Iincludes -DDTRACE -s rts/RtsProbes.d -o \
+               $$@ $$(rts_$1_OBJS)
+endif
+endif
+
+rts_dist_$1_CC_OPTS += -DRtsWay=\"rts_$1\"
+
+# Making a shared library for the RTS.
+ifneq "$$(findstring dyn, $1)" ""
+ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32"
+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend
+       "$$(RM)" $$(RM_OPTS) $$@
+       "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
+         -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
+else
+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend
+       "$$(RM)" $$(RM_OPTS) $$@
+       "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
+         -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) \
+         $$(rts_$1_DTRACE_OBJS) -o $$@
+ifeq "$$(darwin_HOST_OS)" "1"
+       # Ensure library's install name is correct before anyone links with it.
+       install_name_tool -id $(ghclibdir)/$$(rts_$1_LIB_NAME) $$@
+endif
+endif
+else
+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS)
+       "$$(RM)" $$(RM_OPTS) $$@
+       echo $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" \
+               $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@
+endif
+
+endif
 
 endef
 
@@ -127,27 +208,39 @@ $(foreach way,$(rts_WAYS),$(eval $(call build-rts-way,$(way))))
 #-----------------------------------------------------------------------------
 # Flags for compiling every file
 
-# gcc provides lots of useful warnings if you ask it.
-# This is a pretty good list to start with - use a # to comment out
-# any you don't like.
+# We like plenty of warnings.
 WARNING_OPTS += -Wall
+ifeq "$(GccLT34)" "YES"
 WARNING_OPTS += -W
+else
+WARNING_OPTS += -Wextra
+endif
 WARNING_OPTS += -Wstrict-prototypes 
 WARNING_OPTS += -Wmissing-prototypes 
 WARNING_OPTS += -Wmissing-declarations
 WARNING_OPTS += -Winline
 WARNING_OPTS += -Waggregate-return
-#WARNING_OPTS += -Wpointer-arith
+WARNING_OPTS += -Wpointer-arith
+WARNING_OPTS += -Wmissing-noreturn
+WARNING_OPTS += -Wnested-externs
+WARNING_OPTS += -Wredundant-decls 
+
+# These ones are hard to avoid:
+#WARNING_OPTS += -Wconversion
 #WARNING_OPTS += -Wbad-function-cast
-#WARNING_OPTS += -Wcast-align
-#WARNING_OPTS += -Wnested-externs
 #WARNING_OPTS += -Wshadow
 #WARNING_OPTS += -Wcast-qual
-#WARNING_OPTS += -Wno-unused 
-#WARNING_OPTS += -Wredundant-decls 
-#WARNING_OPTS += -Wconversion
 
-STANDARD_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RTS_DIR) -Irts/parallel -Irts/sm -Irts/eventlog
+# This one seems buggy on GCC 4.1.2, which is the only GCC version we 
+# have that can bootstrap the SPARC build. We end up with lots of supurious
+# warnings of the form "cast increases required alignment of target type".
+# Some legitimate warnings can be fixed by adding an intermediate cast to
+# (void*), but we get others in rts/sm/GCUtils.c concerning the gct var
+# that look innocuous to me. We could enable this again once we deprecate
+# support for registerised builds on this arch. -- BL 2010/02/03
+# WARNING_OPTS += -Wcast-align
+
+STANDARD_OPTS += -Iincludes -Irts
 # COMPILING_RTS is only used when building Win32 DLL support.
 STANDARD_OPTS += -DCOMPILING_RTS
 
@@ -169,28 +262,11 @@ ifeq "$(UseLibFFIForAdjustors)" "YES"
 rts_CC_OPTS += -DUSE_LIBFFI_FOR_ADJUSTORS
 endif
 
-ifeq "$(Windows)" "YES"
-# SDM: when compiled with -fasm the RTS currently has bogus references to 
-# __imp_base_ things, so working around for now:
-rts_HC_OPTS += -fvia-C
-endif
-
-ifneq "$(DYNAMIC_RTS)" "YES"
-rts_HC_OPTS += -static
-else
-$(error ToDo: DYNAMIC_RTS)
-endif
-
 # Mac OS X: make sure we compile for the right OS version
 rts_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
 rts_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
 rts_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
 
-# Otherwise the stack-smash handler gets triggered.
-ifeq "$(TargetOS_CPP)" "openbsd"
-rts_HC_OPTS += -optc-fno-stack-protector
-endif
-
 # We *want* type-checking of hand-written cmm.
 rts_HC_OPTS += -dcmm-lint 
 
@@ -202,6 +278,8 @@ rts_HC_OPTS += -dcmm-lint
 # upd_evacee() assigments get moved before the object copy.
 rts_CC_OPTS += -fno-strict-aliasing
 
+rts_CC_OPTS += -fno-common
+
 ifeq "$(BeConservative)" "YES"
 rts_CC_OPTS += -DBE_CONSERVATIVE
 endif
@@ -209,50 +287,107 @@ endif
 #-----------------------------------------------------------------------------
 # Flags for compiling specific files
 
-# XXX DQ is now the same on all platforms, so get rid of it
-DQ = \"
-
-# If Main.c is built with optimisation then the SEH exception stuff on
+# If RtsMain.c is built with optimisation then the SEH exception stuff on
 # Windows gets confused.
 # This has to be in HC rather than CC opts, as otherwise there's a
 # -optc-O2 that comes after it.
-Main_HC_OPTS += -optc-O0
+rts/RtsMain_HC_OPTS += -optc-O0
 
-RtsMessages_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ)
-RtsUtils_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ)
-RtsUtils_CC_OPTS += -DRtsWay=$(DQ)rts$(_way)$(DQ)
+rts/RtsMessages_CC_OPTS += -DProjectVersion=\"$(ProjectVersion)\"
+rts/RtsUtils_CC_OPTS += -DProjectVersion=\"$(ProjectVersion)\"
+#
+rts/RtsUtils_CC_OPTS += -DHostPlatform=\"$(HOSTPLATFORM)\"
+rts/RtsUtils_CC_OPTS += -DHostArch=\"$(HostArch_CPP)\"
+rts/RtsUtils_CC_OPTS += -DHostOS=\"$(HostOS_CPP)\"
+rts/RtsUtils_CC_OPTS += -DHostVendor=\"$(HostVendor_CPP)\"
+#
+rts/RtsUtils_CC_OPTS += -DBuildPlatform=\"$(BUILDPLATFORM)\"
+rts/RtsUtils_CC_OPTS += -DBuildArch=\"$(BuildArch_CPP)\"
+rts/RtsUtils_CC_OPTS += -DBuildOS=\"$(BuildOS_CPP)\"
+rts/RtsUtils_CC_OPTS += -DBuildVendor=\"$(BuildVendor_CPP)\"
+#
+rts/RtsUtils_CC_OPTS += -DTargetPlatform=\"$(TARGETPLATFORM)\"
+rts/RtsUtils_CC_OPTS += -DTargetArch=\"$(TargetArch_CPP)\"
+rts/RtsUtils_CC_OPTS += -DTargetOS=\"$(TargetOS_CPP)\"
+rts/RtsUtils_CC_OPTS += -DTargetVendor=\"$(TargetVendor_CPP)\"
+#
+rts/RtsUtils_CC_OPTS += -DGhcUnregisterised=\"$(GhcUnregisterised)\"
+rts/RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=\"$(GhcEnableTablesNextToCode)\"
+
+# Compile various performance-critical pieces *without* -fPIC -dynamic
+# even when building a shared library.  If we don't do this, then the
+# GC runs about 50% slower on x86 due to the overheads of PIC.  The
+# cost of doing this is a little runtime linking and less sharing, but
+# not much.
+#
+# On x86_64 this doesn't work, because all objects in a shared library
+# must be compiled with -fPIC (since the 32-bit relocations generated
+# by the default small memory can't be resolved at runtime).  So we
+# only do this on i386.
+#
+# This apparently doesn't work on OS X (Darwin) nor on Solaris.
+# On Darwin we get errors of the form
 #
-RtsUtils_CC_OPTS += -DHostPlatform=$(DQ)$(HOSTPLATFORM)$(DQ)
-RtsUtils_CC_OPTS += -DHostArch=$(DQ)$(HostArch_CPP)$(DQ)
-RtsUtils_CC_OPTS += -DHostOS=$(DQ)$(HostOS_CPP)$(DQ)
-RtsUtils_CC_OPTS += -DHostVendor=$(DQ)$(HostVendor_CPP)$(DQ)
+#  ld: absolute addressing (perhaps -mdynamic-no-pic) used in _stg_ap_0_fast from rts/dist/build/Apply.dyn_o not allowed in slidable image
 #
-RtsUtils_CC_OPTS += -DBuildPlatform=$(DQ)$(BUILDPLATFORM)$(DQ)
-RtsUtils_CC_OPTS += -DBuildArch=$(DQ)$(BuildArch_CPP)$(DQ)
-RtsUtils_CC_OPTS += -DBuildOS=$(DQ)$(BuildOS_CPP)$(DQ)
-RtsUtils_CC_OPTS += -DBuildVendor=$(DQ)$(BuildVendor_CPP)$(DQ)
+# and lots of these warnings:
 #
-RtsUtils_CC_OPTS += -DTargetPlatform=$(DQ)$(TARGETPLATFORM)$(DQ)
-RtsUtils_CC_OPTS += -DTargetArch=$(DQ)$(TargetArch_CPP)$(DQ)
-RtsUtils_CC_OPTS += -DTargetOS=$(DQ)$(TargetOS_CPP)$(DQ)
-RtsUtils_CC_OPTS += -DTargetVendor=$(DQ)$(TargetVendor_CPP)$(DQ)
+#  ld: warning codegen in _stg_ap_pppv_fast (offset 0x0000005E) prevents image from loading in dyld shared cache
 #
-RtsUtils_CC_OPTS += -DGhcUnregisterised=$(DQ)$(GhcUnregisterised)$(DQ)
-RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode)$(DQ)
+# On Solaris we get errors like:
+#
+# Text relocation remains                         referenced
+#     against symbol                  offset      in file
+# .rodata (section)                   0x11        rts/dist/build/Apply.dyn_o
+#   ...
+# ld: fatal: relocations remain against allocatable but non-writable sections
+# collect2: ld returned 1 exit status
+
+ifeq "$(TargetArch_CPP)" "i386"
+i386_SPEED_HACK := "YES"
+ifeq "$(TargetOS_CPP)" "darwin"
+i386_SPEED_HACK := "NO"
+endif
+ifeq "$(TargetOS_CPP)" "solaris2"
+i386_SPEED_HACK := "NO"
+endif
+endif
+
+ifeq "$(TargetArch_CPP)" "i386"
+ifeq "$(i386_SPEED_HACK)" "YES"
+rts/sm/Evac_HC_OPTS           += -fno-PIC
+rts/sm/Evac_thr_HC_OPTS       += -fno-PIC
+rts/sm/Scav_HC_OPTS           += -fno-PIC
+rts/sm/Scav_thr_HC_OPTS       += -fno-PIC
+rts/sm/Compact_HC_OPTS        += -fno-PIC
+rts/sm/GC_HC_OPTS             += -fno-PIC
+
+# -static is also necessary for these bits, otherwise the NCG
+# -generates dynamic references:
+rts/Updates_HC_OPTS += -fno-PIC -static
+rts/StgMiscClosures_HC_OPTS += -fno-PIC -static
+rts/PrimOps_HC_OPTS += -fno-PIC -static
+rts/Apply_HC_OPTS += -fno-PIC -static
+rts/dist/build/AutoApply_HC_OPTS += -fno-PIC -static
+endif
+endif
 
 # ffi.h triggers prototype warnings, so disable them here:
-Interpreter_CC_OPTS += -Wno-strict-prototypes
-Adjustor_CC_OPTS += -Wno-strict-prototypes
-sm/Storage_CC_OPTS += -Wno-strict-prototypes
-
-StgCRun_CC_OPTS += -w
-Typeable_CC_OPTS += -w
-RetainerProfile_CC_OPTS += -w
-sm/Compact_CC_OPTS += -w
+rts/Interpreter_CC_OPTS += -Wno-strict-prototypes
+rts/Adjustor_CC_OPTS    += -Wno-strict-prototypes
+rts/sm/Storage_CC_OPTS  += -Wno-strict-prototypes
+
+# inlining warnings happen in Compact
+rts/sm/Compact_CC_OPTS += -Wno-inline
+
+# emits warnings about call-clobbered registers on x86_64
+rts/StgCRun_CC_OPTS += -w
+
+rts/RetainerProfile_CC_OPTS += -w
+rts/RetainerSet_CC_OPTS += -Wno-format
 # On Windows:
-win32/ConsoleHandler_CC_OPTS += -w
-win32/ThrIOManager_CC_OPTS += -w
-win32/Ticker_CC_OPTS += -w
+rts/win32/ConsoleHandler_CC_OPTS += -w
+rts/win32/ThrIOManager_CC_OPTS += -w
 # The above warning supression flags are a temporary kludge.
 # While working on this module you are encouraged to remove it and fix
 # any warnings in the module. See
@@ -260,16 +395,16 @@ win32/Ticker_CC_OPTS += -w
 # for details
 
 # Without this, thread_obj will not be inlined (at least on x86 with GCC 4.1.0)
-sm/Compact_CC_OPTS += -finline-limit=2500
+rts/sm/Compact_CC_OPTS += -finline-limit=2500
 
 # -O3 helps unroll some loops (especially in copy() with a constant argument).
-sm/Evac_CC_OPTS += -funroll-loops
-sm/Evac_thr_HC_OPTS += -optc-funroll-loops
+rts/sm/Evac_CC_OPTS += -funroll-loops
+rts/dist/build/sm/Evac_thr_HC_OPTS += -optc-funroll-loops
 
 # These files are just copies of sm/Evac.c and sm/Scav.c respectively,
 # but compiled with -DPARALLEL_GC.
-sm/Evac_thr_HC_OPTS += -optc-DPARALLEL_GC
-sm/Scav_thr_HC_OPTS += -optc-DPARALLEL_GC
+rts/dist/build/sm/Evac_thr_CC_OPTS += -DPARALLEL_GC -Irts/sm
+rts/dist/build/sm/Scav_thr_CC_OPTS += -DPARALLEL_GC -Irts/sm
 
 #-----------------------------------------------------------------------------
 # Add PAPI library if needed
@@ -301,44 +436,29 @@ endif
 # -----------------------------------------------------------------------------
 # dependencies
 
-# Hack: we define every way-related option here, so that we get (hopefully)
-# a superset of the dependencies.  To do this properly, we should generate
-# a different set of dependencies for each way.  Further hack: PROFILING and
-# TICKY_TICKY can't be used together, so we omit TICKY_TICKY for now.
-rts_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG
-
 rts_WAYS_DASHED = $(subst $(space),,$(patsubst %,-%,$(strip $(rts_WAYS))))
-rts_dist_depfile = rts/dist/build/.depend$(rts_WAYS_DASHED)
+rts_dist_depfile_base = rts/dist/build/.depend$(rts_WAYS_DASHED)
 
-rts_dist_C_SRCS  = $(rts_C_SRCS)
+rts_dist_C_SRCS  = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS)
 rts_dist_S_SRCS =  $(rts_S_SRCS)
-rts_dist_C_FILES = $(rts_C_SRCS) $(rts_S_SRCS)
+rts_dist_C_FILES = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS) $(rts_S_SRCS)
 
-$(eval $(call build-dependencies,rts,dist))
-
-$(rts_dist_depfile) : libffi/ffi.h
+# Hack: we define every way-related option here, so that we get (hopefully)
+# a superset of the dependencies.  To do this properly, we should generate
+# a different set of dependencies for each way.  Further hack: PROFILING an
 
-# -----------------------------------------------------------------------------
+# TICKY_TICKY can't be used together, so we omit TICKY_TICKY for now.
+rts_dist_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG
 
-# Need to get the GMP vars in through CPP to package.conf.in, and put
-# quotes around each element.
+ifeq "$(USE_DTRACE)" "YES"
 
-rts_PACKAGE_CPP_OPTS += -DGMP_INCLUDE_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_INCLUDE_DIRS))))'
-rts_PACKAGE_CPP_OPTS += -DGMP_LIB_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_LIB_DIRS))))'
+rts_dist_MKDEPENDC_OPTS += -Irts/dist/build
 
-ifneq "$(GMP_INCLUDE_DIRS)" ""
-rts_HC_OPTS += -I$(GMP_INCLUDE_DIRS)
-rts_CC_OPTS += -I$(GMP_INCLUDE_DIRS)
-rts_HSC2HS_OPTS += -I$(GMP_INCLUDE_DIRS)
-endif
-ifneq "$(GMP_LIB_DIRS)" ""
-rts_LD_OPTS += -L$(GMP_LIB_DIRS)
 endif
 
-rts_CC_OPTS     += -Igmp/gmpbuild
-rts_HC_OPTS     += -Igmp/gmpbuild
-rts_HSC2HS_OPTS += -Igmp/gmpbuild
-rts_LD_OPTS     += -Lgmp/gmpbuild
+$(eval $(call dependencies,rts,dist,1))
+
+$(rts_dist_depfile_c_asm) : libffi/dist-install/build/ffi.h $(DTRACEPROBES_H)
 
 #-----------------------------------------------------------------------------
 # libffi stuff
@@ -349,12 +469,38 @@ rts_HSC2HS_OPTS += -Ilibffi/build/include
 rts_LD_OPTS     += -Llibffi/build/include
 
 # -----------------------------------------------------------------------------
-# compile generic patchable dyn-wrapper
+# compile dtrace probes if dtrace is supported
+
+ifeq "$(USE_DTRACE)" "YES"
+
+rts_CC_OPTS            += -DDTRACE
+rts_HC_OPTS            += -DDTRACE
+
+# Apple's dtrace (the only one supported by ghc at the moment) uses
+# gcc as its preprocessor. If gcc isn't at /usr/bin/gcc, or we need
+# to force it to use a different gcc, we need to give the path in
+# the option cpppath.
+
+ifeq "$(TargetOS_CPP)" "darwin"
+# Darwin has a flag to tell dtrace which cpp to use.
+# Unfortunately, this isn't supported on Solaris (See Solaris Dynamic Tracing
+# Guide, Chapter 16, for the configuration variables available on Solaris)
+DTRACE_FLAGS = -x cpppath=$(WhatGccIsCalled)
+endif
+
+DTRACEPROBES_SRC = rts/RtsProbes.d
+$(DTRACEPROBES_H): $(DTRACEPROBES_SRC) includes/ghcplatform.h | $$(dir $$@)/.
+       "$(DTRACE)" $(filter -I%,$(rts_CC_OPTS)) -C $(DTRACE_FLAGS) -h -o $@ -s $<
+endif
+
+# -----------------------------------------------------------------------------
+# build the static lib containing the C main symbol
 
-DYNWRAPPER_SRC = rts/dyn-wrapper.c
-DYNWRAPPER_PROG = rts/dyn-wrapper$(exeext)
-$(DYNWRAPPER_PROG): $(DYNWRAPPER_SRC)
-       $(HC) -cpp -optc-include -optcdyn-wrapper-patchable-behaviour.h $(INPLACE_EXTRA_FLAGS) $< -o $@
+ifneq "$(BINDIST)" "YES"
+rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o
+       "$(RM)" $(RM_OPTS) $@
+       "$(AR)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $<
+endif
 
 # -----------------------------------------------------------------------------
 # The RTS package config
@@ -370,18 +516,14 @@ endif
 
 $(eval $(call manual-package-config,rts))
 
+ifneq "$(BootingFromHc)" "YES"
 rts/package.conf.inplace : $(includes_H_CONFIG) $(includes_H_PLATFORM)
+endif
 
 # -----------------------------------------------------------------------------
 # installing
 
-install : install_rts
-
-.PHONY: install_rts
-install_rts:
-       $(MKDIRHIER) $(DESTDIR)$(libdir)
-       $(MKDIRHIER) $(DESTDIR)$(libdir)/include
-       $(CP) $(ALL_RTS_LIBS) $(DESTDIR)$(libdir)
+INSTALL_LIBS += $(ALL_RTS_LIBS)
 
 # -----------------------------------------------------------------------------
 # cleaning
@@ -389,5 +531,4 @@ install_rts:
 $(eval $(call clean-target,rts,dist,rts/dist))
 
 BINDIST_EXTRAS += rts/package.conf.in
-BINDIST_EXTRAS += $(ALL_RTS_LIBS)