X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FnativeGen%2FNCG.h;h=ac69c2666617ccb84774b7a4a5208625e37dc3ee;hb=23c94851fb2c98d345d913d35a5a12bbc3a346bd;hp=4b3049b0b2e3c5d4e6457e176ea4afd5f44bb73e;hpb=7d61cb61daa5e433a0cb85b34b7f0c58b2f961ff;p=ghc-hetmet.git

diff --git a/ghc/compiler/nativeGen/NCG.h b/ghc/compiler/nativeGen/NCG.h
index 4b3049b..ac69c26 100644
--- a/ghc/compiler/nativeGen/NCG.h
+++ b/ghc/compiler/nativeGen/NCG.h
@@ -1,5 +1,16 @@
+#define COMMA ,
+
 #ifndef NCG_H
 #define NCG_H
+#if 0
+ COMPILING_NCG is used to control the visibility of 
+ relevant information from the GHC header files when
+ compiling the native code generator modules.
+#endif
+
+#ifndef COMPILING_NCG
+#define COMPILING_NCG
+#endif
 
 #if 0
 
@@ -14,7 +25,7 @@ you will screw up the layout where they are used in case expressions!
 
 #define FAST_REG_NO FAST_INT
 
-#include "../../includes/platform.h"
+#include "../../includes/config.h"
 
 #if 0
 {-testing only-}
@@ -37,13 +48,19 @@ you will screw up the layout where they are used in case expressions!
 # define STOLEN_X86_REGS 4
 -- HACK: go for the max
 #endif
+
 #include "../../includes/MachRegs.h"
 
 #if alpha_TARGET_ARCH
 # define BYTES_PER_WORD 8
 # define BYTES_PER_WORD_STR "8"
 
-# include "../../includes/alpha-dec-osf1.h"
+# if osf1_TARGET_OS
+#  include "../../includes/alpha-dec-osf1.h"
+# endif
+# if osf3_TARGET_OS
+#  include "../../includes/alpha-dec-osf3.h"
+# endif
 #endif
 
 #if i386_TARGET_ARCH
@@ -65,6 +82,9 @@ you will screw up the layout where they are used in case expressions!
 # if bsdi_TARGET_OS
 #  include "../../includes/i386-unknown-bsdi.h"
 # endif
+# if cygwin32_TARGET_OS
+#  include "../../includes/i386-unknown-cygwin32.h"
+# endif
 # if solaris2_TARGET_OS
 #  include "../../includes/i386-unknown-solaris2.h"
 # endif
@@ -127,6 +147,12 @@ you will screw up the layout where they are used in case expressions!
 #else
 # define IF_OS_bsdi(x,y) y
 #endif
+-- - - - - - - - - - - - - - - - - - - - - - 
+#if cygwin32_TARGET_OS
+# define IF_OS_cygwin32(x,y) x
+#else
+# define IF_OS_cygwin32(x,y) y
+#endif
 ---------------------------------------------
 #if sparc_TARGET_ARCH
 # define IF_ARCH_sparc(x,y) x