From 154d10bdf1984f4fe28f898e07bc25c5367f443e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 6 Mar 2004 08:19:29 +0000 Subject: Update. * elf/Versions: Remove functions which are not exported anymore. * dlfcn/dlerror.c: Call ld.so functions through GLSO. * dlfcn/dlinfo.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-libc.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-sym.c: Likewise. * sysdeps/generic/libc-start.c: Likewise. * elf/dl-debug.c: Remove *_internal definition. Don't use INTUSE for functions which are not exported anymore. * elf/dl-deps.c: Likewise. * elf/dl-dst.h: Likewise. * elf/dl-error.c: Likewise. * elf/dl-fini.c: Likewise. * elf/dl-init.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-misc.c: Likewise. * elf/dl-profile.c: Likewise. * elf/dl-profstub.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-version.c: Likewise. * elf/do-lookup.h: Likewise. * include/dlfcn.h: Likewise. * sysdeps/generic/dl-cache.c: Likewise. * sysdeps/generic/dl-fptr.c: Likewise. * sysdeps/generic/dl-origin.c: Likewise. * sysdeps/generic/dl-sysdep.c: Likewise. * sysdeps/generic/dl-tls.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/i386/dl-tls.h: Likewise. * sysdeps/unix/sysv/linux/dl-origin.c: Likewise. * elf/rtld.c: Likewise. Export function though _rtld_global_ro. * generic/dl-fptr.c: Likewise. * mach/hurd/dl-sysdep.c: Likewise. * unix/sysv/linux/ia64/dl-static.c: Likewise. * unix/sysv/linux/ia64/getpagesize.c: Likewise. * unix/sysv/linux/m68k/getpagesize.c: Likewise. * unix/sysv/linux/sparc/sparc32/getpagesize.c: Likewise. --- sysdeps/unix/sysv/linux/dl-origin.c | 2 -- sysdeps/unix/sysv/linux/ia64/dl-static.c | 10 +++++----- sysdeps/unix/sysv/linux/ia64/getpagesize.c | 6 +++--- sysdeps/unix/sysv/linux/m68k/getpagesize.c | 6 +++--- sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c | 8 ++++---- 5 files changed, 15 insertions(+), 17 deletions(-) (limited to 'sysdeps/unix/sysv/linux') diff --git a/sysdeps/unix/sysv/linux/dl-origin.c b/sysdeps/unix/sysv/linux/dl-origin.c index 6904920..f751234 100644 --- a/sysdeps/unix/sysv/linux/dl-origin.c +++ b/sysdeps/unix/sysv/linux/dl-origin.c @@ -31,7 +31,6 @@ the path of the application from the /proc/self/exe symlink. Try this first and fall back on the generic method if necessary. */ -#undef _dl_get_origin const char * _dl_get_origin (void) { @@ -77,4 +76,3 @@ _dl_get_origin (void) return result; } -INTDEF(_dl_get_origin) diff --git a/sysdeps/unix/sysv/linux/ia64/dl-static.c b/sysdeps/unix/sysv/linux/ia64/dl-static.c index 6489068..691ba31 100644 --- a/sysdeps/unix/sysv/linux/ia64/dl-static.c +++ b/sysdeps/unix/sysv/linux/ia64/dl-static.c @@ -1,5 +1,5 @@ /* Variable initialization. IA-64 version. - Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,8 +31,8 @@ _dl_var_init (void *array[]) DL_CLKTCK }; - GL(dl_pagesize) = *((size_t *) array[DL_PAGESIZE]); - GL(dl_clktck) = *((int *) array[DL_CLKTCK]); + GLRO(dl_pagesize) = *((size_t *) array[DL_PAGESIZE]); + GLRO(dl_clktck) = *((int *) array[DL_CLKTCK]); } #else @@ -42,8 +42,8 @@ __libc_lock_define_initialized_recursive (static, _dl_static_lock) static void *variables[] = { - &GL(dl_pagesize), - &GL(dl_clktck) + &GLRO(dl_pagesize), + &GLRO(dl_clktck) }; void diff --git a/sysdeps/unix/sysv/linux/ia64/getpagesize.c b/sysdeps/unix/sysv/linux/ia64/getpagesize.c index 745e47f..1155dfd 100644 --- a/sysdeps/unix/sysv/linux/ia64/getpagesize.c +++ b/sysdeps/unix/sysv/linux/ia64/getpagesize.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -32,8 +32,8 @@ int __getpagesize () { - assert (GL(dl_pagesize) != 0); - return GL(dl_pagesize); + assert (GLRO(dl_pagesize) != 0); + return GLRO(dl_pagesize); } libc_hidden_def (__getpagesize) weak_alias (__getpagesize, getpagesize) diff --git a/sysdeps/unix/sysv/linux/m68k/getpagesize.c b/sysdeps/unix/sysv/linux/m68k/getpagesize.c index 10a437b..f7ffdc5 100644 --- a/sysdeps/unix/sysv/linux/m68k/getpagesize.c +++ b/sysdeps/unix/sysv/linux/m68k/getpagesize.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Schwab . @@ -33,8 +33,8 @@ __getpagesize () int result; #endif - if (GL(dl_pagesize) != 0) - return GL(dl_pagesize); + if (GLRO(dl_pagesize) != 0) + return GLRO(dl_pagesize); #ifdef __NR_getpagesize INTERNAL_SYSCALL_DECL (err); diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c b/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c index 42ef9d3..00bbdc7 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,12 +31,12 @@ int __getpagesize () { - if (GL(dl_pagesize) == 0) + if (GLRO(dl_pagesize) == 0) { INTERNAL_SYSCALL_DECL (err); - GL(dl_pagesize) = INTERNAL_SYSCALL (getpagesize, err, 0); + GLRO(dl_pagesize) = INTERNAL_SYSCALL (getpagesize, err, 0); } - return GL(dl_pagesize); + return GLRO(dl_pagesize); } libc_hidden_def (__getpagesize) weak_alias (__getpagesize, getpagesize) -- cgit v1.1