$ofile = $ARGV[1];
if ( $TargetPlatform =~ /^i386-/ ) {
- $StolenX86Regs = $ARGV[2];
+ if ($ARGV[2] eq '') {
+ $StolenX86Regs = 4;
+ } else {
+ $StolenX86Regs = $ARGV[2];
+ }
}
&mangle_asm($ifile,$ofile);
$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$/;
} else {
print STDERR "$Pgm: unknown epilogue mangling? $TargetPlatform\n";
}
- # HWL HACK: dont die, just print a warning
- #print stderr "HWL: this should die! Epilogue junk?: $e\n" if $e =~ /^\t[^\.]/
- # && $TargetPlatform !~ /^powerpc-/; #ToDo: remove test
- # ** FIXME:
- # ** chak:
- # Commented this out, because it complains about junk that
- # is later removed in the FUNNY#END#THING loop - but as I am
- # not sure how this could ever have worked, there may be a
- # better solution...
- #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;
# 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;