Hi Max, following patch was developed by crosstool-ng developer. Okay to commit?
best regards Waldemar
>From a34698c8494116eca2c16a88017047a9fb6273bb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb <w...@openadk.org> Date: Wed, 7 Dec 2016 07:59:34 +0100 Subject: [PATCH 2/2] xtensa: fix static linking uClibc-ng 1.0.20 fixed static linking with "libdl" by adding all libdl functions into the libc. On xtensa, though, libdl contains an unresolved reference that is satisfied by the ld.so - which is not a part of the linking in a static case. Signed-off-by: Alexey Neyman <sti...@att.net> Signed-off-by: Waldemar Brodkorb <w...@openadk.org> --- libpthread/nptl/sysdeps/Makefile.commonarch | 5 +++-- libpthread/nptl/sysdeps/xtensa/Makefile.arch | 3 +-- libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S diff --git a/libpthread/nptl/sysdeps/Makefile.commonarch b/libpthread/nptl/sysdeps/Makefile.commonarch index c206ac9..134eade 100644 --- a/libpthread/nptl/sysdeps/Makefile.commonarch +++ b/libpthread/nptl/sysdeps/Makefile.commonarch @@ -32,10 +32,11 @@ libpthread_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libpthread_ar libpthread_arch_OBJS = $(libpthread_subarch_OBJS) $(libpthread_arch_COBJ) $(libpthread_arch_SOBJ) libc_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_CSRC)) -libc_arch_SOBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC)) +libc_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC)) libc_arch_OBJS = $(libc_arch_COBJ) $(libc_arch_SOBJ) libc_arch_a_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_a_CSRC)) -libc_arch_a_OBJS = $(libc_arch_a_COBJ) +libc_arch_a_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_a_SSRC)) +libc_arch_a_OBJS = $(libc_arch_a_COBJ) $(libc_arch_a_SOBJ) librt_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(librt_arch_CSRC)) librt_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(librt_arch_SSRC)) diff --git a/libpthread/nptl/sysdeps/xtensa/Makefile.arch b/libpthread/nptl/sysdeps/xtensa/Makefile.arch index 9e63b19..c26e197 100644 --- a/libpthread/nptl/sysdeps/xtensa/Makefile.arch +++ b/libpthread/nptl/sysdeps/xtensa/Makefile.arch @@ -15,12 +15,11 @@ # License along with the GNU C Library; see the file COPYING.LIB. If # not, see <http://www.gnu.org/licenses/>. -ASFLAGS-dl-tlsdesc.S = -DNOT_IN_libc=1 ASFLAGS-pthread_spin_lock.S = -DNOT_IN_libc -DIS_IN_libpthread ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread libc_arch_a_CSRC = libc-tls.c -librt_arch_a_SSRC = dl-tlsdesc.S +libc_arch_a_SSRC = libc-dl-tlsdesc.S CFLAGS-gen_tlsdesc.c = -S $(libpthread_arch_OUT)/gen_tlsdesc.c: $(libpthread_arch_DIR)/tlsdesc.sym | $(libpthread_arch_OUT) diff --git a/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S b/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S new file mode 100644 index 0000000..39da7c2 --- /dev/null +++ b/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S @@ -0,0 +1 @@ +#include <ldso/ldso/xtensa/dl-tlsdesc.S> -- 2.1.4
_______________________________________________ devel mailing list devel@uclibc-ng.org http://mailman.uclibc-ng.org/cgi-bin/mailman/listinfo/devel
