From: simonmar <unknown>
Date: Thu, 6 Jul 2000 15:43:28 +0000 (+0000)
Subject: [project @ 2000-07-06 15:43:28 by simonmar]
X-Git-Tag: Approximately_9120_patches~4069
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=df48046455651a44e284e238e2fc4a9c5d101adb;p=ghc-hetmet.git

[project @ 2000-07-06 15:43:28 by simonmar]
A string constant block can consist of multiple .string/.ascii
directives.  The sparc-specific code in this file already handled this
properly, but the x86 code was wrong.
---

diff --git a/ghc/driver/split/ghc-split.lprl b/ghc/driver/split/ghc-split.lprl
index 7d0fa6e..11702c8 100644
--- a/ghc/driver/split/ghc-split.lprl
+++ b/ghc/driver/split/ghc-split.lprl
@@ -290,7 +290,7 @@ sub process_asm_block_iX86 {
     $str = "\.text\n\t.align 4\n" . $str;
 
     # remove/record any literal constants defined here
-    while ( ($str =~ /(\.?(LC\d+):\n\t\.(ascii|string).*\n)/ )) {
+    while ( ($str =~ /(\.?(LC\d+):\n(\t\.(ascii|string).*\n)+)/ )) {
 	local($label) = $2;
 	local($body)  = $1;
 
@@ -299,7 +299,7 @@ sub process_asm_block_iX86 {
 
 	$LocalConstant{$label} = $body;
 	
-	$str =~ s/\.?LC\d+:\n\t\.(ascii|string).*\n//;
+	$str =~ s/\.?LC\d+:\n(\t\.(ascii|string).*\n)+//;
     }
 
     # inject definitions for any local constants now used herein