summaryrefslogtreecommitdiff
path: root/libpthread/nptl/sysdeps
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2010-12-01 17:04:05 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-12-01 17:04:05 +0100
commitbfeeeb57588f6a58d6a154fbc59b30fb48e27956 (patch)
tree4a270a8ca30d09378afb916f0f3bfb90301bfb7c /libpthread/nptl/sysdeps
parent0c468129356f5ce6780e7369c271d74631ae03ba (diff)
Revert "libc_tls: Do not include generic libc-tls from arch specific implementation"
This reverts commit 0c468129356f5ce6780e7369c271d74631ae03ba. Indeed recent updates into buildsys managed to filter-out generic implementation when arch specific one is defined, so duplicated symbols into the libc.a In the meanwhile, do a minor fix into mips version not using relative path to include <generic/libc-tls.c> Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/nptl/sysdeps')
-rw-r--r--libpthread/nptl/sysdeps/alpha/libc-tls.c1
-rw-r--r--libpthread/nptl/sysdeps/mips/libc-tls.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libpthread/nptl/sysdeps/alpha/libc-tls.c b/libpthread/nptl/sysdeps/alpha/libc-tls.c
index 01f6f3c04..a3b68e928 100644
--- a/libpthread/nptl/sysdeps/alpha/libc-tls.c
+++ b/libpthread/nptl/sysdeps/alpha/libc-tls.c
@@ -17,6 +17,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <sysdeps/generic/libc-tls.c>
#include <dl-tls.h>
#if USE_TLS
diff --git a/libpthread/nptl/sysdeps/mips/libc-tls.c b/libpthread/nptl/sysdeps/mips/libc-tls.c
index 7bbba01d1..157ba3389 100644
--- a/libpthread/nptl/sysdeps/mips/libc-tls.c
+++ b/libpthread/nptl/sysdeps/mips/libc-tls.c
@@ -17,6 +17,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <sysdeps/generic/libc-tls.c>
#include <dl-tls.h>
#if USE_TLS