projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c83f604
)
workaround for #1421 (Solaris linker being picky about .size)
author
Simon Marlow
<simonmar@microsoft.com>
Thu, 14 Jun 2007 09:57:27 +0000
(09:57 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Thu, 14 Jun 2007 09:57:27 +0000
(09:57 +0000)
driver/mangler/ghc-asm.lprl
patch
|
blob
|
history
diff --git
a/driver/mangler/ghc-asm.lprl
b/driver/mangler/ghc-asm.lprl
index
91d20d6
..
88766cb
100644
(file)
--- a/
driver/mangler/ghc-asm.lprl
+++ b/
driver/mangler/ghc-asm.lprl
@@
-173,7
+173,13
@@
sub init_TARGET_STUFF {
$T_X86_BADJMP = '^\tjmp\s+[^\.\*]';
$T_MOVE_DIRVS = '^(\s*(\.(p2)?align\s.*|\.globl\s+\S+|\.text|\.data|\.section\s+.*|\.type\s+.*|\.size\s+\S+\s*,\s*\d+|\.ident.*|\.local.*)\n)';
$T_X86_BADJMP = '^\tjmp\s+[^\.\*]';
$T_MOVE_DIRVS = '^(\s*(\.(p2)?align\s.*|\.globl\s+\S+|\.text|\.data|\.section\s+.*|\.type\s+.*|\.size\s+\S+\s*,\s*\d+|\.ident.*|\.local.*)\n)';
- $T_COPY_DIRVS = '^\s*\.(globl|type|size|local)';
+ if ( $TargetPlatform =~ /solaris2/ ) {
+ # newer Solaris linkers are picky about .size information, so
+ # omit it (see #1421)
+ $T_COPY_DIRVS = '^\s*\.(globl|local)';
+ } else {
+ $T_COPY_DIRVS = '^\s*\.(globl|type|size|local)';
+ }
$T_DOT_WORD = '\.(long|value|word|byte|zero)';
$T_DOT_GLOBAL = '\.globl';
$T_DOT_WORD = '\.(long|value|word|byte|zero)';
$T_DOT_GLOBAL = '\.globl';