aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-03-25 00:59:18 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-03-25 00:59:18 +0100
commit978a6803e25f49460a9519558dbc426c97db6d64 (patch)
treef96ea4d5f5377c7a4eb58c223391187045e4bb32
parent37be82a03f314f6f277a74b949210f8ab07dc88f (diff)
downloadtermbaud-978a6803e25f49460a9519558dbc426c97db6d64.tar.gz
termbaud-978a6803e25f49460a9519558dbc426c97db6d64.tar.xz
termbaud-978a6803e25f49460a9519558dbc426c97db6d64.zip
hurd: Fix calling __pthread_initialize_minimal in shared case
* sysdeps/generic/ldsodefs.h [SHARED] (__pthread_initialize_minimal): Declare function.
-rw-r--r--ChangeLog10
-rw-r--r--sysdeps/generic/ldsodefs.h2
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ccad77e277f..6d30a34835a 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 d3013f6ec69..e29e9d7ff0e 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);