Tweak the mangler; fixes trac #2871

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

diff --git a/driver/mangler/ghc-asm.lprl b/driver/mangler/ghc-asm.lprl
index 8cfd5b5..34f4758 100644 (file)
--- a/driver/mangler/ghc-asm.lprl
+++ b/driver/mangler/ghc-asm.lprl
@@ -216,7 +216,7 @@ sub init_TARGET_STUFF {
     $T_HDR_vector   = "\.text\n\t\.align 8\n";
 
     #--------------------------------------------------------#
-    } elsif ( $TargetPlatform =~ /^x86_64-.*-(linux|openbsd)$/m ) {
+    } elsif ( $TargetPlatform =~ /^x86_64-.*-(linux|openbsd|freebsd|netbsd)$/m ) {
 
     $T_STABBY       = 0; # 1 iff .stab things (usually if a.out format)
     $T_US           = ''; # _ if symbols have an underscore on the front
@@ -324,7 +324,7 @@ sub init_TARGET_STUFF {
 
     #--------------------------------------------------------#
     } elsif ( $TargetPlatform =~ /^i386-apple-darwin.*/m ) {
-                               # Apple PowerPC Darwin/MacOS X.
+                               # Apple i386 Darwin/MacOS X.
     $T_STABBY      = 0; # 1 iff .stab things (usually if a.out format)
     $T_US          = '_'; # _ if symbols have an underscore on the front
     $T_PRE_APP     = 'DOESNT APPLY'; # regexp that says what comes before APP/NO_APP
@@ -353,7 +353,7 @@ sub init_TARGET_STUFF {
 
     #--------------------------------------------------------#
     } elsif ( $TargetPlatform =~ /^x86_64-apple-darwin.*/m ) {
-                               # Apple PowerPC Darwin/MacOS X.
+                               # Apple amd64 Darwin/MacOS X.
     $T_STABBY      = 0; # 1 iff .stab things (usually if a.out format)
     $T_US          = '_'; # _ if symbols have an underscore on the front
     $T_PRE_APP     = 'DOESNT APPLY'; # regexp that says what comes before APP/NO_APP
@@ -580,7 +580,7 @@ sub mangle_asm {
        next if /${T_PRE_APP}(NO_)?APP/om; 
        next if /^;/m && $TargetPlatform =~ /^hppa/m;
 
-       next if /(^$|^\t\.file\t|^ # )/m && $TargetPlatform =~ /^(mips|ia64)-/m;
+       next if /(^$|^\t\.file\t|^ # )/m && $TargetPlatform =~ /(^mips-|^ia64-|-mingw32$)/m;
 
        if ( $TargetPlatform =~ /^mips-/m 
          && /^\t\.(globl\S+\.text|comm\t)/m ) {