From patchwork Fri Nov 18 17:31:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wbx X-Patchwork-Id: 696700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from helium.openadk.org (helium.openadk.org [IPv6:2a00:1828:2000:679::23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tL4nn1hF0z9syB for ; Sat, 19 Nov 2016 04:32:42 +1100 (AEDT) Received: from helium.openadk.org (localhost [IPv6:::1]) by helium.openadk.org (Postfix) with ESMTP id 327E410061; Fri, 18 Nov 2016 18:32:25 +0100 (CET) X-Original-To: devel@uclibc-ng.org Delivered-To: devel@helium.openadk.org Received: by helium.openadk.org (Postfix, from userid 1000) id E4E5110061; Fri, 18 Nov 2016 18:31:29 +0100 (CET) MIME-Version: 1.0 To: devel@uclibc-ng.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: b985fa069187e4c5a7ee84213d9fbead2f219ce5 X-Git-Newrev: 79c4017f3518cd30afb59a170717c1e754eedadf Auto-Submitted: auto-generated Message-Id: <20161118173130.E4E5110061@helium.openadk.org> Date: Fri, 18 Nov 2016 18:31:29 +0100 (CET) From: wbx@helium.openadk.org (wbx) Subject: [uclibc-ng-devel] uClibc-ng - small C library for embedded systems branch master updated. v1.0.19-14-g79c4017 X-BeenThere: devel@uclibc-ng.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: uClibc-ng Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devel-bounces@uclibc-ng.org Sender: "devel" 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 79c4017f3518cd30afb59a170717c1e754eedadf (commit) via 2d2aa1bd7074222d9d54232b2d96eae1d2aab7ae (commit) via 9a9c16557a153cde7a0a98a271d9407cae685943 (commit) from b985fa069187e4c5a7ee84213d9fbead2f219ce5 (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 79c4017f3518cd30afb59a170717c1e754eedadf Author: Romain Naour Date: Sat Nov 5 19:55:43 2016 +0100 libpthread: remove pthread_atfork for noMMU target There is not possible to use use fork() on noMMU target, so exporting pthread_atfork() for such target is useless. A program using pthread_atfork() will likely fail at runtime due to the error code returned by this function. Signed-off-by: Romain Naour commit 2d2aa1bd7074222d9d54232b2d96eae1d2aab7ae Author: Anton Kolesov Date: Wed Nov 16 19:33:24 2016 +0300 Fix extra/locale/gen_wc_8bit error with out-of-tree builds If uClibc is built outside of the source tree, then there is an error: make[1]: *** No rule to make target `/home/akolesov/build-uclibc/extra/locale', needed by `/home/akolesov/build-uclibc/extra/locale/gen_wc8bit'. Stop. The rule to create $(top_builddir)/extra/locale is defined in top-level Makefile.in. Same Makefile.in also invokes extra/locale/Makefile.in to build various tools. Those tools have $(top_builddir)/extra/locale as a dependency, but this makefile doesn't include top-level Makefile.in, therefore rule to create dependant directory is absent in this submake invocation. To avoid this problem this patch defines $(top_builddir)/extra/locale as a dependency for "headers" target, which invokes extra/locale/Makefile.in, thus making sure that prerequisite directory is created in advance. This problem doesn't occur when building in the source tree, since $(top_builddir) == $(top_srcdir), so this directory already exists. Signed-off-by: Anton Kolesov commit 9a9c16557a153cde7a0a98a271d9407cae685943 Author: Waldemar Brodkorb Date: Sun Nov 13 13:47:13 2016 +0100 revert 9b1077dc70e52ee85a718bce3fcfec7ae9af2967 partially ----------------------------------------------------------------------- Summary of changes: Makefile.in | 2 +- libc/Makefile.in | 1 + libpthread/linuxthreads/ptfork.c | 14 -------------- libpthread/linuxthreads/sysdeps/pthread/pthread.h | 2 ++ 4 files changed, 4 insertions(+), 15 deletions(-) hooks/post-receive diff --git a/Makefile.in b/Makefile.in index 76008a2..98c6d6d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -183,7 +183,7 @@ menuconfig-clean-y: HEADERCLEAN_config # libc/sysdeps/linux/Makefile.commonarch to headers-y headers-y += $(target-headers-sysdep) -headers: $(top_builddir)include/bits/uClibc_config.h | subdirs +headers: $(top_builddir)include/bits/uClibc_config.h | subdirs $(top_builddir)extra/locale $(Q)$(if $(UCLIBC_HAS_LOCALE),$(MAKE) -C extra/locale locale_headers) subdirs: $(addprefix $(top_builddir),$(subdirs)) diff --git a/libc/Makefile.in b/libc/Makefile.in index 714a66e..3d6ef13 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -42,6 +42,7 @@ else libc-a-y = $(libc-y) $(libc-static-y) endif +libc-a-$(HAVE_SHARED) += $(libdl-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) diff --git a/libpthread/linuxthreads/ptfork.c b/libpthread/linuxthreads/ptfork.c index 6f1e2d3..74d6308 100644 --- a/libpthread/linuxthreads/ptfork.c +++ b/libpthread/linuxthreads/ptfork.c @@ -150,18 +150,4 @@ static pid_t __fork(void) strong_alias(__fork,fork) strong_alias(__fork,vfork) -#else - -/* We can't support pthread_atfork without MMU, since we don't have - fork(), and we can't offer the correct semantics for vfork(). */ -int pthread_atfork(void (*prepare)(void), - void (*parent)(void), - void (*child)(void)) -{ - /* ENOMEM is probably pushing it a little bit. - Take it as `no *virtual* memory' :-) */ - errno = ENOMEM; - return -1; -} - #endif diff --git a/libpthread/linuxthreads/sysdeps/pthread/pthread.h b/libpthread/linuxthreads/sysdeps/pthread/pthread.h index cc13a52..0d17502 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/pthread.h +++ b/libpthread/linuxthreads/sysdeps/pthread/pthread.h @@ -697,6 +697,7 @@ extern int pthread_getcpuclockid (pthread_t __thread_id, /* Functions for handling process creation and process execution. */ +#ifdef __ARCH_USE_MMU__ /* Install handlers to be called when a new process is created with FORK. The PREPARE handler is called in the parent process just before performing FORK. The PARENT handler is called in the parent process just after FORK. @@ -711,6 +712,7 @@ extern int pthread_getcpuclockid (pthread_t __thread_id, extern int pthread_atfork (void (*__prepare) (void), void (*__parent) (void), void (*__child) (void)) __THROW; +#endif /* Terminate all threads in the program except the calling process. Should be called just before invoking one of the exec*() functions. */