devel

devel@uclibc-ng.org

1160 discussions

uClibc-ng - small C library for embedded systems branch master updated. v1.0.18-19-ge87c79f
by wbx＠helium.openadk.org 23 Oct '16

23 Oct '16

1 0

[PATCH] ARC: update .note.ABI-tag for ABIv4
by Vineet Gupta 22 Oct '16

22 Oct '16

Cc: Anton Kolesov <akolesov(a)synopsys.com> Cc: linux-snps-arc(a)lists.infradead.org Signed-off-by: Vineet Gupta <vgupta(a)synopsys.com> --- libc/sysdeps/linux/arc/crt1.S | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libc/sysdeps/linux/arc/crt1.S b/libc/sysdeps/linux/arc/crt1.S index ae863e7acf5f..70a06e058d3b 100644 --- a/libc/sysdeps/linux/arc/crt1.S +++ b/libc/sysdeps/linux/arc/crt1.S @@ -72,5 +72,9 @@ __start: 0: .asciz "GNU" /* Vendor name */ 1: .align 4 2: .long 0 /* Note data: Linux executable */ - .long 3,9,0 /* Earliest compatible kernel */ +#if (__GNUC__ > 4) + .long 4,8,0 /* Earliest compatible kernel for ABI v4 */ +#else + .long 3,9,0 /* Earliest compatible kernel for ABI v3 */ +#endif 3: .align 4 /* Pad out section */ -- 2.7.4

2 1

Re: [uclibc-ng-devel] PATCH] Fix ntfw when called with FTW_CHDIR and FTW_DEPTH to change directory back to the parent before processing the directory (after the contents have already been processed).
by Waldemar Brodkorb 22 Oct '16

22 Oct '16

Hi, Ata, John (US) wrote, > Hi all, > > > > In using ftw/nftw, I’ve discovered a bug when using FTW_CHDIR and FTW_DEPTH. > After changing the working directory to a subdirectory, nftw would process the > contents fine. However, it would then try and process the directory itself > while still in that directory and then switch back to the parent. This would > result in an error (ENOENT). This patch will change working directories to the > parent before processing the directory itself. Thanks, test case and patch applied, best regards Waldemar

1 0

uClibc-ng - small C library for embedded systems branch master updated. v1.0.18-16-ga6cdfdf
by wbx＠helium.openadk.org 22 Oct '16

