From 87822a2e7354b1e93ac97d7ffc72f7aed5ade772 Mon Sep 17 00:00:00 2001 From: wolfgang Date: Sat, 30 Apr 2005 15:45:58 +0000 Subject: [PATCH] [project @ 2005-04-30 15:45:58 by wolfgang] More Mac OS X Tiger / GCC 4.0 fixes. MERGE TO STABLE --- ghc/driver/mangler/ghc-asm.lprl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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. -- 1.7.10.4