devel May 2016

devel@uclibc-ng.org

13 participants
29 discussions

new release 1.0.15
by Waldemar Brodkorb 29 May '16

29 May '16

Hi Embedded Hackers, I cut a new release. Most important changes are the removal of LT.new. LT.old symbols got renamed. Please update your uClibc-ng configs. The microblaze support got some needed fixups and seems to be usable now. (LDSO support fixed, Linuxthreads support fixed). You need a GCC patch to make use of it. http://cgit.openadk.org/cgi/cgit/openadk.git/tree/toolchain/gcc/patches/5.3… Context functionality for sparc added in this release. Alexey Brodkin (1): ldso: Force disable -mlong-calls when compiling ldso for ARC Baruch Siach (1): sigaction: fix for THREADS_NATIVE Cupertino Miranda (1): ldso/ARC: fix DT_RELACOUNT handling Leonid Lisovskiy (2): linuxthreads: Fix warnings in pthread_tryjoin_np(), pthread_timedjoin_np() buildsys: Fix broken link.asneeded function Waldemar Brodkorb (14): dltest: fix a typo sparc: add deprecated context switching functions test: add memmove test fixup stupid mixup of Makefile copyright and C code nptl/tls tests need shared library support libpthread: add missing file for gdbserver remove linuxthreads.new, rename linuxthreads.old microblaze: fix ELF detection in ld.so microblaze: fix setjmp/longjmp microblaze: fix linuxthreads support sparc: remove unused 64 bit support code Revert "disable always failing tst-signal7" mips: allow to disable prefetch support in memcpy/memset bump for release Have fun, Waldemar

1 0

uClibc-ng - small C library for embedded systems annotated tag v1.0.15 created. v1.0.15
by wbx＠helium.openadk.org 29 May '16

29 May '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The annotated tag, v1.0.15 has been created at 5a5dc1a00c63f86f5178c07a5db6bb3e2905863a (tag) tagging 95174cb69c523a1544e5f6f20e47f7d60007e569 (commit) replaces v1.0.14 tagged by Waldemar Brodkorb on Sun May 29 09:19:37 2016 +0200 - Log ----------------------------------------------------------------- release 1.0.15 - Val-Dieu Brune -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org iQIcBAABCAAGBQJXSpgKAAoJEMEz+QKmmH5imz8QAM+/sl7c82+VjddOQUJfxO45 LlEcPbFLp8AU658f/wXXInUseBsWMAdV/260p+JblciR+Gsm9zrE7s59k1IvbtxW xZcsVaRXe4F+DMcyKRjk9uxH2kCaoYe9MUliqvMUirJEKQhKKUnPSlTt1r0Wt1pq jMkbHzdZgR8BsvwHow+CIILrY/HBbDhkPEKh4JhvLNQqAUA+Y2SDhDLOk6pKXVN8 zXYuUliof/24HoyMprR//5w6ZggQy8mk+O2IZqk0tsd4B7G/TcutWFRBOf9Il/Zn 3B7R5vcmnXX80S+WLruHdtw7z8GizaaZd0lqy+quFx5vA4IiLDg9Vq6A6lWSCwan mmgcyLjPfrW5GgjSrkVFhk4U6zZZ9O45OmCMpjHK7CxPZYeezvrKQpokuBl1gix9 mE0MtQfY9sz3LkuOy6kx/3YM16kWv/SKoM6wh4wHC4ae2GHXdwp3o3N/J+PamusL PKjGQ2AjdFzzFo94y6d98AL2Y3fuCRYWuHQlNPg8gdoIrq3Q6Xj2kEO6e9/q9FS+ hBfI6hlJjdOzCLPx8AgP4cptd5esBbxlG/1FtA6OIOqYAbtuOTRaqknFxyyj4RQ9 RNeEfxD2J9u8xjL3tsN12NdLRvgJfhHE1F7Mu7v5ia/2ITYeJvFXKm2M1nsM0k3G FqGqKCYEDBVkbi/SKCIo =dxSt -----END PGP SIGNATURE----- Alexey Brodkin (1): ldso: Force disable -mlong-calls when compiling ldso for ARC Baruch Siach (1): sigaction: fix for THREADS_NATIVE Cupertino Miranda (1): ldso/ARC: fix DT_RELACOUNT handling Leonid Lisovskiy (2): linuxthreads: Fix warnings in pthread_tryjoin_np(), pthread_timedjoin_np() buildsys: Fix broken link.asneeded function Waldemar Brodkorb (14): dltest: fix a typo sparc: add deprecated context switching functions test: add memmove test fixup stupid mixup of Makefile copyright and C code nptl/tls tests need shared library support libpthread: add missing file for gdbserver remove linuxthreads.new, rename linuxthreads.old microblaze: fix ELF detection in ld.so microblaze: fix setjmp/longjmp microblaze: fix linuxthreads support sparc: remove unused 64 bit support code Revert "disable always failing tst-signal7" mips: allow to disable prefetch support in memcpy/memset bump for release ----------------------------------------------------------------------- hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. v1.0.14-19-g95174cb
by wbx＠helium.openadk.org 29 May '16