22 Oct '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 a6cdfdfff38584cadec40b6d6f2df2651e0b34b8 (commit) via 545beca17885560298580b51619979529a309360 (commit) via 688563159f328726f958163fcdab8088df66e977 (commit) via d87cc4d9a6945daf48848022c93d0d9a0489a87e (commit) from 6630ac965279ed2a76394fbad8fd861f275ed24c (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 a6cdfdfff38584cadec40b6d6f2df2651e0b34b8 Author: John Ata <john.ata(a)baesystems.com> Date: Mon Oct 17 14:47:02 2016 -0400 Fix nftw when called with FTW_CHDIR and FTW_DEPTH Change directory back to the parent before processing the directory (after the contents have already been processed). Signed-off-by: John Ata <john.ata(a)baesystems.com> commit 545beca17885560298580b51619979529a309360 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Thu Oct 20 21:18:05 2016 +0200 test: add nftw test case commit 688563159f328726f958163fcdab8088df66e977 Author: Vineet Gupta <Vineet.Gupta1(a)synopsys.com> Date: Thu Oct 13 10:46:14 2016 -0700 ARC: update .note.ABI-tag for ABIv4 Cc: Anton Kolesov <akolesov(a)synopsys.com> Cc: linux-snps-arc(a)lists.infradead.org Signed-off-by: Vineet Gupta <vgupta(a)synopsys.com> commit d87cc4d9a6945daf48848022c93d0d9a0489a87e Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Wed Oct 19 19:16:37 2016 +0200 create empty static files conditionally ----------------------------------------------------------------------- Summary of changes: Makefile.in | 26 +++++++++++++++++++- libc/Makefile.in | 12 ++++----- libc/misc/ftw/ftw.c | 13 +++++----- libc/sysdeps/linux/arc/crt1.S | 6 ++++- test/misc/tst-nftw.c | 57 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 15 deletions(-) create mode 100644 test/misc/tst-nftw.c diff --git a/Makefile.in b/Makefile.in index c289ed3..877a0b6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -363,7 +363,31 @@ else $(Q)cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -f wchar-stub.h endif -EMPTY_LIB_NAMES = m crypt nsl resolv util dl rt pthread intl +EMPTY_LIB_NAMES = dl +ifeq ($(DO_C99_MATH),y) +EMPTY_LIB_NAMES += m +endif +ifeq ($(UCLIBC_HAS_THREADS),y) +EMPTY_LIB_NAMES += pthread +endif +ifeq ($(UCLIBC_HAS_REALTIME),y) +EMPTY_LIB_NAMES += rt +endif +ifeq ($(UCLIBC_HAS_CRYPT),y) +EMPTY_LIB_NAMES += crypt +endif +ifeq ($(UCLIBC_HAS_LIBUTIL),y) +EMPTY_LIB_NAMES += util +endif +ifeq ($(UCLIBC_HAS_LIBRESOLV_STUB),y) +EMPTY_LIB_NAMES += resolv +endif +ifeq ($(UCLIBC_HAS_LIBNSL_STUB),y) +EMPTY_LIB_NAMES += nsl +endif +ifeq ($(UCLIBC_HAS_GETTEXT_AWARENESS),y) +EMPTY_LIB_NAMES += intl +endif EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a) $(EMPTY_LIBS): diff --git a/libc/Makefile.in b/libc/Makefile.in index 85986a7..714a66e 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -42,9 +42,9 @@ else libc-a-y = $(libc-y) $(libc-static-y) endif -libc-a-y += $(libnsl-a-y) -libc-a-y += $(libresolv-a-y) -libc-a-y += $(libm-a-y) +libc-a-$(DO_C99_MATH) += $(libm-a-y) +libc-a-$(UCLIBC_HAS_LIBNSL_STUB) += $(libnsl-a-y) +libc-a-$(UCLIBC_HAS_LIBRESOLV_STUB) += $(libresolv-a-y) libc-a-$(UCLIBC_HAS_LIBUTIL) += $(libutil-a-y) libc-a-$(UCLIBC_HAS_CRYPT) += $(libcrypt-a-y) libc-a-$(UCLIBC_HAS_ARGP) += $(libuargp-a-y) @@ -55,10 +55,10 @@ libc-a-$(UCLIBC_HAS_BACKTRACE) += $(libubacktrace-a-y) libc-so-y = $(libc-y:.o=.os) $(libc-shared-y) -libc-so-y += $(libnsl-so-y) -libc-so-y += $(libresolv-so-y) libc-so-y += $(libdl-so-y) -libc-so-y += $(libm-so-y) +libc-so-$(DO_C99_MATH) += $(libm-so-y) +libc-so-$(UCLIBC_HAS_LIBNSL_STUB) += $(libnsl-so-y) +libc-so-$(UCLIBC_HAS_LIBRESOLV_STUB) += $(libresolv-so-y) libc-so-$(UCLIBC_HAS_LIBUTIL) += $(libutil-so-y) libc-so-$(UCLIBC_HAS_CRYPT) += $(libcrypt-so-y) libc-so-$(UCLIBC_HAS_ARGP) += $(libuargp-so-y) diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c index 05ea0fa..c6241ed 100644 --- a/libc/misc/ftw/ftw.c +++ b/libc/misc/ftw/ftw.c @@ -558,19 +558,14 @@ fail: --data->ftw.level; data->ftw.base = previous_base; - /* Finally, if we process depth-first report the directory. */ - if (result == 0 && (data->flags & FTW_DEPTH)) - result = (*data->func) (data->dirbuf, st, FTW_DP, &data->ftw); - - if (old_dir - && (data->flags & FTW_CHDIR) + if ((data->flags & FTW_CHDIR) && (result == 0 || ((data->flags & FTW_ACTIONRETVAL) && (result != -1 && result != FTW_STOP)))) { /* Change back to the parent directory. */ int done = 0; - if (old_dir->stream != NULL) + if (old_dir && old_dir->stream != NULL) if (__fchdir (dirfd (old_dir->stream)) == 0) done = 1; @@ -587,6 +582,10 @@ fail: } } + /* Finally, if we process depth-first report the directory. */ + if (result == 0 && (data->flags & FTW_DEPTH)) + result = (*data->func) (data->dirbuf, st, FTW_DP, &data->ftw); + return result; } diff --git a/libc/sysdeps/linux/arc/crt1.S b/libc/sysdeps/linux/arc/crt1.S index ae863e7..70a06e0 100644 --- a/libc/sysdeps/linux/arc/crt1.S +++ b/libc/sysdeps/linux/arc/crt1.S @@ -72,5 +72,9 @@ __start: 0: .asciz "GNU" /* Vendor name */ 1: .align 4 2: .long 0 /* Note data: Linux executable */ - .long 3,9,0 /* Earliest compatible kernel */ +#if (__GNUC__ > 4) + .long 4,8,0 /* Earliest compatible kernel for ABI v4 */ +#else + .long 3,9,0 /* Earliest compatible kernel for ABI v3 */ +#endif 3: .align 4 /* Pad out section */ diff --git a/test/misc/tst-nftw.c b/test/misc/tst-nftw.c new file mode 100644 index 0000000..76d11eb --- /dev/null +++ b/test/misc/tst-nftw.c @@ -0,0 +1,57 @@ +#define _XOPEN_SOURCE 500 +#define _GNU_SOURCE +#include <ftw.h> +#include <stdio.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> + +int result = 0; + +static int process_one_entry(const char *fpath, const struct stat *sb, + int typeflag, struct FTW *ftwbuf) +{ + + struct stat buf; + const char *rel_path = fpath+ftwbuf->base; + + printf("Processing %s in working dir %s\n", + rel_path, get_current_dir_name()); + if (stat(rel_path, &buf) < 0) { + perror("Oops...relative path does not exist in current directory"); + result = 1; + } +} + +static int +do_test(void) +{ + char *path = "/tmp/stest_dir"; + char *subpath = "/tmp/stest_dir/d1"; + char *filepath = "/tmp/stest_dir/f1"; + char *filesubpath = "/tmp/stest_dir/d1/f2"; + + if ((mkdir(path, 0700)) < 0) + perror("Creating path"); + if ((mkdir(subpath, 0700)) < 0) + perror("Creating subpath"); + if ((open(filepath, O_CREAT)) < 0) + perror("Opening filepath"); + if ((open(filesubpath, O_CREAT)) < 0) + perror("Opening filesubpath"); + + if (nftw(path, process_one_entry, 100, (FTW_CHDIR|FTW_DEPTH|FTW_PHYS)) < 0) + perror("ntfw"); + + unlink(filesubpath); + unlink(filepath); + rmdir(subpath); + rmdir(path); + + return result; +} + +#define TIMEOUT 5 +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

