X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=0c224e9090764324c66e91fde50d9ae513922c59;hb=d8334d807812e40f67770ffc37608c0ce66f96b2;hp=dd9851a3f0f6b836f4af63293c183dbd2df30a0b;hpb=169f5972d5398e75c4cf7f831b6ce703288ec73c;p=ghc-hetmet.git diff --git a/rts/ghc.mk b/rts/ghc.mk index dd9851a..0c224e9 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -157,7 +157,7 @@ rts_$1_CMM_OBJS = $$(patsubst rts/%.cmm,rts/dist/build/%.$$($1_osuf),$$(rts_CMM_ rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS) -rts_dist_$1_CC_OPTS += -DRtsWay=$$(DQ)rts_$1$$(DQ) +rts_dist_$1_CC_OPTS += -DRtsWay=\"rts_$1\" # Making a shared library for the RTS. ifneq "$$(findstring dyn, $1)" "" @@ -271,35 +271,32 @@ endif #----------------------------------------------------------------------------- # Flags for compiling specific files -# XXX DQ is now the same on all platforms, so get rid of it -DQ = \" - # 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. rts/RtsMain_HC_OPTS += -optc-O0 -rts/RtsMessages_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) -rts/RtsUtils_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) +rts/RtsMessages_CC_OPTS += -DProjectVersion=\"$(ProjectVersion)\" +rts/RtsUtils_CC_OPTS += -DProjectVersion=\"$(ProjectVersion)\" # -rts/RtsUtils_CC_OPTS += -DHostPlatform=$(DQ)$(HOSTPLATFORM)$(DQ) -rts/RtsUtils_CC_OPTS += -DHostArch=$(DQ)$(HostArch_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DHostOS=$(DQ)$(HostOS_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DHostVendor=$(DQ)$(HostVendor_CPP)$(DQ) +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=$(DQ)$(BUILDPLATFORM)$(DQ) -rts/RtsUtils_CC_OPTS += -DBuildArch=$(DQ)$(BuildArch_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DBuildOS=$(DQ)$(BuildOS_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DBuildVendor=$(DQ)$(BuildVendor_CPP)$(DQ) +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=$(DQ)$(TARGETPLATFORM)$(DQ) -rts/RtsUtils_CC_OPTS += -DTargetArch=$(DQ)$(TargetArch_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DTargetOS=$(DQ)$(TargetOS_CPP)$(DQ) -rts/RtsUtils_CC_OPTS += -DTargetVendor=$(DQ)$(TargetVendor_CPP)$(DQ) +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=$(DQ)$(GhcUnregisterised)$(DQ) -rts/RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode)$(DQ) +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 @@ -312,8 +309,8 @@ rts/RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextTo # 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) where we get errors of -# the form +# This apparently doesn't work on OS X (Darwin) nor on Solaris. +# On Darwin we get errors of the form # # 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 # @@ -321,8 +318,27 @@ rts/RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextTo # # ld: warning codegen in _stg_ap_pppv_fast (offset 0x0000005E) prevents image from loading in dyld shared cache # +# 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" -ifneq "$(TargetOS_CPP)" "darwin" +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 @@ -445,7 +461,7 @@ rts_CC_OPTS += -DDTRACE rts_HC_OPTS += -DDTRACE DTRACEPROBES_SRC = rts/RtsProbes.d -$(DTRACEPROBES_H): $(DTRACEPROBES_SRC) | $(dir $@)/. +$(DTRACEPROBES_H): $(DTRACEPROBES_SRC) includes/ghcplatform.h | $(dir $@)/. "$(DTRACE)" $(filter -I%,$(rts_CC_OPTS)) -C -h -o $@ -s $< endif