From 49124ecd778bc554ffe5e6bce3dd871a51f2cd14 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Mon, 25 Aug 1997 21:00:20 +0000
Subject: [PATCH] [project @ 1997-08-25 21:00:15 by sof] COMPILING_GHC renamed
to COMPILING_NCG
---
ghc/includes/GranSim.lh | 2 +-
ghc/includes/MachRegs.lh | 4 ++--
ghc/includes/SMInfoTables.lh | 10 +++++-----
ghc/includes/error.h | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ghc/includes/GranSim.lh b/ghc/includes/GranSim.lh
index ea92718c386a..671435582615 100644
--- a/ghc/includes/GranSim.lh
+++ b/ghc/includes/GranSim.lh
@@ -40,7 +40,7 @@ ullong msTime(STG_NO_ARGS);
#if defined(GRAN)
-#if !defined(COMPILING_GHC)
+#if !defined(COMPILING_NCG)
#include "RtsFlags.h"
#endif
diff --git a/ghc/includes/MachRegs.lh b/ghc/includes/MachRegs.lh
index 03cf6e62ac91..ccdccd11ab24 100644
--- a/ghc/includes/MachRegs.lh
+++ b/ghc/includes/MachRegs.lh
@@ -9,7 +9,7 @@ NB: THIS FILE IS INCLUDED IN HASKELL SOURCE!
#ifndef MACHREGS_H
#define MACHREGS_H
-#if defined(__STG_GCC_REGS__) || defined(COMPILING_GHC)
+#if defined(__STG_GCC_REGS__) || defined(COMPILING_NCG)
#include "StgMachDeps.h"
@@ -918,7 +918,7 @@ discretion being the better part of valor, we also don't take
Concluding multi-slurp protection:
\begin{code}
-#endif /* __STG_GCC_REGS__ || COMPILING_GHC */
+#endif /* __STG_GCC_REGS__ || COMPILING_NCG */
#endif /* MACHREGS_H */
\end{code}
diff --git a/ghc/includes/SMInfoTables.lh b/ghc/includes/SMInfoTables.lh
index bcc65eb0bc55..5798becb9b8b 100644
--- a/ghc/includes/SMInfoTables.lh
+++ b/ghc/includes/SMInfoTables.lh
@@ -197,7 +197,7 @@ use extern declarations almost everywhere except for the single module
(\tr{Rep.lc}) in which the rep tables are declared locally.
\begin{code}
-#if defined(COMPILING_REP_LC) || defined(COMPILING_GHC)
+#if defined(COMPILING_REP_LC) || defined(COMPILING_NCG)
# define MAYBE_DECLARE_RTBL(l,s,p)
#else
# define MAYBE_DECLARE_RTBL(l,s,p) EXTDATA_RO(MK_REP_REF(l,s,p));
@@ -613,7 +613,7 @@ specialised marking code.
# define INFO_MARKED_1S(infoptr) (((FP_)(INFO_RTBL(infoptr)))[COMPACTING_INFO_OFFSET+3])
# define INFO_MARKING_1S(infoptr) (((FP_)(INFO_RTBL(infoptr)))[COMPACTING_INFO_OFFSET+4])
-#ifndef COMPILING_GHC
+#ifndef COMPILING_NCG
extern F_ _Dummy_Static_entry(STG_NO_ARGS);
extern F_ _Dummy_Ind_entry(STG_NO_ARGS);
extern F_ _Dummy_Caf_entry(STG_NO_ARGS);
@@ -1165,7 +1165,7 @@ MAYBE_DECLARE_RTBL(Data,,)
}
/* Here is the decl for the only DATA info table used! */
-#ifndef COMPILING_GHC
+#ifndef COMPILING_NCG
EXTDATA_RO(ArrayOfData_info);
#endif
\end{code}
@@ -1237,7 +1237,7 @@ MAYBE_DECLARE_RTBL(ImmuTuple,,)
#endif
/* Here are the decls for the only MUTUPLE info tables used. */
-#ifndef COMPILING_GHC
+#ifndef COMPILING_NCG
EXTDATA_RO(ArrayOfPtrs_info);
EXTDATA_RO(ImMutArrayOfPtrs_info);
EXTDATA_RO(EmptySVar_info);
@@ -1745,7 +1745,7 @@ during a return.
}
/* Declare the phantom info table vectors (just Bool at the moment) */
-#ifndef COMPILING_GHC
+#ifndef COMPILING_NCG
#ifndef aix_TARGET_OS /* AIX gives link errors with this as a const (RO assembler section) */
EXTDATA_RO(PrelBase_Bool_itblvtbl);
#else
diff --git a/ghc/includes/error.h b/ghc/includes/error.h
index fe12ee6c84b5..a49bc008e095 100644
--- a/ghc/includes/error.h
+++ b/ghc/includes/error.h
@@ -1,4 +1,4 @@
-#if !defined(COMPILING_GHC) && !defined(__GLASGOW_HASKELL__)
+#if !defined(COMPILING_NCG) && !defined(__GLASGOW_HASKELL__)
extern int ghc_errno;
extern int ghc_errtype;
extern char *ghc_errstr;
--
GitLab