projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0a183bd
)
FIX #1343: regex bug in the x86_64 mangler settings
author
Simon Marlow
<simonmar@microsoft.com>
Thu, 10 May 2007 09:20:19 +0000
(09:20 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Thu, 10 May 2007 09:20:19 +0000
(09:20 +0000)
driver/mangler/ghc-asm.lprl
patch
|
blob
|
history
diff --git
a/driver/mangler/ghc-asm.lprl
b/driver/mangler/ghc-asm.lprl
index
7bde909
..
0bda1bb
100644
(file)
--- a/
driver/mangler/ghc-asm.lprl
+++ b/
driver/mangler/ghc-asm.lprl
@@
-218,7
+218,7
@@
sub init_TARGET_STUFF {
$T_CONST_LBL = '^\.LC(\d+):$'; # regexp for what such a lbl looks like
$T_POST_LBL = ':';
$T_CONST_LBL = '^\.LC(\d+):$'; # regexp for what such a lbl looks like
$T_POST_LBL = ':';
- $T_MOVE_DIRVS = '^(\s*\.(globl|text|data|section|align|size|type|ident|local)\s+.*\n)';
+ $T_MOVE_DIRVS = '^(\s*\.(globl|text|data|section|align|size|type|ident|local)([ \t].*)?\n)';
$T_COPY_DIRVS = '\.(globl|type|size|local)';
$T_DOT_WORD = '\.(quad|long|value|byte|zero)';
$T_COPY_DIRVS = '\.(globl|type|size|local)';
$T_DOT_WORD = '\.(quad|long|value|byte|zero)';
@@
-598,7
+598,7
@@
sub mangle_asm {
# Labels ending "_str": these are literal strings.
} elsif ( /^${T_US}([A-Za-z0-9_]+)_str${T_POST_LBL}$/ ) {
$chk[++$i] = $_;
# Labels ending "_str": these are literal strings.
} elsif ( /^${T_US}([A-Za-z0-9_]+)_str${T_POST_LBL}$/ ) {
$chk[++$i] = $_;
- $chkcat[$i] = 'rodata';
+ $chkcat[$i] = 'relrodata';
$chksymb[$i] = '';
} elsif ( $TargetPlatform =~ /-darwin/
&& (/^\s*\.subsections_via_symbols/
$chksymb[$i] = '';
} elsif ( $TargetPlatform =~ /-darwin/
&& (/^\s*\.subsections_via_symbols/