[project @ 2002-07-16 10:51:12 by simonmar]

The restore instruction on Sparc apparently has arguments under GCC
3.1, which caused one of the patterns to break in the mangler.

I can now run simple programs compiled with GHC on Sparc using GCC
3.1, so hopefully this fixes it.

MERGE TO STABLE (and the previous one).

diff --git a/ghc/driver/mangler/ghc-asm.lprl b/ghc/driver/mangler/ghc-asm.lprl
index e976570..f3afb96 100644 (file)
--- a/ghc/driver/mangler/ghc-asm.lprl
+++ b/ghc/driver/mangler/ghc-asm.lprl
@@ -834,7 +834,7 @@ sub mangle_asm {
        # toss the register-windowing save/restore/ret* instructions
        # directly:
        if ( $TargetPlatform =~ /^sparc-/ ) {
-           $c =~ s/^\t(save.*|restore|ret|retl)\n//g;
+           $c =~ s/^\t(save.*|restore.*|ret|retl)\n//g;
            # throw away PROLOGUE comments
            $c =~ s/^\t!#PROLOGUE# 0\n\t!#PROLOGUE# 1\n//;
        }