about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-03-06 04:55:56 -0800
committerH.J. Lu <hjl.tools@gmail.com>2015-03-31 17:25:36 -0700
commit3350e1867c0b82957093fa9e1c52a5f841881377 (patch)
treec7967342a4c50a2f18243115851e17436bcd4b25
parenta0f66d616575074b0f569da3f561fa0fe09fa312 (diff)
downloadglibc-3350e1867c0b82957093fa9e1c52a5f841881377.tar.gz
glibc-3350e1867c0b82957093fa9e1c52a5f841881377.tar.xz
glibc-3350e1867c0b82957093fa9e1c52a5f841881377.zip
Replace __attribute__((visibility("protected"))) hjl/pr17711/2.18
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.

Cherry-pick from master: e0ed2fb40a0e29c43cf60addc74741dab15f2e05
	* elf/ifuncdep2.c (global): Replace
	__attribute__((visibility("protected"))) with
	asm (".protected global").
	* elf/ifuncmod1.c (global): Likewise.
	* elf/ifuncmod5.c (global): Likewise.
-rw-r--r--elf/ifuncdep2.c8
-rw-r--r--elf/ifuncmod1.c8
-rw-r--r--elf/ifuncmod5.c8
3 files changed, 21 insertions, 3 deletions
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)