This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[hurd,commited] hurd: Fix calling __pthread_initialize_minimal in shared case
- From: Samuel Thibault <samuel dot thibault at ens-lyon dot org>
- To: libc-alpha at sourceware dot org
- Cc: Samuel Thibault <samuel dot thibault at ens-lyon dot org>
- Date: Sun, 25 Mar 2018 00:59:54 +0100
- Subject: [hurd,commited] hurd: Fix calling __pthread_initialize_minimal in shared case
* 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 <hongjiu.lu@intel.com>
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);
--
2.16.2