diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-11-04 17:39:39 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-11-04 17:39:39 +0000 |
| commit | 4243cbea6d30ce32b58abd8f1103156f8df617fa (patch) | |
| tree | 434ef397cb91424e48b123ca704e8176795f2161 /sysdeps/generic/ldsodefs.h | |
| parent | 2004e7fb76bd6806253436d63ab3bda7e24c9cc1 (diff) | |
| download | glibc-4243cbea6d30ce32b58abd8f1103156f8df617fa.zip glibc-4243cbea6d30ce32b58abd8f1103156f8df617fa.tar.gz glibc-4243cbea6d30ce32b58abd8f1103156f8df617fa.tar.bz2 | |
Don't use INTDEF/INTUSE with _dl_argv (bug 14132).
Continuing the removal of the obsolete INTDEF / INTUSE mechanism, this
patch replaces its use for _dl_argv with rtld_hidden_data_def and
rtld_hidden_proto. Some places in .S files that previously used
_dl_argv_internal or INTUSE(_dl_argv) now use __GI__dl_argv directly
(there are plenty of existing examples of such direct use of __GI_*).
A single place in rtld.c previously used _dl_argv without INTUSE,
apparently accidentally, while the rtld_hidden_proto mechanism avoids
such accidential omissions. As a consequence, this patch *does*
change the contents of stripped ld.so. However, the installed
stripped shared libraries are identical to those you get if instead of
this patch you change that single _dl_argv use to use INTUSE, without
any other changes.
Tested for x86_64 (testsuite as well as comparison of installed
stripped shared libraries as described above).
[BZ #14132]
* sysdeps/generic/ldsodefs.h (_dl_argv): Use rtld_hidden_proto.
[IS_IN_rtld] (_dl_argv_internal): Do not declare.
(rtld_progname): Make macro definition unconditional.
* elf/rtld.c (_dl_argv): Use rtld_hidden_data_def instead of
INTDEF.
(dlmopen_doit): Do not use INTUSE with _dl_argv.
(dl_main): Likewise.
* elf/dl-sysdep.c (_dl_sysdep_start): Likewise.
* sysdeps/alpha/dl-machine.h (RTLD_START): Use __GI__dl_argv
instead of _dl_argv_internal.
* sysdeps/powerpc/powerpc32/dl-start.S (_dl_start_user): Use
__GI__dl_argv instead of INTUSE(_dl_argv).
* sysdeps/powerpc/powerpc64/dl-machine.h (RTLD_START): Use
__GI__dl_argv instead of _dl_argv_internal.
Diffstat (limited to 'sysdeps/generic/ldsodefs.h')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index e01df84..d1c8e2c 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -641,6 +641,7 @@ extern char **_dl_argv attribute_relro #endif ; +rtld_hidden_proto (_dl_argv) #ifdef IS_IN_rtld extern unsigned int _dl_skip_args attribute_hidden # ifndef DL_ARGV_NOT_RELRO @@ -652,15 +653,8 @@ extern unsigned int _dl_skip_args_internal attribute_hidden attribute_relro # endif ; -extern char **_dl_argv_internal attribute_hidden -# ifndef DL_ARGV_NOT_RELRO - attribute_relro -# endif - ; -# define rtld_progname (INTUSE(_dl_argv)[0]) -#else -# define rtld_progname _dl_argv[0] #endif +#define rtld_progname _dl_argv[0] /* Flag set at startup and cleared when the last initializer has run. */ extern int _dl_starting_up; |