[project @ 2001-03-07 10:27:43 by rrt]

[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 fa43ae9..cd4d99a 100644 (file)
--- a/ghc/driver/mangler/ghc-asm.lprl
+++ b/ghc/driver/mangler/ghc-asm.lprl
@@ -417,6 +417,7 @@ sub mangle_asm {
     $i = 0; $chkcat[0] = 'misc'; $chk[0] = '';
 
     while (<INASM>) {
+       tr/\r//d if $TargetPlatform =~ /-mingw32$/;
        next if $T_STABBY && /^\.stab.*${T_US}__stg_split_marker/o;
        next if $T_STABBY && /^\.stab.*ghc.*c_ID/;
        next if /^\t\.def.*endef$/;
@@ -758,11 +759,8 @@ sub mangle_asm {
                    print STDERR "$Pgm: unknown epilogue mangling? $TargetPlatform\n";
                }
 
-               # --- Can't test for residual epilogue junk reliably because
-               # --- there might be some directives left over that we're going
-               # --- to move to the next chunk (see below).
-               # die "Epilogue junk?: $e\n" if $e =~ /^\t[^\.\n]/
-               #    && $TargetPlatform !~ /^powerpc-/; #ToDo: remove test
+               print "WARNING: Epilogue junk?: $e\n" if $e =~ /^\t\s*[^\.\s\n]/
+                  && $TargetPlatform !~ /^powerpc-/; #ToDo: remove test
 
                # glue together what's left
                $c = $r . $e;
@@ -1087,7 +1085,7 @@ sub mangle_asm {
                    # references to fast-entry point.
                    # (questionable re hppa and mips...)
                    print STDERR "still has jump to fast entry point:\n$c"
-                       if $c =~ /${T_US}${symb}_fast/;
+                       if $c =~ /\b${T_US}${symb}_fast/;
                }
 
                print OUTASM $T_HDR_entry;