From: rrt <unknown>
Date: Wed, 7 Mar 2001 10:27:43 +0000 (+0000)
Subject: [project @ 2001-03-07 10:27:43 by rrt]
X-Git-Tag: Approximately_9120_patches~2456
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=fa4769e95b2ceeb4cff8ab71f3b74fc8f2d9d7a0;p=ghc-hetmet.git

[project @ 2001-03-07 10:27:43 by rrt]
On mingwin, remove CRs from input file, to prevent problems when
reading from unmounted partitions. (This shouldn't be a problem, but
it is; this fix makes the mangler a bit more robust anyway.)
---

diff --git a/ghc/driver/mangler/ghc-asm.lprl b/ghc/driver/mangler/ghc-asm.lprl
index 6e5da21..cd4d99a 100644
--- 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$/;