X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=fe7841c0631c9cea3e0fb882054a822a384f2b76;hb=ede08656f90d99fbafc54cf00085ab53e2504d71;hp=e18fc775d3467cb635f5b63eb4b102399a2f6857;hpb=b61f70ce5ff947642c96b1ad980351691bb1e07a;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index e18fc77..fe7841c 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -57,6 +57,13 @@ else
 EXCLUDED_SRCS += Main.c
 endif
 
+# This file ends up being empty unless we're building for a powerpc
+# system, and it is reported that Solaris ld chokes on it when building
+# HSrts.o.
+ifeq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" ""
+EXCLUDED_SRCS += AdjustorAsm.S
+endif
+
 EXCLUDED_SRCS += parallel/SysMan.c
 
 # The build system doesn't give us these
@@ -146,6 +153,9 @@ SUBDIRS += dotnet
 LIBOBJS += dotnet/Invoke.o
 endif
 
+# Suppress uninitialized variable warnings for GC.c
+GC_CC_OPTS 	+= -Wno-uninitialized
+
 #-----------------------------------------------------------------------------
 # Include the Front panel code?
 
@@ -184,7 +194,7 @@ AUTO_APPLY_CMM = AutoApply$(_way).cmm
 ifneq "$(BootingFromHc)" "YES"
 $(AUTO_APPLY_CMM): $(GHC_GENAPPLY)
 	@$(RM) $@
-	$(GHC_GENAPPLY) $(if $(filter u,$(way)), -u) >$@
+	$(GHC_GENAPPLY) $(if $(filter $(way), u debug_u), -u) >$@
 endif
 
 EXTRA_CMM_SRCS += $(AUTO_APPLY_CMM)
@@ -320,6 +330,7 @@ SRC_HC_OPTS += -fvia-C
 # We *want* type-checking of hand-written cmm.
 SRC_HC_OPTS += -dcmm-lint 
 
+ifneq "$(BootingFromHc)" "YES"
 # .cmm files depend on all the .h files, to a first approximation.
 %.$(way_)o : %.cmm $(H_FILES)
 	$(HC_PRE_OPTS)
@@ -335,6 +346,7 @@ SRC_HC_OPTS += -dcmm-lint
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -S $< -o $@
 	$(HC_POST_OPTS)
+endif
 
 #-----------------------------------------------------------------------------
 #