29 May '16

1 0

uClibc-ng - small C library for embedded systems branch master updated. v1.0.14-18-g557f663
by wbx＠helium.openadk.org 29 May '16

29 May '16

1 0

[PATCH] ldso: Force disable -mlong-calls when compiling ldso for ARC
by Alexey Brodkin 28 May '16

28 May '16

Even though by default for ARC uClibc gets compiled with disabled long-calls user may provide UCLIBC_EXTRA_CFLAGS with "-mlong-calls". With this option uClibc will be successfully compiled but later it will fail in runtime because dynamic loader cannot deal with relocations at least very early on its start. In particular it will be seen as call to non-relocated symbol _dl_parse_dynamic_info() which ends-up as a segfault like this: ------------------------>8-------------------- potentially unexpected fatal signal 11. Path: /bin/test CPU: 0 PID: 63 Comm: test Not tainted 4.5.2 #7 task: 9f13f180 ti: 9f166000 task.ti: 9f166000 [ECR ]: 0x00040000 => Insn could not be fetched [EFA ]: 0x0000283c [BLINK ]: 0x2000407c [ERET ]: 0x283c @No matching VMA found [STAT32]: 0x8008009e : IE U BTA: 0x0000283c SP: 0x5fef5ccc FP: 0x00000000 LPS: 0x20004080 LPE: 0x20004064 LPC: 0x00000000 r00: 0x20006684 r01: 0x5fef5db0 r02: 0x00000000 r03: 0x20000000 r04: 0x80808080 r05: 0x2f2f2f2f r06: 0x41464d00 r07: 0x00000080 r08: 0x000000dd r09: 0x00000000 r10: 0x00000073 r11: 0x80808080 r12: 0x2000407c r13: 0x20000000 r14: 0x5fef5e74 r15: 0x000ceb3c r16: 0x5fef5e7c r17: 0x5fef5d44 r18: 0x000ceb0c r19: 0xffffffff r20: 0x000ceb1c r21: 0x00000000 r22: 0x00000000 r23: 0x000d08a5 r24: 0x00000000 r25: 0x80808080 Segmentation fault ------------------------>8-------------------- Solution to this issue is simple we make sure dynamic loader never gets compiled with "-mlong-calls" by forcing "-mno-long-calls" on it. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Vineet Gupta <vgupta(a)synopsys.com> Cc: Anton Kolesov <akolesov(a)synopsys.com> Cc: linux-snps-arc(a)lists.infradead.org --- ldso/ldso/Makefile.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index d85646a..dde6a53 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -34,6 +34,10 @@ CFLAGS-$(DODEBUG)-ldso/ldso := -O2 -g CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\" +ifeq ($(TARGET_ARCH),arc) +CFLAGS-ldso.c += -mno-long-calls +endif + LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-$(UCLIBC_LDSO_NAME).so := -Wl,--dsbt-index=1 ifneq ($(SUPPORT_LD_DEBUG),y) LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS) -- 2.5.5

