[project @ 2005-02-10 07:01:45 by wolfgang]

[ghc-hetmet.git] / ghc / driver / mangler / ghc-asm.lprl

diff --git a/ghc/driver/mangler/ghc-asm.lprl b/ghc/driver/mangler/ghc-asm.lprl
index 5d5676c..6e29279 100644 (file)
--- a/ghc/driver/mangler/ghc-asm.lprl
+++ b/ghc/driver/mangler/ghc-asm.lprl
@@ -531,7 +531,14 @@ sub mangle_asm {
            $chk[++$i]   = $_;
            $chkcat[$i]  = 'rodata';
            $chksymb[$i] = '';
-
+        } elsif ( $TargetPlatform =~ /-darwin/
+                && (/^\s*\.subsections_via_symbols/
+                  ||/^\s*\.no_dead_strip.*/)) {
+            # Don't allow Apple's linker to do any dead-stripping of symbols
+            # in this file, because it will mess up info-tables in mangled
+            # code.
+            # The .no_dead_strip directives are actually put there by
+            # the gcc3 "used" attribute on entry points.
        } elsif ( /^\s+/ ) { # most common case first -- a simple line!
            # duplicated from the bottom
 
@@ -540,12 +547,6 @@ sub mangle_asm {
        } elsif ( /\.\.ng:$/ && $TargetPlatform =~ /^alpha-/ ) {
            # Alphas: Local labels not to be confused with new chunks
            $chk[$i] .= $_;
-        } elsif ( $TargetPlatform =~ /-darwin/
-                && /^\t\.subsections_via_symbols/) {
-            # Don't allow Apple's linker to do any dead-stripping of symbols
-            # in this file, because it will mess up info-tables in mangled
-            # code.
-
        # NB: all the rest start with a non-space
 
        } elsif ( $TargetPlatform =~ /^mips-/
@@ -1229,7 +1230,7 @@ sub mangle_asm {
                                push(@o,$l);
                                next;
                            }
-                           next if $l =~ /^\s*\..*$symb.*\n/;
+                            next if $l =~ /^\s*\..*$symb.*\n?/;
                            push(@o,$l);
                        }
                        $c = join("\n",@o) . "\n";