[project @ 2001-09-23 21:29:35 by ken]

We need to pass the -w flag to gcc when compilng *_stub.c files
in addition to when compilng *.hc files.

MERGE TO STABLE

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 8326c3e..94db1a4 100644 (file)
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -#include "hschooks.h" #-}
 
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.70 2001/09/14 15:51:42 simonpj Exp $
+-- $Id: DriverFlags.hs,v 1.71 2001/09/23 21:29:35 ken Exp $
 --
 -- Driver flags
 --
@@ -485,7 +485,7 @@ buildStaticHscOpts = do
 
 machdepCCOpts 
    | prefixMatch "alpha"   cTARGETPLATFORM  
-       = return ( ["-static"], ["-w"] )
+       = return ( ["-static", "-w"], [] )
        -- For now, to suppress the gcc warning "call-clobbered
        -- register used for global register variable", we simply
        -- disable all warnings altogether using the -w flag. Oh well.

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index ed01970..03b4eb1 100644 (file)
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.14 2001/09/04 18:29:22 ken Exp $
+# $Id: bootstrap.mk,v 1.15 2001/09/23 21:29:35 ken Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -49,8 +49,8 @@ PLATFORM_CC_OPTS += -mno-cygwin
 endif
 
 ifeq "$(alpha_TARGET_ARCH)" "1"
-PLATFORM_CC_OPTS += -static
-PLATFORM_HC_BOOT_CC_OPTS += -w
+PLATFORM_CC_OPTS += -static -w
+PLATFORM_HC_BOOT_CC_OPTS +=
 endif
 
 ifeq "$(sparc_TARGET_ARCH)" "1"