3 2

[PATCH] linuxthreads.old: Fix warnings in pthread_tryjoin_np(), pthread_timedjoin_np()
by Leonid Lisovskiy 28 May '16

28 May '16

Accidentally, commit 43ef9c6b3 wasn't taken into account. Signed-off-by: Leonid Lisovskiy <lly.dev(a)gmail.com> --- libpthread/linuxthreads/join.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpthread/linuxthreads/join.c b/libpthread/linuxthreads/join.c index c7e5479..d422ac5 100644 --- a/libpthread/linuxthreads/join.c +++ b/libpthread/linuxthreads/join.c @@ -230,7 +230,7 @@ int pthread_tryjoin_np(pthread_t thread_id, void ** thread_return) request.req_thread = self; request.req_kind = REQ_FREE; request.req_args.free.thread_id = thread_id; - TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request, + TEMP_FAILURE_RETRY(write(__pthread_manager_request, (char *) &request, sizeof(request))); } return 0; @@ -319,7 +319,7 @@ int pthread_timedjoin_np(pthread_t thread_id, void ** thread_return, request.req_thread = self; request.req_kind = REQ_FREE; request.req_args.free.thread_id = thread_id; - TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request, + TEMP_FAILURE_RETRY(write(__pthread_manager_request, (char *) &request, sizeof(request))); } } -- 1.8.5.6

2 1

[PATCH] buildsys: Fix broken link.asneeded function
by Leonid Lisovskiy 28 May '16

28 May '16

Both $(CC_FLAG_ASNEEDED) and $(CC_FLAG_NO_ASNEEDED) never become "y", must check for non-empty strings. To keep make 3.80 compatibility "$(if" used only. Fixes: 7da4d1e7 "buildsys: do not use $(and)". Signed-off-by: Leonid Lisovskiy <lly.dev(a)gmail.com> --- Rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rules.mak b/Rules.mak index c3dac56..4f82935 100644 --- a/Rules.mak +++ b/Rules.mak @@ -535,7 +535,7 @@ ifdef LD_FLAG_NO_ASNEEDED export CC_FLAG_NO_ASNEEDED:=-Wl,$(LD_FLAG_NO_ASNEEDED) endif endif -link.asneeded = $(if $(findstring yy,$(CC_FLAG_ASNEEDED)$(CC_FLAG_NO_ASNEEDED)),$(CC_FLAG_ASNEEDED) $(1) $(CC_FLAG_NO_ASNEEDED)) +link.asneeded = $(if $(CC_FLAG_ASNEEDED),$(if $(CC_FLAG_NO_ASNEEDED),$(CC_FLAG_ASNEEDED) $(1) $(CC_FLAG_NO_ASNEEDED))) # Check for AS_NEEDED support in linker script (binutils>=2.16.1 has it) ifndef ASNEEDED -- 1.8.5.6

2 1

uClibc-ng - small C library for embedded systems branch master updated. v1.0.14-17-ge517397
by wbx＠helium.openadk.org 28 May '16

