[project @ 2001-02-13 15:51:57 by sewardj]

[ghc-hetmet.git] / ghc / compiler / nativeGen / NCG.h

diff --git a/ghc/compiler/nativeGen/NCG.h b/ghc/compiler/nativeGen/NCG.h
index c4e409e..9d11c21 100644 (file)
--- a/ghc/compiler/nativeGen/NCG.h
+++ b/ghc/compiler/nativeGen/NCG.h
@@ -1,3 +1,5 @@
+#define COMMA ,
+
 #ifndef NCG_H
 #define NCG_H
 #if 0
@@ -21,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-}
@@ -47,52 +47,22 @@ you will screw up the layout where they are used in case expressions!
 -- 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
 
 ---------------------------------------------
@@ -123,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