72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
Hi,
|
|
|
|
As suggested by richi.
|
|
regtested on i686-linux-gnu with all default languages and no regressions.
|
|
Ok for trunk?
|
|
|
|
gcc/ChangeLog
|
|
2010-03-15 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
|
|
|
|
PR target/32219
|
|
* varasm.c (default_binds_local_p_1): Weak data is not local.
|
|
|
|
gcc/testsuite/ChangeLog
|
|
2010-03-15 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
|
|
|
|
PR target/32219
|
|
* gcc.dg/visibility-21.c: New test.
|
|
|
|
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
|
|
---
|
|
gcc/testsuite/gcc.dg/visibility-21.c | 14 ++++++++++++++
|
|
gcc/varasm.c | 8 ++++----
|
|
2 files changed, 18 insertions(+), 4 deletions(-)
|
|
create mode 100644 gcc/testsuite/gcc.dg/visibility-21.c
|
|
|
|
Index: gcc-4_6-branch/gcc/testsuite/gcc.dg/visibility-21.c
|
|
===================================================================
|
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
+++ gcc-4_6-branch/gcc/testsuite/gcc.dg/visibility-21.c 2011-10-18 17:11:33.224827436 -0700
|
|
@@ -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;
|
|
+}
|
|
+
|
|
Index: gcc-4_6-branch/gcc/varasm.c
|
|
===================================================================
|
|
--- gcc-4_6-branch.orig/gcc/varasm.c 2011-09-16 19:58:21.000000000 -0700
|
|
+++ gcc-4_6-branch/gcc/varasm.c 2011-10-18 17:19:06.431074788 -0700
|
|
@@ -6760,6 +6760,10 @@
|
|
/* 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)
|
|
@@ -6773,11 +6777,6 @@
|
|
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)
|