[PATCH] ARC: build: don't force usage of llock and swape instructions
by Vineet Gupta 21 Oct '16

21 Oct '16

This is because some old ARC750 cores lack these instructions. We now rely on the default for the toolchain driver: -mcpu=A7 won't enable those, while -mcpu=archs will as these instructions are baseline (and thus is not impacted with this change). If some arc700 based cpu does have them, it can override the driver defaults in it's one level up build system. Signed-off-by: Vineet Gupta <vgupta(a)synopsys.com> --- Rules.mak | 1 - 1 file changed, 1 deletion(-) diff --git a/Rules.mak b/Rules.mak index 8d0e66a49b72..cc1545c81f40 100644 --- a/Rules.mak +++ b/Rules.mak @@ -507,7 +507,6 @@ ifeq ($(TARGET_ARCH),c6x) endif ifeq ($(TARGET_ARCH),arc) - CPU_CFLAGS-y += -mlock -mswape CPU_CFLAGS-$(CONFIG_ARC_CPU_700) += -mA7 CPU_CFLAGS-$(CONFIG_ARC_CPU_HS) += -mcpu=archs CPU_LDFLAGS-y += $(CPU_CFLAGS) -marclinux -- 2.7.4

1 0

18 Oct '16

Hi John, Ata, John (US) wrote, > Hi all, > > > > In using ftw/nftw, I’ve discovered a bug when using FTW_CHDIR and FTW_DEPTH. > After changing the working directory to a subdirectory, nftw would process the > contents fine. However, it would then try and process the directory itself > while still in that directory and then switch back to the parent. This would > result in an error (ENOENT). This patch will change working directories to the > parent before processing the directory itself. Thanks for the report. Are you able to provide a small test-case showing the issue? best regards Waldemar

