aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-sparc.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 508ac0b..d55b201 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-08 Jakub Jelinek <jakub@redhat.com>
+
+ * config/tc-sparc.c (md_apply_fix3): Handle relocs against SEC_MERGE
+ section symbols the same way as externs.
+
2001-09-07 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
* config/tc-mips.c (s_mipsset): Reallow unrestricted use of .set mipsX
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index a0a1d31..33ea071 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -2908,6 +2908,7 @@ md_apply_fix3 (fixP, value, segment)
if (symbol_used_in_reloc_p (fixP->fx_addsy)
&& (S_IS_EXTERNAL (fixP->fx_addsy)
|| S_IS_WEAK (fixP->fx_addsy)
+ || (S_GET_SEGMENT (fixP->fx_addsy)->flags & SEC_MERGE)
|| (sparc_pic_code && ! fixP->fx_pcrel)
|| (S_GET_SEGMENT (fixP->fx_addsy) != segment
&& ((bfd_get_section_flags (stdoutput,