From patchwork Sat Mar 24 23:59:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 26464 Received: (qmail 77470 invoked by alias); 24 Mar 2018 23:59:59 -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 Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 77453 invoked by uid 89); 24 Mar 2018 23:59:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=Hx-languages-length:1799, statically, H*r:sk:static-, Hx-spam-relays-external:sk:static- X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd, commited] hurd: Fix calling __pthread_initialize_minimal in shared case Date: Sun, 25 Mar 2018 00:59:54 +0100 Message-Id: <20180324235954.28110-1-samuel.thibault@ens-lyon.org> * sysdeps/generic/ldsodefs.h [SHARED] (__pthread_initialize_minimal): Declare function. --- ChangeLog | 10 ++++++---- sysdeps/generic/ldsodefs.h | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ccad77e277..6d30a34835 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,11 +8,13 @@ (ARCH_SETUP_TLS): Likewise. * sysdeps/mach/hurd/libc-start.h: New file copied from sysdeps/generic/libc-start.h, but define ARCH_SETUP_TLS to empty. - * csu/libc-start.c [!SHARED] (LIBC_START_MAIN): Call ARCH_SETUP_TLS instead - of __libc_setup_tls. + * csu/libc-start.c [!SHARED] (LIBC_START_MAIN): Call ARCH_SETUP_TLS + instead of __libc_setup_tls. * sysdeps/mach/hurd/i386/init-first.c [!SHARED] (init1): Call - __libc_setup_tls before initializing libpthread and running _hurd_init which - starts the signal thread. + __libc_setup_tls before initializing libpthread and running _hurd_init + which starts the signal thread. + * sysdeps/generic/ldsodefs.h [SHARED] (__pthread_initialize_minimal): + Declare function. 2018-03-24 H.J. Lu diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index d3013f6ec6..e29e9d7ff0 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1067,11 +1067,11 @@ extern struct link_map * _dl_get_dl_main_map (void) # else # define _dl_relocate_static_pie() # endif +#endif /* Initialization of libpthread for statically linked applications. If libpthread is not linked in, this is an empty function. */ void __pthread_initialize_minimal (void) weak_function; -#endif /* Allocate memory for static TLS block (unless MEM is nonzero) and dtv. */ extern void *_dl_allocate_tls (void *mem);