2 1

PATCH] Fix ntfw when called with FTW_CHDIR and FTW_DEPTH to change directory back to the parent before processing the directory (after the contents have already been processed).
by Ata, John (US) 18 Oct '16

18 Oct '16

Hi all, In using ftw/nftw, I've discovered a bug when using FTW_CHDIR and FTW_DEPTH. After changing the working directory to a subdirectory, nftw would process the contents fine. However, it would then try and process the directory itself while still in that directory and then switch back to the parent. This would result in an error (ENOENT). This patch will change working directories to the parent before processing the directory itself. Take care, ---- John Ata, CISSP Senior Principal Software Engineer Electronics Systems STOP Operating System<http://www.baesystems.com/en-us/our-company/inc-businesses/intelligence-and…> Software Development T 703-563-8115 | F 703-668-4359 | john.ata(a)baesystems.com<mailto:john.ata@baesystems.com> http://www.baesystems.com/csp [cid:image001.png@01D138BC.8E54E330][cid:image003.png@01D138BC.8E54E330]<http://www.twitter.com/baesystemsinc>[cid:image004.png@01D138BC.8E54E330]<http://www.youtube.com/baesystemsinc>[cid:image006.png@01D138BC.8E54E330]<http://www.flickr.com/photos/baesystemsinc/>

1 0

uClibc-ng test suite
by Waldemar Brodkorb 17 Oct '16

17 Oct '16

Hi Hackers, I had a nice talk about uClibc-ng with Alexey on ELCE2016. One of the points where the separation of the test suite included in uClibc-ng source tree. Recently Max and I discovered a problem regarding libgcc/pthread_cancel, because the code was _not_ compiled with the normal full shared gcc toolchain. Every application gets compiled and linked with full toolchain, only the test suite not. I think this is wrong and I would like to remove the test-suite from uClibc-ng source and want to create a separate project out of it. Like musl hackers are doing it with their libc-test. Furthermore I would like to synchronize the tests with GNU libc and take a look that no internal uClibc stuff is used or only when requested by the developer. So test suite could be run on GNU libc, musl and uClibc-ng based system. I would use libc-test, but they depend on GNU make and I want to be able to run the test suite on noMMU targets. @Szabolcs: Or are you interested in some joined efforts? And furthermore I like the small summary to get a fast feedback about any regressions before a release. Recently Ignacy discovered the same issue while trying to rework the internal unwind functions in uClibc-ng. Any opinions? Any suggestions for the name of the test suite? Plan is to do a release in the next days and afterwards separate the test suite code before the next release. Thanks, Waldemar

1 0

uClibc-ng - small C library for embedded systems branch master updated. v1.0.18-12-g6630ac9
by wbx＠helium.openadk.org 16 Oct '16

16 Oct '16

1 0

uClibc-ng - small C library for embedded systems branch master updated. v1.0.18-11-ga3e5bfd
by wbx＠helium.openadk.org 13 Oct '16

