From 94617c5eb8d6077625a5ac261239fb1ed9b2804f Mon Sep 17 00:00:00 2001 From: simonmar Date: Tue, 14 Sep 1999 08:38:08 +0000 Subject: [PATCH] [project @ 1999-09-14 08:38:08 by simonmar] gcc 2.95 on Sparc changed the assembly output slightly. This should fix it. --- ghc/driver/ghc-asm.lprl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ghc/driver/ghc-asm.lprl b/ghc/driver/ghc-asm.lprl index 70f500d..5850074 100644 --- a/ghc/driver/ghc-asm.lprl +++ b/ghc/driver/ghc-asm.lprl @@ -736,7 +736,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//; } @@ -1017,8 +1017,8 @@ sub mangle_asm { } elsif ( $TargetPlatform =~ /^powerpc-|^rs6000-/ ) { $c =~ s/^\tb \.${T_US}${symb}_fast\d+\n//; } elsif ( $TargetPlatform =~ /^sparc-/ ) { - $c =~ s/^\tcall ${T_US}${symb}_fast\d+,.*\n\tnop\n//; - $c =~ s/^\tcall ${T_US}${symb}_fast\d+,.*\n(\t[a-z].*\n)/$1/; + $c =~ s/^\tcall\s+${T_US}${symb}_fast\d+,.*\n\t\s*nop\n//; + $c =~ s/^\tcall\s+${T_US}${symb}_fast\d+,.*\n(\t\s*[a-z].*\n)/$1/; } else { print STDERR "$Pgm: mystery slow-fast dropthrough: $TargetPlatform\n"; } -- 1.7.10.4