about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-04-24 17:10:52 +0000
committerRoland McGrath <roland@gnu.org>2003-04-24 17:10:52 +0000
commit545dbc9345c81963ee3b48b0104807f06fda7b28 (patch)
treea881f7258fe383ddf1c20e0ca4f1e28f28f70ad1 /elf
parent345d920835ed818a09cf242da31adf7e9981f614 (diff)
downloadglibc-545dbc9345c81963ee3b48b0104807f06fda7b28.tar.gz
glibc-545dbc9345c81963ee3b48b0104807f06fda7b28.tar.xz
glibc-545dbc9345c81963ee3b48b0104807f06fda7b28.zip
2003-04-24 Jakub Jelinek <jakub@redhat.com>
	* elf/dl-reloc.c (allocate_static_tls): Rename to...
	(_dl_allocate_static_tls): ... this function.  No longer static.
	(CHECK_STATIC_TLS): Adjust.
	* sysdeps/generic/ldsodefs.h (_dl_allocate_static_tls): New prototype.
	* sysdeps/powerpc/powerpc32/dl-machine.h (__process_machine_rela):
	Add SYM_MAP argument.
	(elf_machine_rela): Adjust caller.  Declare SYM_MAP unconditionally.
	Check if SYM_MAP != NULL for R_PPC_DTPREL32.  Only handle 32-bit
	TLS relocs here.  #ifdef out relocs which never appear in
	.gnu.conflict section from dl-conflict.c processing.
	* sysdeps/powerpc/powerpc32/dl-machine.c (__process_machine_rela):
	Add SYM_MAP argument.  Handle 16-bit TLS relocs here.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-reloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index ad6c00cd64..e8e56c84e7 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -41,8 +41,8 @@
    the static TLS area already allocated for each running thread.  If this
    object's TLS segment is too big to fit, we fail.  If it fits,
    we set MAP->l_tls_offset and return.  */
-static void __attribute_noinline__
-allocate_static_tls (struct link_map *map)
+void __attribute_noinline__
+_dl_allocate_static_tls (struct link_map *map)
 {
   size_t offset, used, check;
 
@@ -209,7 +209,7 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
 #define CHECK_STATIC_TLS(map, sym_map)					      \
     do {								      \
       if (__builtin_expect ((sym_map)->l_tls_offset == 0, 0))		      \
-	allocate_static_tls (sym_map);					      \
+	_dl_allocate_static_tls (sym_map);				      \
     } while (0)
 
 #include "dynamic-link.h"