X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FnativeGen%2FNCG.h;h=d55e9f458ac006feedc379e272568b4763742124;hb=8d873902b0ba7e267089f9e1faf690368670fe62;hp=d02415f0fd8e48d6a0f234505e4941cf9ed6f3c5;hpb=1fb1ab5d53a09607e7f6d2450806760688396387;p=ghc-hetmet.git

diff --git a/ghc/compiler/nativeGen/NCG.h b/ghc/compiler/nativeGen/NCG.h
index d02415f..d55e9f4 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/config.h"
+#include "../includes/config.h"
 
 #if 0
 {-testing only-}
@@ -37,52 +48,23 @@ 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"
+
+#include "../includes/MachRegs.h"
+#include "../includes/NativeDefs.h"
 
 #if alpha_TARGET_ARCH
 # define BYTES_PER_WORD 8
 # define BYTES_PER_WORD_STR "8"
-
-# include "../../includes/alpha-dec-osf1.h"
 #endif
 
 #if i386_TARGET_ARCH
 # define BYTES_PER_WORD 4
 # define BYTES_PER_WORD_STR "4"
-
-# if linuxaout_TARGET_OS
-#  include "../../includes/i386-unknown-linuxaout.h"
-# endif
-# if linux_TARGET_OS
-#  include "../../includes/i386-unknown-linux.h"
-# endif
-# if freebsd_TARGET_OS
-#  include "../../includes/i386-unknown-freebsd.h"
-# endif
-# if netbsd_TARGET_OS
-#  include "../../includes/i386-unknown-netbsd.h"
-# endif
-# 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
 #endif
 
 #if sparc_TARGET_ARCH
 # define BYTES_PER_WORD 4
 # define BYTES_PER_WORD_STR "4"
-
-# if sunos4_TARGET_OS
-#  include "../../includes/sparc-sun-sunos4.h"
-# endif
-# if solaris2_TARGET_OS
-#  include "../../includes/sparc-sun-solaris2.h"
-# endif
 #endif
 
 ---------------------------------------------
@@ -130,6 +112,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