- devel - example.com

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

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 95174cb69c523a1544e5f6f20e47f7d60007e569 (commit) from 557f663a8cb7de8cbbfa9ce63b2c956bcaad194c (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 95174cb69c523a1544e5f6f20e47f7d60007e569 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sun May 29 09:16:49 2016 +0200 bump for release ----------------------------------------------------------------------- Summary of changes: Rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rules.mak b/Rules.mak index 4f82935..207c4ec 100644 --- a/Rules.mak +++ b/Rules.mak @@ -126,7 +126,7 @@ export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS MULTILIB_DIR # Now config hard core MAJOR_VERSION := 1 MINOR_VERSION := 0 -SUBLEVEL := 14 +SUBLEVEL := 15 EXTRAVERSION := VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL) ABI_VERSION := $(MAJOR_VERSION) 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-18-g557f663
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 branch, master has been updated via 557f663a8cb7de8cbbfa9ce63b2c956bcaad194c (commit) from e517397535b0777568fd9c13c4214b63c52d0798 (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 557f663a8cb7de8cbbfa9ce63b2c956bcaad194c Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sun May 29 08:53:18 2016 +0200 mips: allow to disable prefetch support in memcpy/memset There exist some problem with the new memcpy/memset functions imported from GNU libc/newlib. If you have any problem with the new MIPS optimized assembly try to disable prefetching support. Thanks to Rene Nielsen and Matthew Fortune analyzing the problem so far. ----------------------------------------------------------------------- Summary of changes: extra/Configs/Config.mips | 7 +++++++ libc/string/mips/memcpy.S | 2 +- libc/string/mips/memset.S | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips index e0b62dd..919e80c 100644 --- a/extra/Configs/Config.mips +++ b/extra/Configs/Config.mips @@ -31,3 +31,10 @@ config CONFIG_MIPS_N64_ABI bool "N64 ABI" endchoice + +config UCLIBC_USE_MIPS_PREFETCH + bool "Use MIPS prefetch optimization for memcpy/memset" + default y + help + You get better performance when you use Prefetch. + https://gcc.gnu.org/projects/prefetch.html#mips diff --git a/libc/string/mips/memcpy.S b/libc/string/mips/memcpy.S index 59f9f0a..3825875 100644 --- a/libc/string/mips/memcpy.S +++ b/libc/string/mips/memcpy.S @@ -39,7 +39,7 @@ #if (_MIPS_ISA == _MIPS_ISA_MIPS4) || (_MIPS_ISA == _MIPS_ISA_MIPS5) || \ (_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64) -# ifndef DISABLE_PREFETCH +# ifdef __UCLIBC_USE_MIPS_PREFETCH__ # define USE_PREFETCH # endif #endif diff --git a/libc/string/mips/memset.S b/libc/string/mips/memset.S index 43034ce..1c9f14c 100644 --- a/libc/string/mips/memset.S +++ b/libc/string/mips/memset.S @@ -37,7 +37,7 @@ prefetching. */ #if (__mips == 4) || (__mips == 5) || (__mips == 32) || (__mips == 64) -# ifndef DISABLE_PREFETCH +# ifdef __UCLIBC_USE_MIPS_PREFETCH__ # define USE_PREFETCH # endif #endif hooks/post-receive -- uClibc-ng - small C library for embedded systems

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

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 63053cbd285f46fbbe1c6660ff0423210c73468c (commit) from 0ff3c7882867f1270e072a6d93dd085bf9728be1 (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 63053cbd285f46fbbe1c6660ff0423210c73468c Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Sat May 28 20:29:30 2016 +0200 sparc: remove unused 64 bit support code ----------------------------------------------------------------------- Summary of changes: libc/sysdeps/linux/sparc/sys/ucontext.h | 99 --------------------------------- 1 file changed, 99 deletions(-) diff --git a/libc/sysdeps/linux/sparc/sys/ucontext.h b/libc/sysdeps/linux/sparc/sys/ucontext.h index f06f25d..9389bb7 100644 --- a/libc/sysdeps/linux/sparc/sys/ucontext.h +++ b/libc/sysdeps/linux/sparc/sys/ucontext.h @@ -20,73 +20,6 @@ #include <features.h> #include <signal.h> -#include <bits/wordsize.h> - -#if __WORDSIZE == 64 - -#define MC_TSTATE 0 -#define MC_PC 1 -#define MC_NPC 2 -#define MC_Y 3 -#define MC_G1 4 -#define MC_G2 5 -#define MC_G3 6 -#define MC_G4 7 -#define MC_G5 8 -#define MC_G6 9 -#define MC_G7 10 -#define MC_O0 11 -#define MC_O1 12 -#define MC_O2 13 -#define MC_O3 14 -#define MC_O4 15 -#define MC_O5 16 -#define MC_O6 17 -#define MC_O7 18 -#define MC_NGREG 19 - -typedef unsigned long mc_greg_t; -typedef mc_greg_t mc_gregset_t[MC_NGREG]; - -#define MC_MAXFPQ 16 -struct mc_fq { - unsigned long *mcfq_addr; - unsigned int mcfq_insn; -}; - -struct mc_fpu { - union { - unsigned int sregs[32]; - unsigned long dregs[32]; - long double qregs[16]; - } mcfpu_fregs; - unsigned long mcfpu_fsr; - unsigned long mcfpu_fprs; - unsigned long mcfpu_gsr; - struct mc_fq *mcfpu_fq; - unsigned char mcfpu_qcnt; - unsigned char mcfpu_qentsz; - unsigned char mcfpu_enab; -}; -typedef struct mc_fpu mc_fpu_t; - -typedef struct { - mc_gregset_t mc_gregs; - mc_greg_t mc_fp; - mc_greg_t mc_i7; - mc_fpu_t mc_fpregs; -} mcontext_t; - -typedef struct ucontext { - struct ucontext *uc_link; - unsigned long uc_flags; - unsigned long __uc_sigmask; - mcontext_t uc_mcontext; - stack_t uc_stack; - __sigset_t uc_sigmask; -} ucontext_t; - -#endif /* __WORDISIZE == 64 */ /* * Location of the users' stored registers relative to R0. @@ -121,21 +54,8 @@ typedef struct ucontext { * but that the ABI defines it absolutely to be 21 (resp. 19). */ -#if __WORDSIZE == 64 - -#define REG_ASI (19) -#define REG_FPRS (20) - -#define NGREG 21 -typedef long greg_t; - -#else /* __WORDSIZE == 32 */ - #define NGREG 19 typedef int greg_t; - -#endif /* __WORDSIZE == 32 */ - typedef greg_t gregset_t[NGREG]; /* @@ -196,24 +116,6 @@ struct fq #define V9_FPU_FSR_TYPE unsigned long long #define V9_FPU_FPRS_TYPE unsigned -#if __WORDSIZE == 64 - -typedef struct fpu - { - union { /* FPU floating point regs */ - unsigned fpu_regs[32]; /* 32 singles */ - double fpu_dregs[16]; /* 32 doubles */ - long double fpu_qregs[16]; /* 16 quads */ - } fpu_fr; - struct fq *fpu_q; /* ptr to array of FQ entries */ - unsigned long fpu_fsr; /* FPU status register */ - unsigned char fpu_qcnt; /* # of entries in saved FQ */ - unsigned char fpu_q_entrysize; /* # of bytes per FQ entry */ - unsigned char fpu_en; /* flag signifying fpu in use */ - } fpregset_t; - -#else /* __WORDSIZE == 32 */ - typedef struct fpu { union { /* FPU floating point regs */ @@ -265,5 +167,4 @@ typedef struct ucontext mcontext_t uc_mcontext; } ucontext_t; -#endif /* __WORDSIZE == 32 */ #endif /* sys/ucontext.h */ hooks/post-receive -- uClibc-ng - small C library for embedded systems

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

[PATCH] linuxthreads.old: Fix segfault when pthread_mutex_unlock() called against unlocked NORMAL mutex.
by Leonid Lisovskiy 27 May '16

27 May '16

Althought, it is undefined behavior, there is no reason for segfault. Signed-off-by: Leonid Lisovskiy <lly.dev(a)gmail.com> --- libpthread/linuxthreads/mutex.c | 3 ++- test/pthread/ex8-mtx-odd.c | 56 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 test/pthread/ex8-mtx-odd.c diff --git a/libpthread/linuxthreads/mutex.c b/libpthread/linuxthreads/mutex.c index 8908414..8cb779b 100644 --- a/libpthread/linuxthreads/mutex.c +++ b/libpthread/linuxthreads/mutex.c @@ -171,7 +171,8 @@ int attribute_hidden __pthread_mutex_unlock(pthread_mutex_t * mutex) { switch (mutex->__m_kind) { case PTHREAD_MUTEX_ADAPTIVE_NP: - __pthread_unlock(&mutex->__m_lock); + if (mutex->__m_lock.__status != 0) + __pthread_unlock(&mutex->__m_lock); return 0; case PTHREAD_MUTEX_RECURSIVE_NP: if (mutex->__m_owner != thread_self()) diff --git a/test/pthread/ex8-mtx-odd.c b/test/pthread/ex8-mtx-odd.c new file mode 100644 index 0000000..791b2c2 --- /dev/null +++ b/test/pthread/ex8-mtx-odd.c @@ -0,0 +1,56 @@ +/* Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper(a)redhat.com>, 2002. + + 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <errno.h> +#include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> + + +static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; + +static int +do_test (void) +{ + + if (pthread_mutex_lock (&lock) != 0) + { + puts ("mutex_lock failed"); + exit (1); + } + + if (pthread_mutex_unlock (&lock) != 0) + { + puts ("1st mutex_unlock failed"); + exit (1); + } + + if (pthread_mutex_unlock (&lock) != 0) + { + puts ("2nd mutex_unlock failed"); + exit (1); + } + + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" -- 1.8.5.6

2 5

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

24 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 0ff3c7882867f1270e072a6d93dd085bf9728be1 (commit) via 2559592659fe8225fc7d67fa5bc83a1589819054 (commit) via b1fb0d0bf5d09bf9dbdbc320814bd087d4d26460 (commit) from 6a8ccc95528f5e86a8770ed15ce89609b5b3dee9 (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 0ff3c7882867f1270e072a6d93dd085bf9728be1 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Tue May 24 20:37:14 2016 +0200 microblaze: fix linuxthreads support Got the working code from https://github.com/jdkoftinoff/mb-linux-msli/, otherwise SIGILL while using linuxthreads. commit 2559592659fe8225fc7d67fa5bc83a1589819054 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Mon May 23 03:38:00 2016 +0200 microblaze: fix setjmp/longjmp Sync mostly with GNU libc implementation of setjmp/longjmp. Just generate PIC compatible code, so no difference for static builds are made. Add sysdep.h with some handy assembly macros used inside setjmp.S/__longjmp.S. This unbreaks dynamic linker support, first test suite run only shows 10 errors, which doesn't look so bad. commit b1fb0d0bf5d09bf9dbdbc320814bd087d4d26460 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Sun May 22 10:26:26 2016 +0200 microblaze: fix ELF detection in ld.so ----------------------------------------------------------------------- Summary of changes: include/elf.h | 5 -- ldso/ldso/microblaze/dl-sysdep.h | 5 +- libc/sysdeps/linux/microblaze/__longjmp.S | 92 ++++++++++++---------- libc/sysdeps/linux/microblaze/setjmp.S | 43 ++++------ libc/sysdeps/linux/microblaze/sysdep.h | 25 ++++++ .../linuxthreads/sysdeps/microblaze/pt-machine.h | 86 +++++++------------- utils/ldd.c | 2 +- 7 files changed, 124 insertions(+), 134 deletions(-) create mode 100644 libc/sysdeps/linux/microblaze/sysdep.h diff --git a/include/elf.h b/include/elf.h index 5f47905..4a0280b 100644 --- a/include/elf.h +++ b/include/elf.h @@ -362,11 +362,6 @@ typedef struct /* V850 backend magic number. Written in the absense of an ABI. */ #define EM_CYGNUS_V850 0x9080 -/* Xilinx Microblaze (unofficial). Note that there is now an official microblaze - * magic number, but all the toolchains currently in existence use the old number - */ -#define EM_MICROBLAZE_OLD 0xbaab - /* Legal values for e_version (version). */ #define EV_NONE 0 /* Invalid ELF version */ diff --git a/ldso/ldso/microblaze/dl-sysdep.h b/ldso/ldso/microblaze/dl-sysdep.h index 2b55218..b293d27 100644 --- a/ldso/ldso/microblaze/dl-sysdep.h +++ b/ldso/ldso/microblaze/dl-sysdep.h @@ -30,11 +30,14 @@ do { \ /* Here we define the magic numbers that this dynamic loader should accept */ -#define MAGIC1 EM_MICROBLAZE_OLD +#define MAGIC1 EM_MICROBLAZE #undef MAGIC2 /* Used for error messages */ #define ELF_TARGET "microblaze" +struct elf_resolve; +unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry); + #define elf_machine_type_class(type) \ (((type) == R_MICROBLAZE_JUMP_SLOT) * ELF_RTYPE_CLASS_PLT \ | ((type) == R_MICROBLAZE_COPY) * ELF_RTYPE_CLASS_COPY) diff --git a/libc/sysdeps/linux/microblaze/__longjmp.S b/libc/sysdeps/linux/microblaze/__longjmp.S index c7fce34..0e0e2f4 100644 --- a/libc/sysdeps/linux/microblaze/__longjmp.S +++ b/libc/sysdeps/linux/microblaze/__longjmp.S @@ -1,45 +1,51 @@ -/* - * libc/sysdeps/linux/microblaze/longjmp.S -- `longjmp' for microblaze - * - * Copyright (C) 2003 John Williams <jwilliams(a)itee.uq.edu.au> - * Copyright (C) 2001 NEC Corporation - * Copyright (C) 2001 Miles Bader <miles(a)gnu.org> - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License. See the file COPYING.LIB in the main - * directory of this archive for more details. - * - * Written by Miles Bader <miles(a)gnu.org> - */ - -#include <libc-symbols.h> - - .text - .globl C_SYMBOL_NAME(__longjmp) - .align 4 -C_SYMBOL_NAME(__longjmp): - /* load registers from memory to r5 (arg0) */ - lwi r1, r5, 0 - lwi r15, r5, 4 - lwi r2, r5, 8 - lwi r13, r5, 12 - lwi r18, r5, 16 - lwi r19, r5, 20 - lwi r20, r5, 24 - lwi r21, r5, 28 - lwi r22, r5, 32 - lwi r23, r5, 36 - lwi r24, r5, 40 - lwi r25, r5, 44 - lwi r26, r5, 48 - lwi r27, r5, 52 - lwi r28, r5, 56 - lwi r29, r5, 60 - lwi r30, r5, 64 - lwi r31, r5, 68 - - addi r3, r0, 1 /* return val */ - rtsd r15, 8 /* normal return */ - nop +/* Copyright (C) 1997-2016 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 <sysdep.h> + +ENTRY(__longjmp) + + lwi r1, r5, 0 + lwi r15, r5, 4 + lwi r2, r5, 8 + lwi r13, r5, 12 + lwi r18, r5, 16 + lwi r19, r5, 20 + lwi r20, r5, 24 + lwi r21, r5, 28 + lwi r22, r5, 32 + lwi r23, r5, 36 + lwi r24, r5, 40 + lwi r25, r5, 44 + lwi r26, r5, 48 + lwi r27, r5, 52 + lwi r28, r5, 56 + lwi r29, r5, 60 + lwi r30, r5, 64 + lwi r31, r5, 68 + + addk r3,r6,r0 + beqi r3,L(return_1) + rtsd r15,8 + nop +L(return_1): + rtsd r15,8 + addik r3,r0,1 /* delay slot. */ + +END(__longjmp) libc_hidden_def(__longjmp) diff --git a/libc/sysdeps/linux/microblaze/setjmp.S b/libc/sysdeps/linux/microblaze/setjmp.S index 3c1d8a1..b40850c 100644 --- a/libc/sysdeps/linux/microblaze/setjmp.S +++ b/libc/sysdeps/linux/microblaze/setjmp.S @@ -28,27 +28,21 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <libc-symbols.h> +#include <sysdep.h> - .text - .globl C_SYMBOL_NAME(setjmp) - .align 4 -C_SYMBOL_NAME(setjmp): -#ifdef __PIC__ - brid 1f -#else - braid C_SYMBOL_NAME(__sigsetjmp) -#endif - addi r6, r0, 1 /* Save the signal mask. */ +ENTRY(_setjmp) + addik r6, r0, 0 +END(_setjmp) +libc_hidden_def(_setjmp) - .globl C_SYMBOL_NAME(_setjmp) -C_SYMBOL_NAME(_setjmp): - and r6, r0, r0 /* Don't save the signal mask. */ +ENTRY(setjmp) + brid 1f + addik r6, r0, 1 +END(setjmp) +libc_hidden_def(setjmp) - .globl C_SYMBOL_NAME(__sigsetjmp) -C_SYMBOL_NAME(__sigsetjmp): +ENTRY(__sigsetjmp) 1: - /* Save registers relative to r5 (arg0)*/ swi r1, r5, 0 /* stack pointer */ swi r15, r5, 4 /* link register */ swi r2, r5, 8 /* SDA and SDA2 ptrs */ @@ -68,14 +62,7 @@ C_SYMBOL_NAME(__sigsetjmp): swi r30, r5, 64 swi r31, r5, 68 - /* Make a tail call to __sigjmp_save; it takes the same args. */ -#ifdef __PIC__ - mfs r12,rpc - addik r12,r12,_GLOBAL_OFFSET_TABLE_+8 - lwi r12,r12,__sigjmp_save@GOT - brad r12 - nop -#else - braid C_SYMBOL_NAME(__sigjmp_save) - nop -#endif + bri __sigjmp_save + +END(__sigsetjmp) +libc_hidden_def(__sigsetjmp) diff --git a/libc/sysdeps/linux/microblaze/sysdep.h b/libc/sysdeps/linux/microblaze/sysdep.h new file mode 100644 index 0000000..1f01a2a --- /dev/null +++ b/libc/sysdeps/linux/microblaze/sysdep.h @@ -0,0 +1,25 @@ +#include <common/sysdep.h> + +#ifdef __ASSEMBLER__ + +/* Syntactic details of assembler. */ + +# define ALIGNARG(log2) log2 +# define ASM_SIZE_DIRECTIVE(name) .size name,.-name + +/* Define an entry point visible from C. */ +# define ENTRY(name) \ + .globl C_SYMBOL_NAME(name); \ + .type C_SYMBOL_NAME(name),@function; \ + .align ALIGNARG(2); \ + C_LABEL(name) + +# undef END +# define END(name) ASM_SIZE_DIRECTIVE(name) + +/* Local label name for asm code. */ +# ifndef L +# define L(name) $L##name +# endif + +#endif diff --git a/libpthread/linuxthreads/sysdeps/microblaze/pt-machine.h b/libpthread/linuxthreads/sysdeps/microblaze/pt-machine.h index e8c03f9..2184c92 100644 --- a/libpthread/linuxthreads/sysdeps/microblaze/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/microblaze/pt-machine.h @@ -9,7 +9,6 @@ * General Public License. See the file COPYING.LIB in the main * directory of this archive for more details. * - * Written by Miles Bader <miles(a)gnu.org> */ #ifndef _PT_MACHINE_H @@ -18,12 +17,9 @@ #include <features.h> #ifndef PT_EI -# define PT_EI extern inline +# define PT_EI __extern_always_inline #endif -extern long int testandset (int *spinlock); -extern int __compare_and_swap (long *ptr, long old, long new); - /* Get some notion of the current stack. Need not be exactly the top of the stack, just something somewhere in the current frame. */ #define CURRENT_STACK_FRAME __stack_pointer @@ -31,76 +27,54 @@ register char *__stack_pointer __asm__ ("r1"); #define HAS_COMPARE_AND_SWAP #define HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS -#define IMPLEMENT_TAS_WITH_CAS +#define MEMORY_BARRIER() __asm__ __volatile__("": : :"memory") /* Atomically: If *PTR == OLD, set *PTR to NEW and return true, otherwise do nothing and return false. */ PT_EI int __compare_and_swap (long *ptr, long old, long new) { - unsigned long psw; - - /* disable interrupts */ - /* This is ugly ugly ugly! */ - __asm__ __volatile__ ("mfs %0, rmsr;" - "andi r3, %0, ~2;" - "mts rmsr, r3;" - : "=&r" (psw) - : - : "r3"); + long prev, cmp, retval; + __asm__ __volatile__ (" addi %2, r0, 0;" + "1: lwx %0, %3, r0;" + " cmp %1, %0, %4;" + " bnei %1, 2f;" + " swx %5, %3, r0;" + " addic %1, r0, 0;" + " bnei %1, 1b;" + " addi %2, r0, 1;" + "2:" + : "=&r" (prev), "=&r" (cmp), "=&r" (retval) + : "r" (ptr), "r" (old), "r" (new) + : "cc", "memory"); - if (likely (*ptr == old)) - { - *ptr = new; - __asm__ __volatile__ ("mts rmsr, %0;" :: "r" (psw)); /* re-enable */ - return 1; - } - else - { - __asm__ __volatile__ ("mts rmsr, %0;" :: "r" (psw)); /* re-enable */ - return 0; - } + return retval; } -/* like above's __compare_and_swap() but it first syncs the memory - (This is also the difference between both functions in e.g. - ../powerpc/pt-machine.h) - Doing this additional sync fixes a hang of __pthread_alt_unlock() - (Falk Brettschneider <fbrettschneider(a)baumeroptronic.de>) */ PT_EI int __compare_and_swap_with_release_semantics (long *p, long oldval, long newval) { - __asm__ __volatile__ ("" : : : "memory"); /*MEMORY_BARRIER ();*/ + MEMORY_BARRIER(); return __compare_and_swap (p, oldval, newval); } - -#ifndef IMPLEMENT_TAS_WITH_CAS -/* Spinlock implementation; required. */ +/* Spinlock implementation; required. */ PT_EI long int testandset (int *spinlock) { - unsigned psw; + long int retval; - /* disable interrupts */ - __asm__ __volatile__ ("mfs %0, rmsr;" - "andi r3, %0, ~2;" - "mts rmsr, r3;" - : "=&r" (psw) - : - : "r3"); + __asm__ __volatile__ ("1: lwx %0, %1, r0;" + " bnei %0, 2f;" + " addik %0, r0, 1;" + " swx %0, %1, r0;" + " addic %0, r0, 0;" + " bnei %0, 1b;" + "2:" + : "=&r" (retval) + : "r" (spinlock) + : "cc", "memory"); - if (*spinlock) - { - /* Enable ints */ - __asm__ __volatile__ ("mts rmsr, %0;" :: "r" (psw)); - return 1; - } else { - *spinlock=1; - /* Enable ints */ - __asm__ __volatile__ ("mts rmsr, %0;" :: "r" (psw)); - return 0; - } + return retval; } -#endif #endif /* pt-machine.h */ diff --git a/utils/ldd.c b/utils/ldd.c index 7fd4f7b..f6413c6 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -107,7 +107,7 @@ #endif #if defined(__microblaze__) -#define MATCH_MACHINE(x) (x == EM_MICROBLAZE_OLD) +#define MATCH_MACHINE(x) (x == EM_MICROBLAZE) #define ELFCLASSM ELFCLASS32 #endif hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0