X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FnativeGen%2FNCG.h;h=9d11c21e4b064b50355e08615dad88a3943194f9;hb=a48cb161bb6986a437c97c08b3bd1a3edbe8ba1d;hp=99f2e22d36dbcf44ade0d8ad70d31e880e95fb9a;hpb=bff69b90234815d3945fe3e76ad57589fe76bc7a;p=ghc-hetmet.git

diff --git a/ghc/compiler/nativeGen/NCG.h b/ghc/compiler/nativeGen/NCG.h
index 99f2e22..9d11c21 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
 
@@ -12,9 +23,7 @@ you will screw up the layout where they are used in case expressions!
 
 #endif
 
-#define FAST_REG_NO FAST_INT
-
-#include "../../includes/config.h"
+#include "../includes/config.h"
 
 #if 0
 {-testing only-}
@@ -37,52 +46,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
 
 ---------------------------------------------
@@ -113,6 +93,12 @@ you will screw up the layout where they are used in case expressions!
 # define IF_OS_netbsd(x,y) y
 #endif
 -- - - - - - - - - - - - - - - - - - - - - - 
+#if openbsd_TARGET_OS
+# define IF_OS_openbsd(x,y) x
+#else
+# define IF_OS_openbsd(x,y) y
+#endif
+-- - - - - - - - - - - - - - - - - - - - - - 
 #if linux_TARGET_OS
 # define IF_OS_linux(x,y) x
 #else