]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
hurd: Fix calling __pthread_initialize_minimal in shared case
authorSamuel Thibault <samuel.thibault@ens-lyon.org>
Sat, 24 Mar 2018 23:59:18 +0000 (00:59 +0100)
committerSamuel Thibault <samuel.thibault@ens-lyon.org>
Sat, 24 Mar 2018 23:59:18 +0000 (00:59 +0100)
* sysdeps/generic/ldsodefs.h [SHARED] (__pthread_initialize_minimal):
Declare function.

ChangeLog
sysdeps/generic/ldsodefs.h

index ccad77e277ffbca24437026385c68cd554068bea..6d30a34835a80422b9b46479b3ec558233dcbab8 100644 (file)
--- 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  <hongjiu.lu@intel.com>
 
index d3013f6ec69df5fe1fdf1dea50a066e68c6020df..e29e9d7ff0e5b7b20f722069c0c079fe10a34048 100644 (file)
@@ -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);