From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id D6AE81F463 for ; Sat, 4 Jan 2020 18:37:48 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; q=dns; s=default; b=S2w 3yw0G3kF/O0cyYDc4tyk05W2y1LtTJhjfGz1QBz5WlQtx2L+CQJVODjihubIpLZ1 PdolbCiT6tK0qMbH1WbTWVRzMhUbOOfkf2G2aS57bBf+rKvvejzznecBGvZKFXjF Dt8+7CBRLEw1MNQEZZoioIdJWkfe03JTvsj2coXA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; s=default; bh=32X+q8M+i uiOZSXZQQJEQ2m5U04=; b=BGBw6QVL2z5rrBB4EKci0AG5k5WzQczIXznn2uy7v af4VnsQCLT/YXOl1FammOysDEF/fJZRSkj6JqU8gX+Dv6SZLX7Hq7nT0K5T96aHi sIlbt5n2XTppw+pFz6Y1qH12dp/z+P+gO42K05H5a+6aR1z5xKHzZx/gbQ0XwNZ1 Ds= Received: (qmail 25669 invoked by alias); 4 Jan 2020 18:37:46 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 25661 invoked by uid 89); 4 Jan 2020 18:37:46 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited] htl: Move pthread_atfork to libc_nonshared.a Date: Sat, 4 Jan 2020 19:37:40 +0100 Message-Id: <20200104183740.923936-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This follows bd60ce86520b ('nptl: Move pthread_atfork to libc_nonshared.a') with the same rationale: there is no non-libpthread equivalent to be used for making linking against libpthread optional. libpthread_nonshared.a is unused after this, so remove it from the build. There is no ABI impact because pthread_atfork was implemented using __register_atfork in libc even before this change. pthread_atfork has to be a weak alias because pthread_* names are not reserved in libc. --- htl/Makefile | 34 +++------------------------------- sysdeps/htl/Makeconfig | 3 +-- sysdeps/htl/pt-atfork.c | 3 ++- 3 files changed, 6 insertions(+), 34 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 3b5c10635d..e091077a28 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -120,7 +120,6 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ pt-sigstate-destroy \ pt-sigstate \ \ - pt-atfork \ old_pt-atfork \ pt-kill \ pt-getcpuclockid \ @@ -137,8 +136,6 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ cthreads-compat \ $(SYSDEPS) -libpthread-static-only-routines = pt-atfork - headers := \ pthread.h \ semaphore.h \ @@ -166,8 +163,9 @@ headers := \ distribute := -routines := forward libc_pthread_init alloca_cutoff +routines := forward libc_pthread_init alloca_cutoff pt-atfork shared-only-routines = forward +static-only-routines = pt-atfork extra-libs := libpthread extra-libs-others := $(extra-libs) @@ -204,34 +202,8 @@ extra-B-pthread.so = -B$(common-objpfx)htl/ include ../Rules ifeq (yes,$(build-shared)) -# What we install as libpthread.so for programs to link against is in fact a -# link script. It contains references for the various libraries we need. -# The libpthread.so object is not complete since some functions are only -# defined in libpthread_nonshared.a. -# We need to use absolute paths since otherwise local copies (if they exist) -# of the files are taken by the linker. -install: $(inst_libdir)/libpthread.so - -$(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \ - $(objpfx)libpthread.so$(libpthread.so-version) \ - $(inst_libdir)/$(patsubst %,$(libtype.oS),\ - $(libprefix)pthread) \ - $(+force) - (echo '/* GNU ld script';\ - echo ' Use the shared library, but some functions are only in';\ - echo ' the static library, so try that secondarily. */';\ - cat $<; \ - echo 'GROUP ( $(slibdir)/libpthread.so$(libpthread.so-version)' \ - '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)pthread)'\ - ')' \ - ) > $@.new - mv -f $@.new $@ - $(addprefix $(objpfx), \ $(filter-out $(tests-static) $(xtests-static) $(tests-reverse) \ $(tests-nolibpthread), \ - $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ - $(objpfx)libpthread_nonshared.a + $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so endif - -generated += libpthread_nonshared.a diff --git a/sysdeps/htl/Makeconfig b/sysdeps/htl/Makeconfig index 3af4c1de35..ad56cc6bd1 100644 --- a/sysdeps/htl/Makeconfig +++ b/sysdeps/htl/Makeconfig @@ -3,8 +3,7 @@ have-thread-library = yes -shared-thread-library = $(common-objpfx)htl/libpthread_nonshared.a \ - $(common-objpfx)htl/libpthread.so +shared-thread-library = $(common-objpfx)htl/libpthread.so static-thread-library = $(common-objpfx)htl/libpthread.a bounded-thread-library = $(static-thread-library) diff --git a/sysdeps/htl/pt-atfork.c b/sysdeps/htl/pt-atfork.c index 4512fe72b6..d547dd58e6 100644 --- a/sysdeps/htl/pt-atfork.c +++ b/sysdeps/htl/pt-atfork.c @@ -22,9 +22,10 @@ #include int -pthread_atfork (void (*prepare) (void), +__pthread_atfork (void (*prepare) (void), void (*parent) (void), void (*child) (void)) { return __register_atfork (prepare, parent, child, __dso_handle); } +weak_alias (__pthread_atfork, pthread_atfork) -- 2.24.1