From e0ed2fb40a0e29c43cf60addc74741dab15f2e05 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 6 Mar 2015 04:55:56 -0800 Subject: [PATCH] Replace __attribute__((visibility("protected"))) With copy relocation, address of protected data defined in the shared library may be external. Compiler shouldn't asssume protected data will be local. But due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65248 __attribute__((visibility("protected"))) doesn't work correctly, we need to use asm (".protected xxx") instead. * elf/ifuncdep2.c (global): Replace __attribute__((visibility("protected"))) with asm (".protected global"). * elf/ifuncmod1.c (global): Likewise. * elf/ifuncmod5.c (global): Likewise. --- ChangeLog | 8 ++++++++ elf/ifuncdep2.c | 8 +++++++- elf/ifuncmod1.c | 8 +++++++- elf/ifuncmod5.c | 8 +++++++- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index eaccb2cf50..7f2e14bcd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-03-06 H.J. Lu + + * elf/ifuncdep2.c (global): Replace + __attribute__((visibility("protected"))) with + asm (".protected global"). + * elf/ifuncmod1.c (global): Likewise. + * elf/ifuncmod5.c (global): Likewise. + 2015-03-06 Joseph Myers * soft-fp/soft-fp.h [!_LIBC && __KERNEL__]: Include diff --git a/elf/ifuncdep2.c b/elf/ifuncdep2.c index 99d19263ae..6e66d318a6 100644 --- a/elf/ifuncdep2.c +++ b/elf/ifuncdep2.c @@ -2,7 +2,13 @@ #include "ifunc-sel.h" -int global __attribute__ ((visibility ("protected"))) = -1; +int global = -1; +/* Can't use __attribute__((visibility("protected"))) until the GCC bug: + + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65248 + + is fixed. */ +asm (".protected global"); static int one (void) diff --git a/elf/ifuncmod1.c b/elf/ifuncmod1.c index 2b8195ce55..0b6138056d 100644 --- a/elf/ifuncmod1.c +++ b/elf/ifuncmod1.c @@ -6,7 +6,13 @@ */ #include "ifunc-sel.h" -int global __attribute__ ((visibility ("protected"))) = -1; +int global = -1; +/* Can't use __attribute__((visibility("protected"))) until the GCC bug: + + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65248 + + is fixed. */ +asm (".protected global"); static int one (void) diff --git a/elf/ifuncmod5.c b/elf/ifuncmod5.c index 9a08e8cf53..0e65a63691 100644 --- a/elf/ifuncmod5.c +++ b/elf/ifuncmod5.c @@ -1,7 +1,13 @@ /* Test STT_GNU_IFUNC symbols without direct function call. */ #include "ifunc-sel.h" -int global __attribute__ ((visibility ("protected"))) = -1; +int global = -1; +/* Can't use __attribute__((visibility("protected"))) until the GCC bug: + + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65248 + + is fixed. */ +asm (".protected global"); static int one (void)