13 Oct '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 a3e5bfd20712f71790ea9bae9e9be250f07e8c21 (commit) via 48442540e4c481474c4493192cbd9cb58c5016ad (commit) via d388c3e67f78b414a24550a61b1bab49d7c01883 (commit) from 24ca498fc322936281b0c69c271dd64979c313eb (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 a3e5bfd20712f71790ea9bae9e9be250f07e8c21 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sun Oct 9 10:08:08 2016 +0200 cleanup and fix static linking issues There was a deadlock hanging in a sycall to futex, which should be solved now. Signed-off-by: Waldemar Brodkorb <wbx(a)uclibc-ng.org> commit 48442540e4c481474c4493192cbd9cb58c5016ad Author: Vineet Gupta <Vineet.Gupta1(a)synopsys.com> Date: Fri Oct 7 14:11:17 2016 -0700 ARC: nptl: cancellable wrappers were broken #2 Despite the prev fix, tst-mqueue3 was still segfaulting. The issue was BLINK register not restored properly for return 00002690 <mq_timedsend>: 2690: sub r9,r25,0x448 2698: ld r10,[r9] 269c: cmp r10,0 26a0: beq -36 26a4: st.aw blink,[sp,-4] 26a8: st.aw r0,[sp,-4] 26ac: st.aw r1,[sp,-4] 26b0: st.aw r2,[sp,-4] 26b4: st.aw r3,[sp,-4] 26b8: st.aw r4,[sp,-4] 26bc: bl 1e28 <__librt_enable_asynccancel> 26c0: mov r9,r0 26c4: ld.ab r4,[sp,4] 26c8: ld.ab r3,[sp,4] 26cc: ld.ab r2,[sp,4] 26d0: ld.ab r1,[sp,4] 26d4: ld.ab r0,[sp,4] 26d8: ld.ab blink,[sp, 4] <---- function return BLINK 26dc: mov r8,182 26e0: trap_s 0 26e2: cmp r0,-1024 26e6: st.aw r0,[sp,-4] 26ea: mov r0,r9 26ee: bl 1e90 <__librt_disable_asynccancel> <-- BLINK clobbered to next PC 26f2: ld.ab r0,[sp,4] <----| loops here until sp is out of bound 26fa: cmp r0,-1024 | 26fe: jls [blink] -----| 2702: b 15d8 2706: nop_s So the fix was to retain BLINK on stack before function call, and pop it later - 26d8: ld.ab blink,[sp, 4] + 26d8: ld blink,[sp] <--- restore BLINK, but retain on stack 26dc: mov r8,182 26e0: trap_s 0 26e2: cmp r0,-1024 26e6: st.aw r0,[sp,-4] 26ea: mov r0,r9 26ee: bl 1e90 <__librt_disable_asynccancel> 26f2: ld.ab r0,[sp,4] + 26f6: ld.ab blink,[sp,4] <--- finally pop BLINK 26fa: cmp r0,-1024 26fe: jls [blink] Reported-by: Eugeniy Paltsev <paltsev(a)synopsys.com> Cc: Alexey Brodkin <abrodkin(a)synopsys.com> Signed-off-by: Vineet Gupta <vgupta(a)synopsys.com> commit d388c3e67f78b414a24550a61b1bab49d7c01883 Author: Vineet Gupta <Vineet.Gupta1(a)synopsys.com> Date: Fri Oct 7 14:11:16 2016 -0700 ARC: nptl: cancellable wrappers were broken This was reported as uClibc test suite failures of tst-mqueue3 and tst-mqueue5. The syscall args were getting clobbered, so use scratch regs which are not used for syscall args 00002690 <mq_timedsend>: ; SINGLE_THREAD_P 2690: sub r1,r25,0x448 <--- clobers r1, r2 2698: ld r2,[r1] 269c: cmp r2,0 26a0: bz mq_timedsend_nocancel ; DOCARGS (saves syscall args but r1, r2 clobbered already) 26a4: st.aw blink,[sp,-4] 26a8: st.aw r0,[sp,-4] 26ac: st.aw r1,[sp,-4] 26b0: st.aw r2,[sp,-4] 26b4: st.aw r3,[sp,-4] 26b8: st.aw r4,[sp,-4] 26bc: bl 1e28 <__librt_enable_asynccancel> Reported-by: Eugeniy Paltsev <paltsev(a)synopsys.com> Cc: Alexey Brodkin <abrodkin(a)synopsys.com> Signed-off-by: Vineet Gupta <vgupta(a)synopsys.com> ----------------------------------------------------------------------- Summary of changes: libpthread/nptl/sysdeps/pthread/Makefile.in | 1 - libpthread/nptl/sysdeps/pthread/pt-longjmp.c | 30 ---------------------- .../sysdeps/unix/sysv/linux/Makefile.commonarch | 2 +- .../sysdeps/unix/sysv/linux/arc/sysdep-cancel.h | 11 +++++--- .../nptl/sysdeps/unix/sysv/linux/jmp-unwind.c | 1 + .../sysdeps/unix/sysv/linux/libc-lowlevellock.c | 20 --------------- .../nptl/sysdeps/unix/sysv/linux/lowlevellock.c | 3 --- 7 files changed, 9 insertions(+), 59 deletions(-) delete mode 100644 libpthread/nptl/sysdeps/pthread/pt-longjmp.c delete mode 100644 libpthread/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in index a501b64..6c09e7b 100644 --- a/libpthread/nptl/sysdeps/pthread/Makefile.in +++ b/libpthread/nptl/sysdeps/pthread/Makefile.in @@ -32,7 +32,6 @@ libpthread_pthread_CSRC = \ pthread_spin_destroy.c \ pthread_spin_init.c \ pthread_spin_unlock.c \ - pt-longjmp.c \ pt-sigaction.c \ tpp.c diff --git a/libpthread/nptl/sysdeps/pthread/pt-longjmp.c b/libpthread/nptl/sysdeps/pthread/pt-longjmp.c deleted file mode 100644 index 9fcea04..0000000 --- a/libpthread/nptl/sysdeps/pthread/pt-longjmp.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 2002, 2003 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, see - <http://www.gnu.org/licenses/>. */ - -#include <setjmp.h> -#include <stdlib.h> -#include "pthreadP.h" - -extern __typeof(longjmp) __libc_longjmp attribute_noreturn; - -void -longjmp (jmp_buf env, int val) -{ - __libc_longjmp (env, val); -} -weak_alias (longjmp, siglongjmp) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch index 649d188..a438e97 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch @@ -69,7 +69,7 @@ libpthread_linux_SSRC := #ptw-close.S ptw-open.S ptw-waitid.S ptw-waidpid.S ptw- libc_linux_CSRC += libc_pthread_init.c libc_multiple_threads.c \ register-atfork.c unregister-atfork.c getpid.c \ - raise.c jmp-unwind.c libc-lowlevellock.c + raise.c jmp-unwind.c librt_linux_CSRC += mq_notify.c timer_create.c timer_delete.c \ timer_getoverr.c timer_gettime.c timer_routines.c \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arc/sysdep-cancel.h b/libpthread/nptl/sysdeps/unix/sysv/linux/arc/sysdep-cancel.h index cddd754..01fd844 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arc/sysdep-cancel.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arc/sysdep-cancel.h @@ -38,6 +38,7 @@ mov r0, r9 /* prep mask for disable_asynccancel */ ` \ CDISABLE ` \ pop r0 /* get syscall ret value back */ ` \ + pop blink /* UNDOCARGS above left blink on stack */ ` \ cmp r0, -1024 ` \ jls [blink] ` \ b __syscall_error@plt ` \ @@ -75,7 +76,9 @@ .endm #define DOCARGS_0 push blink -#define UNDOCARGS_0 pop blink + +/* don't pop blink at this point */ +#define UNDOCARGS_0 ld blink, [sp] #define DOCARGS_1 DOCARGS_0` push r0 #define UNDOCARGS_1 pop r0` UNDOCARGS_0 @@ -99,9 +102,9 @@ #define UNDOCARGS_7 pop r6` UNDOCARGS_6 # define SINGLE_THREAD_P \ - THREAD_SELF r1 ` \ - ld r2, [r1, MULTIPLE_THREADS_OFFSET]` \ - cmp r2, 0 + THREAD_SELF r9 ` \ + ld r10, [r9, MULTIPLE_THREADS_OFFSET]` \ + cmp r10, 0 /* ld r2, [r1, -TLS_PRE_TCB_SIZE + MULTIPLE_THREADS_OFFSET] */ #else /* !__ASSEMBLER__ */ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c b/libpthread/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c index 6013ab0..965327c 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c @@ -27,6 +27,7 @@ extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); void _longjmp_unwind (jmp_buf env, int val) { + if (__pthread_cleanup_upto != NULL) __pthread_cleanup_upto (env->__jmpbuf, CURRENT_STACK_FRAME); } libc_hidden_def(_longjmp_unwind) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c b/libpthread/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c deleted file mode 100644 index 28672a6..0000000 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Paul Mackerras <paulus(a)au.ibm.com>, 2003. - - 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/>. */ - -/* No difference to lowlevellock.c, except we lose a couple of functions. */ -#include "lowlevellock.c" diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c b/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c index 75369bd..4294a20 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c @@ -24,9 +24,6 @@ #include <tls.h> void -#ifndef IS_IN_libpthread -weak_function -#endif __lll_lock_wait_private (int *futex) { if (*futex == 2) hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel