diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-09-28 11:30:57 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-09-28 11:30:57 -0700 |
| commit | 9bac1d8624d3c628b473e20823fb5a154896714c (patch) | |
| tree | 356a68e4d3536074b0a59e1c8b0e525f7e07eae2 /elf | |
| parent | 25f5f885c6c0cec20554ca7b6c71fd1b7b50f51c (diff) | |
| download | glibc-9bac1d8624d3c628b473e20823fb5a154896714c.tar.gz | |
Define VERSYMIDX/VALIDX/ADDRIDX in ldsodefs.h
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-runtime.c | 4 | ||||
| -rw-r--r-- | elf/dl-version.c | 5 | ||||
| -rw-r--r-- | elf/do-rel.h | 8 | ||||
| -rw-r--r-- | elf/dynamic-link.h | 4 | ||||
| -rw-r--r-- | elf/rtld.c | 9 |
5 files changed, 0 insertions, 30 deletions
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index fdaa364c64..2e02a218e6 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -36,10 +36,6 @@ # define PLTREL ElfW(Rel) #endif -#ifndef VERSYMIDX -# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym)) -#endif - /* The fixup functions might have need special attributes. If none are provided define the macro as empty. */ #ifndef ARCH_FIXUP_ATTRIBUTE diff --git a/elf/dl-version.c b/elf/dl-version.c index af7f89960d..b2ebb16512 100644 --- a/elf/dl-version.c +++ b/elf/dl-version.c @@ -28,11 +28,6 @@ #include <assert.h> -#ifndef VERSYMIDX -# define VERSYMIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (tag)) -#endif - - #define make_string(string, rest...) \ ({ \ const char *all[] = { string, ## rest }; \ diff --git a/elf/do-rel.h b/elf/do-rel.h index 10d8f31c4e..272b7821dd 100644 --- a/elf/do-rel.h +++ b/elf/do-rel.h @@ -32,14 +32,6 @@ (void *) (l_addr + relative->r_offset)) #endif -#ifndef VERSYMIDX -# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym)) -#endif -#ifndef VALIDX -# define VALIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \ - + DT_EXTRANUM + DT_VALTAGIDX (tag)) -#endif - /* Perform the relocations in MAP on the running program image as specified by RELTAG, SZTAG. If LAZY is nonzero, this is the first pass on PLT relocations; they should be set up to call _dl_runtime_resolve, rather diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h index 44f53b3c70..d982c52ed3 100644 --- a/elf/dynamic-link.h +++ b/elf/dynamic-link.h @@ -88,10 +88,6 @@ elf_machine_lazy_rel (struct link_map *map, #include <dl-machine.h> -#ifndef VERSYMIDX -# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym)) -#endif - /* Read the dynamic section at DYN and fill in INFO with indices DT_*. */ #ifndef RESOLVE_MAP diff --git a/elf/rtld.c b/elf/rtld.c index ed0a86bb3d..ed5d06298e 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -254,15 +254,6 @@ RTLD_START # error "sysdeps/MACHINE/dl-machine.h fails to define RTLD_START" #endif -#ifndef VALIDX -# define VALIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \ - + DT_EXTRANUM + DT_VALTAGIDX (tag)) -#endif -#ifndef ADDRIDX -# define ADDRIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \ - + DT_EXTRANUM + DT_VALNUM + DT_ADDRTAGIDX (tag)) -#endif - /* This is the second half of _dl_start (below). It can be inlined safely under DONT_USE_BOOTSTRAP_MAP, where it is careful not to make any GOT references. When the tools don't permit us to avoid using a GOT entry |