28 May '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, master has been updated via e517397535b0777568fd9c13c4214b63c52d0798 (commit) via 77d003b6da2346e8da58c4535d81fe59f8da75b6 (commit) via a50ebea3e3a694bfa8894da9df337f8d24b41bc0 (commit) via 470a2a6bf79bd9f79d0f16f2b2feb9cb208b3144 (commit) via ff6db61ba779a21612b5b16aa2c4a6f2c5c0aac8 (commit) via fb91f53426df19d86edda803ba1b712a61f2a187 (commit) from 63053cbd285f46fbbe1c6660ff0423210c73468c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e517397535b0777568fd9c13c4214b63c52d0798 Author: Leonid Lisovskiy <lly.dev(a)gmail.com> Date: Thu May 26 20:06:36 2016 +0300 buildsys: Fix broken link.asneeded function Both $(CC_FLAG_ASNEEDED) and $(CC_FLAG_NO_ASNEEDED) never become "y", must check for non-empty strings. To keep make 3.80 compatibility "$(if" used only. Fixes: 7da4d1e7 "buildsys: do not use $(and)". Signed-off-by: Leonid Lisovskiy <lly.dev(a)gmail.com> commit 77d003b6da2346e8da58c4535d81fe59f8da75b6 Author: Alexey Brodkin <Alexey.Brodkin(a)synopsys.com> Date: Mon May 23 17:31:38 2016 +0300 ldso: Force disable -mlong-calls when compiling ldso for ARC Even though by default for ARC uClibc gets compiled with disabled long-calls user may provide UCLIBC_EXTRA_CFLAGS with "-mlong-calls". With this option uClibc will be successfully compiled but later it will fail in runtime because dynamic loader cannot deal with relocations at least very early on its start. In particular it will be seen as call to non-relocated symbol _dl_parse_dynamic_info() which ends-up as a segfault like this: ------------------------>8-------------------- potentially unexpected fatal signal 11. Path: /bin/test CPU: 0 PID: 63 Comm: test Not tainted 4.5.2 #7 task: 9f13f180 ti: 9f166000 task.ti: 9f166000 [ECR ]: 0x00040000 => Insn could not be fetched [EFA ]: 0x0000283c [BLINK ]: 0x2000407c [ERET ]: 0x283c @No matching VMA found [STAT32]: 0x8008009e : IE U BTA: 0x0000283c SP: 0x5fef5ccc FP: 0x00000000 LPS: 0x20004080 LPE: 0x20004064 LPC: 0x00000000 r00: 0x20006684 r01: 0x5fef5db0 r02: 0x00000000 r03: 0x20000000 r04: 0x80808080 r05: 0x2f2f2f2f r06: 0x41464d00 r07: 0x00000080 r08: 0x000000dd r09: 0x00000000 r10: 0x00000073 r11: 0x80808080 r12: 0x2000407c r13: 0x20000000 r14: 0x5fef5e74 r15: 0x000ceb3c r16: 0x5fef5e7c r17: 0x5fef5d44 r18: 0x000ceb0c r19: 0xffffffff r20: 0x000ceb1c r21: 0x00000000 r22: 0x00000000 r23: 0x000d08a5 r24: 0x00000000 r25: 0x80808080 Segmentation fault ------------------------>8-------------------- Solution to this issue is simple we make sure dynamic loader never gets compiled with "-mlong-calls" by forcing "-mno-long-calls" on it. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Vineet Gupta <vgupta(a)synopsys.com> Cc: Anton Kolesov <akolesov(a)synopsys.com> Cc: linux-snps-arc(a)lists.infradead.org commit a50ebea3e3a694bfa8894da9df337f8d24b41bc0 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Tue May 24 21:39:53 2016 +0200 Revert "disable always failing tst-signal7" This reverts commit fad6c6021feb6c2dd4a3bd5de1113994d4a9b04e. A fix was applied with a90c9ac641ba4f692f5eec209b82097d93e9b813 commit 470a2a6bf79bd9f79d0f16f2b2feb9cb208b3144 Author: Leonid Lisovskiy <lly.dev(a)gmail.com> Date: Tue May 24 22:16:50 2016 +0300 linuxthreads: Fix warnings in pthread_tryjoin_np(), pthread_timedjoin_np() Accidentally, commit 43ef9c6b3 wasn't taken into account. Signed-off-by: Leonid Lisovskiy <lly.dev(a)gmail.com> commit ff6db61ba779a21612b5b16aa2c4a6f2c5c0aac8 Author: Cupertino Miranda <cmiranda(a)synopsys.com> Date: Fri May 20 12:26:27 2016 +0530 ldso/ARC: fix DT_RELACOUNT handling With new binutils supporting DT_RELACOUNT, ldso was crashing as it was parsing relocs incorrectly. Apparently that code ran for first time and was never tested. Signed-off-by: Vineet Gupta <vgupta(a)synopsys.com> commit fb91f53426df19d86edda803ba1b712a61f2a187 Author: Baruch Siach <baruch(a)tkos.co.il> Date: Fri May 20 20:49:25 2016 +0300 sigaction: fix for THREADS_NATIVE Commit 9c4fce55a (nptl: remove sigaction, sigprocmask, and sigfillset from libpthread) removed pt-sigaction.c from the build to fix static build. However, since the libc sigaction is weak when HAS_THREADS is enabled, static build is not be affected. Tested for xtensa, x86, MIPS32 targets. Fixes nptl/tst-signal7. Moreover, commit 9193a76bb from the 0.9.33 branch has the right version. Ref.: http://patchwork.ozlabs.org/patch/286084/ Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> Signed-off-by: Leonid Lisovskiy <lly.dev(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: Rules.mak | 2 +- ldso/ldso/Makefile.in | 4 ++++ ldso/ldso/arc/dl-sysdep.h | 2 +- libpthread/linuxthreads/join.c | 4 ++-- libpthread/nptl/sysdeps/pthread/Makefile.in | 1 + libpthread/nptl/sysdeps/pthread/sigfillset.c | 20 -------------------- libpthread/nptl/sysdeps/pthread/sigprocmask.c | 21 --------------------- test/nptl/Makefile.in | 2 +- 8 files changed, 10 insertions(+), 46 deletions(-) delete mode 100644 libpthread/nptl/sysdeps/pthread/sigfillset.c delete mode 100644 libpthread/nptl/sysdeps/pthread/sigprocmask.c diff --git a/Rules.mak b/Rules.mak index c3dac56..4f82935 100644 --- a/Rules.mak +++ b/Rules.mak @@ -535,7 +535,7 @@ ifdef LD_FLAG_NO_ASNEEDED export CC_FLAG_NO_ASNEEDED:=-Wl,$(LD_FLAG_NO_ASNEEDED) endif endif -link.asneeded = $(if $(findstring yy,$(CC_FLAG_ASNEEDED)$(CC_FLAG_NO_ASNEEDED)),$(CC_FLAG_ASNEEDED) $(1) $(CC_FLAG_NO_ASNEEDED)) +link.asneeded = $(if $(CC_FLAG_ASNEEDED),$(if $(CC_FLAG_NO_ASNEEDED),$(CC_FLAG_ASNEEDED) $(1) $(CC_FLAG_NO_ASNEEDED))) # Check for AS_NEEDED support in linker script (binutils>=2.16.1 has it) ifndef ASNEEDED diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index d85646a..dde6a53 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -34,6 +34,10 @@ CFLAGS-$(DODEBUG)-ldso/ldso := -O2 -g CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\" +ifeq ($(TARGET_ARCH),arc) +CFLAGS-ldso.c += -mno-long-calls +endif + LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-$(UCLIBC_LDSO_NAME).so := -Wl,--dsbt-index=1 ifneq ($(SUPPORT_LD_DEBUG),y) LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS) diff --git a/ldso/ldso/arc/dl-sysdep.h b/ldso/ldso/arc/dl-sysdep.h index b6bda9d..caece99 100644 --- a/ldso/ldso/arc/dl-sysdep.h +++ b/ldso/ldso/arc/dl-sysdep.h @@ -166,7 +166,7 @@ static __always_inline void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { - Elf32_Rel * rpnt = (void *) rel_addr; + Elf32_Rela * rpnt = (void *) rel_addr; --rpnt; do { Elf32_Addr *const reloc_addr = (void *) (load_off + (++rpnt)->r_offset); diff --git a/libpthread/linuxthreads/join.c b/libpthread/linuxthreads/join.c index c7e5479..d422ac5 100644 --- a/libpthread/linuxthreads/join.c +++ b/libpthread/linuxthreads/join.c @@ -230,7 +230,7 @@ int pthread_tryjoin_np(pthread_t thread_id, void ** thread_return) request.req_thread = self; request.req_kind = REQ_FREE; request.req_args.free.thread_id = thread_id; - TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request, + TEMP_FAILURE_RETRY(write(__pthread_manager_request, (char *) &request, sizeof(request))); } return 0; @@ -319,7 +319,7 @@ int pthread_timedjoin_np(pthread_t thread_id, void ** thread_return, request.req_thread = self; request.req_kind = REQ_FREE; request.req_args.free.thread_id = thread_id; - TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request, + TEMP_FAILURE_RETRY(write(__pthread_manager_request, (char *) &request, sizeof(request))); } } diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in index 849c75f..9d99f31 100644 --- a/libpthread/nptl/sysdeps/pthread/Makefile.in +++ b/libpthread/nptl/sysdeps/pthread/Makefile.in @@ -33,6 +33,7 @@ libpthread_pthread_CSRC = \ pthread_spin_init.c \ pthread_spin_unlock.c \ pt-longjmp.c \ + pt-sigaction.c \ tpp.c CFLAGS-pthread_barrier_wait.c = -D_GNU_SOURCE diff --git a/libpthread/nptl/sysdeps/pthread/sigfillset.c b/libpthread/nptl/sysdeps/pthread/sigfillset.c deleted file mode 100644 index d442d65..0000000 --- a/libpthread/nptl/sysdeps/pthread/sigfillset.c +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright (C) 2003, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <pthreadP.h> - -#include <../../../../libc/signal/sigfillset.c> diff --git a/libpthread/nptl/sysdeps/pthread/sigprocmask.c b/libpthread/nptl/sysdeps/pthread/sigprocmask.c deleted file mode 100644 index 246c08d..0000000 --- a/libpthread/nptl/sysdeps/pthread/sigprocmask.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (C) 1997,1998,1999,2000,2001,2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <pthreadP.h> -#undef _LARGEFILE64_SOURCE - -#include <../../../../libc/sysdeps/linux/common/sigprocmask.c> diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in index d43db2b..ac2aa8b 100644 --- a/test/nptl/Makefile.in +++ b/test/nptl/Makefile.in @@ -40,7 +40,7 @@ TESTS := tst-align tst-align2 tst-atfork1 tst-attr1 tst-attr2 tst-attr3 \ tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 tst-cond22 tst-cond23 \ tst-getpid1 tst-getpid2 tst-getpid3 tst-join6 tst-tsd6 \ tst-oddstacklimit tst-oncex3 tst-oncex4 tst-rwlock2a \ - tst-basic7 tst-vfork1x tst-vfork2x tst-sem10 tst-sem11 \ + tst-basic7 tst-signal7 tst-vfork1x tst-vfork2x tst-sem10 tst-sem11 \ tst-sem12 tst-typesizes tst-initializers1-c89 tst-initializers1-c99 \ tst-initializers1-gnu89 tst-initializers1-gnu99 \ tst-atfork2 hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. v1.0.14-11-g63053cb
by wbx＠helium.openadk.org 28 May '16

