From e0d15f4f8bf28c351b9215ca37f1caa24df0e1fd Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:18:54 +0400
Subject: [PATCH 24/35] PR target/32219

* varasm.c (default_binds_local_p_1): Weak data is not local.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

Upstream-Status: Backport
---
 gcc/testsuite/gcc.dg/visibility-21.c |   14 ++++++++++++++
 gcc/varasm.c                         |    9 ++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/visibility-21.c

diff --git a/gcc/testsuite/gcc.dg/visibility-21.c b/gcc/testsuite/gcc.dg/visibility-21.c
new file mode 100644
index 0000000..be7deda
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/visibility-21.c
@@ -0,0 +1,14 @@
+/* PR target/32219 */
+/* { dg-do run } */
+/* { dg-require-visibility "" } */
+/* { dg-options "-fPIC" { target fpic } } */
+
+extern void f() __attribute__((weak,visibility("hidden")));
+extern int puts( char const* );
+int main()
+{
+	if (f)
+		f();
+	return 0;
+}
+
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 6648103..fadba78 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -6675,6 +6675,10 @@ default_binds_local_p_1 (const_tree exp, int shlib)
   /* Static variables are always local.  */
   else if (! TREE_PUBLIC (exp))
     local_p = true;
+  /* hidden weak can't be overridden by something non-local, all
+     that is possible is that it is not defined at all. */
+  else if (DECL_WEAK (exp))
+    local_p = false;
   /* A variable is local if the user has said explicitly that it will
      be.  */
   else if ((DECL_VISIBILITY_SPECIFIED (exp)
@@ -6688,11 +6692,6 @@ default_binds_local_p_1 (const_tree exp, int shlib)
      local.  */
   else if (DECL_VISIBILITY (exp) != VISIBILITY_DEFAULT)
     local_p = true;
-  /* Default visibility weak data can be overridden by a strong symbol
-     in another module and so are not local.  */
-  else if (DECL_WEAK (exp)
-	   && !resolved_locally)
-    local_p = false;
   /* If PIC, then assume that any global name can be overridden by
      symbols resolved from other modules.  */
   else if (shlib)
-- 
1.7.10.4

