Merge commit 'refs/top-bases/t/tls' into t/tls

1 files changed, 12 insertions, 9 deletions

diff --git a/sysdeps/unix/sysv/linux/nios2/localplt.data b/sysdeps/unix/sysv/linux/nios2/localplt.data
index 08c88dc9c0..4430a5891e 100644
--- a/sysdeps/unix/sysv/linux/nios2/localplt.data
+++ b/sysdeps/unix/sysv/linux/nios2/localplt.data
@@ -1,11 +1,10 @@
 libc.so: realloc
-libc.so: __eqsf2
 libc.so: __floatsisf
-libc.so: __gtdf2
+libc.so: __gtdf2 ?
 libc.so: __ltdf2
 libc.so: __gedf2
 libc.so: malloc
-libc.so: __gtsf2
+libc.so: __gtsf2 ?
 libc.so: __nesf2
 libc.so: memalign
 libc.so: __mulsf3
@@ -13,10 +12,10 @@ libc.so: __floatunsisf
 libc.so: __addsf3
 libc.so: __fixsfsi
 libc.so: __subsf3
-libc.so: __unorddf2
+libc.so: __unorddf2 ?
 libc.so: calloc
 libc.so: __muldf3
-libc.so: __unordsf2
+libc.so: __unordsf2 ?
 libc.so: free
 libc.so: __subdf3
 libc.so: __ledf2
@@ -26,12 +25,16 @@ libc.so: __floatsidf
 libc.so: __divsf3
 libc.so: __nedf2
 libc.so: __eqdf2
+libc.so: __extendsfdf2
 libm.so: matherr
-# The dynamic loader uses __libc_memalign internally to allocate aligned
-# TLS storage. The other malloc family of functions are expected to allow
-# user symbol interposition.
-ld.so: __libc_memalign
+# The main malloc is interposed into the dynamic linker, for
+# allocations after the initial link (when dlopen is used).
 ld.so: malloc
 ld.so: calloc
 ld.so: realloc
 ld.so: free
+# The TLS-enabled version of these functions is interposed from libc.so.
+ld.so: _dl_signal_error
+ld.so: _dl_catch_error
+ld.so: _dl_signal_exception
+ld.so: _dl_catch_exception