about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/alpha/localplt.data22
2 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 27f4417f2b..a5f4185841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2016-11-08  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/unix/sysv/linux/alpha/localplt.data: Make __tls_get_addr
+	optional in ld.so.  Allow R_ALPHA_GLOB_DAT relocation for malloc,
+	calloc, realloc, free, memalign and __libc_memalign rather than
+	making them optional.
+
 	* sysdeps/unix/sysv/linux/nios2/localplt.data: Add __extendsfdf2
 	for libc.so.
 
diff --git a/sysdeps/unix/sysv/linux/alpha/localplt.data b/sysdeps/unix/sysv/linux/alpha/localplt.data
index e2a4311cbd..351596cf57 100644
--- a/sysdeps/unix/sysv/linux/alpha/localplt.data
+++ b/sysdeps/unix/sysv/linux/alpha/localplt.data
@@ -15,11 +15,11 @@ libc.so: _OtsNeqX ?
 libc.so: _OtsNintXQ ?
 libc.so: _OtsSubX ?
 libc.so: _Unwind_Find_FDE
-libc.so: calloc ?
-libc.so: free ?
-libc.so: malloc ?
-libc.so: memalign ?
-libc.so: realloc ?
+libc.so: calloc + RELA R_ALPHA_GLOB_DAT
+libc.so: free + RELA R_ALPHA_GLOB_DAT
+libc.so: malloc + RELA R_ALPHA_GLOB_DAT
+libc.so: memalign + RELA R_ALPHA_GLOB_DAT
+libc.so: realloc + RELA R_ALPHA_GLOB_DAT
 libm.so: matherr
 # We used to offer inline functions that used this, so it must be exported.
 # Ought to reorg things such that carg isn't thus forced to use a plt.
@@ -27,9 +27,9 @@ libm.so: __atan2
 # The dynamic loader needs __tls_get_addr for TLS, and uses __libc_memalign
 # internally to allocate aligned TLS storage. The other malloc family of
 # functions are expected to allow user symbol interposition.
-ld.so: __tls_get_addr
-ld.so: __libc_memalign
-ld.so: malloc
-ld.so: calloc
-ld.so: realloc
-ld.so: free
+ld.so: __tls_get_addr ?
+ld.so: __libc_memalign + RELA R_ALPHA_GLOB_DAT
+ld.so: malloc + RELA R_ALPHA_GLOB_DAT
+ld.so: calloc + RELA R_ALPHA_GLOB_DAT
+ld.so: realloc + RELA R_ALPHA_GLOB_DAT
+ld.so: free + RELA R_ALPHA_GLOB_DAT