28 May '16

1 0

[PATCH] ldso: fix dlsym hang when reloading DSOs
by Leonid Lisovskiy 28 May '16

28 May '16

It can happen under certain cases that the DSO had refcount 0, but was already loaded. (NODELETE flag is set, or it is pulled in via both NEEDED dependency and explicit dlopen()). Add extra reference count for NODELETE objects, this will ensure that the reference count never drops below one. It is improved version of http://lists.busybox.net/pipermail/uclibc/2013-June/047826.html Signed-off-by: Leonid Lisovskiy <lly.dev(a)gmail.com> --- ldso/ldso/dl-elf.c | 2 ++ ldso/libdl/libdl.c | 6 ++--- test/dlopen/Makefile.in | 4 +++- test/dlopen/nodelete1.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 test/dlopen/nodelete1.c diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 04e8c60..473ecc0 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -883,6 +883,8 @@ struct elf_resolve *_dl_load_elf_shared_library(unsigned int rflags, #endif (*rpnt)->dyn = tpnt; tpnt->usage_count++; + if (tpnt->rtld_flags & RTLD_NODELETE) + tpnt->usage_count++; #ifdef __LDSO_STANDALONE_SUPPORT__ tpnt->libtype = (epnt->e_type == ET_DYN) ? elf_lib : elf_executable; #else diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index 42a09a8..eda3a33 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -396,7 +396,7 @@ static void *do_dlopen(const char *libname, int flag, ElfW(Addr) from) dyn_chain->next_handle = _dl_handles; _dl_handles = dyn_ptr = dyn_chain; - if (tpnt->usage_count > 1) { + if (tpnt->init_flag & DL_OPENED) { _dl_if_debug_print("Lib: %s already opened\n", libname); /* see if there is a handle from a earlier dlopen */ for (handle = _dl_handles->next_handle; handle; handle = handle->next_handle) { @@ -820,7 +820,7 @@ static int do_dlclose(void *vhandle, int need_fini) _dl_handles = rpnt->next_handle; _dl_if_debug_print("%s: usage count: %d\n", handle->dyn->libname, handle->dyn->usage_count); - if (handle->dyn->usage_count != 1 || (handle->dyn->rtld_flags & RTLD_NODELETE)) { + if (handle->dyn->usage_count != 1) { handle->dyn->usage_count--; free(handle); return 0; @@ -842,7 +842,7 @@ static int do_dlclose(void *vhandle, int need_fini) for (j = 0; j < handle->init_fini.nlist; ++j) { tpnt = handle->init_fini.init_fini[j]; tpnt->usage_count--; - if (tpnt->usage_count == 0 && !(tpnt->rtld_flags & RTLD_NODELETE)) { + if (tpnt->usage_count == 0) { if ((tpnt->dynamic_info[DT_FINI] || tpnt->dynamic_info[DT_FINI_ARRAY]) && need_fini diff --git a/test/dlopen/Makefile.in b/test/dlopen/Makefile.in index 0bed0f7..740453a 100644 --- a/test/dlopen/Makefile.in +++ b/test/dlopen/Makefile.in @@ -5,7 +5,7 @@ export UCLIBC_ONLY := 1 TESTS := dltest dltest2 dlstatic test1 test2 test3 dlundef dlafk dladdr \ - testscope nodelete tst-origin + testscope nodelete nodelete1 tst-origin ifneq ($(HAVE_SHARED),y) TESTS_DISABLED := test3 @@ -80,3 +80,5 @@ LDFLAGS_nodelete := -rdynamic -ldl LDFLAGS_nodelmod1.so := -Wl,-z,nodelete LDFLAGS_nodelmod3.so := ./nodelmod4.so LDFLAGS_nodelmod4.so := -Wl,-z,nodelete +nodelete1: nodelmod1.so nodelmod2.so +LDFLAGS_nodelete1 := -rdynamic -ldl diff --git a/test/dlopen/nodelete1.c b/test/dlopen/nodelete1.c new file mode 100644 index 0000000..720e37f --- /dev/null +++ b/test/dlopen/nodelete1.c @@ -0,0 +1,59 @@ +#include <dlfcn.h> +#include <stdio.h> +#include <stdlib.h> + + +int fini_ran; + +#define LIBNAME1 "nodelmod1.so" + +static int +do_test (void) +{ + /* Verify ability to reload RTLD_NODELETE libraries. + */ + void *p; + + p = dlopen (LIBNAME1, RTLD_NOW); + if (p == NULL) + { + printf ("failed to load "LIBNAME1": %s\n", dlerror ()); + exit (1); + } + + if (dlclose (p) != 0) + { + puts ("failed to close "LIBNAME1""); + exit (1); + } + + p = dlopen (LIBNAME1, RTLD_LAZY); + if (p == NULL) + { + printf ("failed to load "LIBNAME1": %s\n", dlerror ()); + exit (1); + } + + if (dlclose (p) != 0) + { + puts ("failed to close "LIBNAME1""); + exit (1); + } + + p = dlopen ("nodelmod2.so", RTLD_LAZY); + if (p == NULL) + { + printf ("failed to load \"nodelmod2.so\": %s\n", dlerror ()); + exit (1); + } + if (dlclose (p) != 0) + { + puts ("failed to close \"nodelmod2.so\""); + exit (1); + } + + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" -- 1.8.5.6

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel May 2016