From: wolfgang <unknown>
Date: Sat, 30 Apr 2005 15:45:58 +0000 (+0000)
Subject: [project @ 2005-04-30 15:45:58 by wolfgang]
X-Git-Tag: Initial_conversion_from_CVS_complete~625
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=87822a2e7354b1e93ac97d7ffc72f7aed5ade772;p=ghc-hetmet.git

[project @ 2005-04-30 15:45:58 by wolfgang]
More Mac OS X Tiger / GCC 4.0 fixes.

MERGE TO STABLE
---

diff --git a/ghc/driver/mangler/ghc-asm.lprl b/ghc/driver/mangler/ghc-asm.lprl
index ab226ff..9f855a8 100644
--- a/ghc/driver/mangler/ghc-asm.lprl
+++ b/ghc/driver/mangler/ghc-asm.lprl
@@ -565,6 +565,12 @@ sub mangle_asm {
 	    $chkcat[$i]  = 'dyld';
 	    $chksymb[$i] = '';
 
+	} elsif ( $TargetPlatform =~ /^powerpc-apple-.*/ && $chkcat[$i] eq 'dyld' && /^\s*\.data/)
+	{	# non_lazy_symbol_ptrs that point to local symbols
+	    $chk[++$i]   = $_;
+	    $chkcat[$i]  = 'dyld';
+	    $chksymb[$i] = '';
+
 	} elsif ( /^\s+/ ) { # most common case first -- a simple line!
 	    # duplicated from the bottom
 
@@ -711,11 +717,6 @@ sub mangle_asm {
 	    	$chkcat[$i]  = 'unknown';
 	    }
 
-	} elsif ( $TargetPlatform =~ /^powerpc-apple-.*/ && /^\.data/ && $chkcat[$i] eq 'dyld')
-	{	# non_lazy_symbol_ptrs that point to local symbols
-	    $chk[++$i]   = $_;
-	    $chkcat[$i]  = 'dyld';
-	    $chksymb[$i] = '';
 	} elsif ( $TargetPlatform =~ /^powerpc-.*-linux/ && /^\.LCTOC1 = /o ) {
 		# PowerPC Linux's large-model PIC (-fPIC) generates a gobal offset
 		# table "by hand". Be sure to copy it over.