From 517846c85dfc48aa231e28e95e8f90a6d8a8efde Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 12 Mar 2025 11:29:10 +0100 Subject: [PATCH] Makefile: Clean up pthread_atfork integration Do not add the pthread_atfork routine again in nptl/Makefile, instead rely on sysdeps/pthread/Makefile for the integration (as this is the directory that contains the source file). In sysdeps/pthread/Makefile, add to static-only-routines. Reviewed-by: Joseph Myers --- nptl/Makefile | 2 -- sysdeps/pthread/Makefile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nptl/Makefile b/nptl/Makefile index eca00936d7..e6481d5694 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -63,7 +63,6 @@ routines = \ old_pthread_cond_signal \ old_pthread_cond_timedwait \ old_pthread_cond_wait \ - pthread_atfork \ pthread_attr_copy \ pthread_attr_destroy \ pthread_attr_extension \ @@ -211,7 +210,6 @@ routines = \ vars \ # routines -static-only-routines = pthread_atfork libpthread-routines = libpthread-compat libpthread-shared-only-routines = libpthread-compat diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 5947db43f3..70e62b2e1b 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -304,7 +304,7 @@ tests-time64 += \ tst-thrd-sleep-time64 \ # tests-time64 -static-only-routines = pthread_atfork +static-only-routines += pthread_atfork # Files which must not be linked with libpthread. tests-nolibpthread += \