[git commit prelink 1/1] Revert "libc_tls: Do not include generic libc-tls from arch specific implementation"

Carmelo Amoroso carmelo.amoroso at st.com
Tue Dec 14 07:08:36 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=bfeeeb57588f6a58d6a154fbc59b30fb48e27956
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/prelink

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 at st.com>
---
 libpthread/nptl/sysdeps/alpha/libc-tls.c |    1 +
 libpthread/nptl/sysdeps/mips/libc-tls.c  |    1 +
 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 01f6f3c..a3b68e9 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 7bbba01..157ba33 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
-- 
1.7.2.2



More information about the uClibc-cvs mailing list