From: Nick Clifton <nickc@redhat.com>
Date: Tue, 12 Apr 2011 11:47:38 +0000 (+0000)
Subject: 	PR gas/12532
X-Git-Tag: sid-snapshot-20110501~188
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d9b4b55c2c581697804e659eecadeaa1c4f97da;p=thirdparty%2Fbinutils-gdb.git

	PR gas/12532
	* config/tc-arm.c (relax_branch): Do not relax branches to
	preemptable global symbols.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index dc2337e8529..e8c9ebe5a80 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-12  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12532
+	* config/tc-arm.c (relax_branch): Do not relax branches to
+	preemptable global symbols.
+
 2011-04-11  Julian Brown  <julian@codesourcery.com>
 
 	* config/tc-arm.c (parse_psr): Add LHS argument. Improve support
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index ae9ba1857a5..736693ee2e3 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -19075,6 +19075,12 @@ relax_branch (fragS *fragp, asection *sec, int bits, long stretch)
   if (S_IS_DEFINED (fragp->fr_symbol)
       && ARM_IS_FUNC (fragp->fr_symbol))
       return 4;
+
+  /* PR 12532.  Global symbols with default visibility might
+     be preempted, so do not relax relocations to them.  */
+  if ((ELF_ST_VISIBILITY (S_GET_OTHER (fragp->fr_symbol)) == STV_DEFAULT)
+      && (! S_IS_LOCAL (fragp->fr_symbol)))
+    return 4;
 #endif
 
   val = relaxed_symbol_addr (fragp, stretch);