aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--elf/Versions2
-rw-r--r--sysdeps/generic/dl-tls.c1
-rw-r--r--sysdeps/generic/ldsodefs.h4
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index adc4d70f5a..1d84ec2b98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2002-10-09 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/generic/ldsodefs.h: Remove attribute_hidden from
+ _dl_allocate_tls_init. Add rtld_hidden_proto.
+ * sysdeps/generic/dl-tls.c (_dl_allocate_tls_init): Add
+ rtld_hidden_def.
+ * elf/Versions (ld) [GLIBC_PRIVATE]: Add _dl_allocate_tls_init.
+
* version.h (VERSION): Bump to 2.3.1.
* Make-dist: Add back one of the tar invocations removed before.
diff --git a/elf/Versions b/elf/Versions
index a49ecbf7de..18d007f6f1 100644
--- a/elf/Versions
+++ b/elf/Versions
@@ -50,7 +50,7 @@ ld {
_dl_relocate_object; _dl_signal_error; _dl_start_profile; _dl_starting_up;
_dl_unload_cache;
_rtld_global; _dl_tls_symaddr; _dl_allocate_tls; _dl_deallocate_tls;
- _dl_get_tls_static_info;
+ _dl_get_tls_static_info; _dl_allocate_tls_init;
_dl_get_origin;
}
}
diff --git a/sysdeps/generic/dl-tls.c b/sysdeps/generic/dl-tls.c
index c969464449..fe8f791638 100644
--- a/sysdeps/generic/dl-tls.c
+++ b/sysdeps/generic/dl-tls.c
@@ -333,6 +333,7 @@ _dl_allocate_tls_init (void *result)
return result;
}
+rtld_hidden_def (_dl_allocate_tls_init)
void *
internal_function
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 0d85506ea3..c149656446 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -742,8 +742,8 @@ extern void _dl_get_tls_static_info (size_t *sizep, size_t *alignp)
only used within rtld.c itself at startup time. */
extern void *_dl_allocate_tls_storage (void)
internal_function attribute_hidden;
-extern void *_dl_allocate_tls_init (void *)
- internal_function attribute_hidden;
+extern void *_dl_allocate_tls_init (void *) internal_function;
+rtld_hidden_proto (_dl_allocate_tls_init);
/* Deallocate memory allocated with _dl_allocate_tls. */
extern void _dl_deallocate_tls (void *tcb, bool dealloc_tcb) internal_function;