[project @ 2000-04-13 23:03:12 by sewardj]

Changed NO_REGS to NO_MACHREGS to avoid inexplicable gcc warnings when
building the rts for Hugs.

diff --git a/ghc/includes/MachRegs.h b/ghc/includes/MachRegs.h
index 16d429a..5f97c84 100644 (file)
--- a/ghc/includes/MachRegs.h
+++ b/ghc/includes/MachRegs.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: MachRegs.h,v 1.6 1999/11/02 15:05:50 simonmar Exp $
+ * $Id: MachRegs.h,v 1.7 2000/04/13 23:03:12 sewardj Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -15,11 +15,11 @@
  * only in here please.
  */
 
-/* define NO_REGS to omit register declarations - used in RTS C code
+/* define NO_MACHREGS to omit register declarations - used in RTS C code
  * that needs all the STG definitions but not the global register 
  * settings.
  */
-#ifndef NO_REGS
+#ifndef NO_MACHREGS
 
 /* ----------------------------------------------------------------------------
    Caller saves and callee-saves regs.
@@ -482,6 +482,6 @@
 #define MAX_REAL_DOUBLE_REG 2
 #endif
 
-#endif /* NO_REGS */
+#endif /* NO_MACHREGS */
 
 #endif /* MACHREGS_H */

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index 7a2266c..f99d723 100644 (file)
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.25 2000/04/03 15:54:49 simonmar Exp $
+ * $Id: Stg.h,v 1.26 2000/04/13 23:03:12 sewardj Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -26,8 +26,8 @@
 #endif
 
 #if IN_STG_CODE == 0
-# ifndef NO_REGS
-#  define NO_REGS                      /* don't define fixed registers */
+# ifndef NO_MACHREGS
+#  define NO_MACHREGS                  /* don't define fixed registers */
 # endif
 #endif
 

diff --git a/ghc/includes/options.h b/ghc/includes/options.h
index aca0b1e..d9253d4 100644 (file)
--- a/ghc/includes/options.h
+++ b/ghc/includes/options.h
@@ -7,8 +7,8 @@
  * Hugs version 1.4, December 1997
  *
  * $RCSfile: options.h,v $
- * $Revision: 1.25 $
- * $Date: 2000/04/05 16:57:18 $
+ * $Revision: 1.26 $
+ * $Date: 2000/04/13 23:03:12 $
  * ------------------------------------------------------------------------*/
 
 
@@ -165,7 +165,7 @@
  * If you turn this off, you'll probably need to provide some
  * assembly language support for your architecture.
  */
-#define NO_REGS
+#define NO_MACHREGS
 
 
 /* Define if :xplain should be enabled                                    */