From: wolfgang <unknown>
Date: Tue, 29 Apr 2003 21:37:31 +0000 (+0000)
Subject: [project @ 2003-04-29 21:37:31 by wolfgang]
X-Git-Tag: Approx_11550_changesets_converted~936
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=b4a006b85f12fd8ff79a785d3fcd50fdcae73d1c

[project @ 2003-04-29 21:37:31 by wolfgang]
Unbreak Mac OS X build (#ifdef mixup)
---

diff --git a/ghc/rts/Linker.c b/ghc/rts/Linker.c
index c9578fe..5f65e47 100644
--- a/ghc/rts/Linker.c
+++ b/ghc/rts/Linker.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Linker.c,v 1.118 2003/03/31 14:02:32 simonmar Exp $
+ * $Id: Linker.c,v 1.119 2003/04/29 21:37:31 wolfgang Exp $
  *
  * (c) The GHC Team, 2000-2003
  *
@@ -92,7 +92,7 @@ static int ocVerifyImage_MachO    ( ObjectCode* oc );
 static int ocGetNames_MachO       ( ObjectCode* oc );
 static int ocResolve_MachO        ( ObjectCode* oc );
 
-static void machoInitSymbolsWithoutUnderscore();
+static void machoInitSymbolsWithoutUnderscore( void );
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -551,15 +551,17 @@ typedef struct _RtsSymbolVal {
 /* force these symbols to be present */
 #define RTS_EXTRA_SYMBOLS			\
       Sym(__divsf3)
-#elif defined(powerpc_TARGET_ARCH)
+#else
+#define RTS_EXTRA_SYMBOLS /* nothing */
+#endif
+
+#ifdef darwin_TARGET_OS
       // Symbols that don't have a leading underscore
       // on Mac OS X. They have to receive special treatment,
       // see machoInitSymbolsWithoutUnderscore()
 #define RTS_MACHO_NOUNDERLINE_SYMBOLS		\
       Sym(saveFP)				\
       Sym(restFP)
-#else
-#define RTS_EXTRA_SYMBOLS /* nothing */
 #endif
 
 /* entirely bogus claims about types of these symbols */