X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=73ba68ffa82b6945dedd4e3021b79cc704156e0d;hb=ad455445e0c798e348a96a7a835c8d0ccf939e89;hp=cf81863ac421ead55bbe4b3bb9a242330ad6dd41;hpb=b6d70ef77033fd09f7bfb9c020fd9e40b3dbac29;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index cf81863..73ba68f 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -146,6 +146,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 +187,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)
@@ -300,6 +303,7 @@ SRC_HC_OPTS += \
   -\#include Schedule.h \
   -\#include Printer.h \
   -\#include Sanity.h \
+  -\#include STM.h \
   -\#include Storage.h \
   -\#include SchedAPI.h \
   -\#include Timer.h \
@@ -319,6 +323,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)
@@ -334,6 +339,7 @@ SRC_HC_OPTS += -dcmm-lint
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -S $< -o $@
 	$(HC_POST_OPTS)
+endif
 
 #-----------------------------------------------------------------------------
 #