system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Wundef warning for ELF_MACHINE_NO_RELA

Browse Source 
This patch defines ELF_MACHINE_NO_RELA on all architectures.  Tested
only on x86_64 to verify that the sources before and after are
identical except for two instructions that pass the current line
number in dl-machine.h to assert_fail.
This commit is contained in:
Siddhesh Poyarekar 2014-06-26 15:17:40 +05:30
parent 2aac0a8623
commit 4cf5b6d0d7
17 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,5 +1,23 @@
2014-06-26 Siddhesh Poyarekar <siddhesh@redhat.com>
* elf/dl-runtime.c: Check for value of ELF_MACHINE_NO_RELA
instead of whether it is defined.
* sysdeps/aarch64/dl-machine.h: Define ELF_MACHINE_NO_RELA.
* sysdeps/hppa/dl-machine.h: Likewise.
* sysdeps/ia64/dl-machine.h: Likewise.
* sysdeps/m68k/dl-machine.h: Likewise.
* sysdeps/microblaze/dl-machine.h: Likewise.
* sysdeps/mips/dl-machine.: Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h: Likewise.
* sysdeps/powerpc/powerpc64/dl-machine.h: Likewise.
* sysdeps/s390/s390-32/dl-machine.h: Likewise.
* sysdeps/s390/s390-64/dl-machine.h: Likewise.
* sysdeps/sh/dl-machine.h: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h: Likewise.
* sysdeps/sparc/sparc64/dl-machine.h: Likewise.
* sysdeps/tile/dl-machine.h: Likewise.
* sysdeps/x86_64/dl-machine.h: Likewise.
* nscd/connections.c (enum usekey) [SEPARATE_KEY]: Remove
code.
(verify_persistent_db): Likewise.

2
elf/dl-runtime.c
View File

@ -29,7 +29,7 @@
#include <dl-irel.h>
#if (!defined ELF_MACHINE_NO_RELA && !defined ELF_MACHINE_PLT_REL) \
#if (!ELF_MACHINE_NO_RELA && !defined ELF_MACHINE_PLT_REL) \
|| ELF_MACHINE_NO_REL
# define PLTREL ElfW(Rela)
#else

1
sysdeps/aarch64/dl-machine.h
View File

@ -198,6 +198,7 @@ _dl_start_user: \n\
/* AArch64 uses RELA not REL */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
static inline ElfW(Addr)
elf_machine_fixup_plt (struct link_map *map, lookup_t t,

1
sysdeps/hppa/dl-machine.h
View File

@ -488,6 +488,7 @@ asm ( \
/* We only use RELA. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
/* Return the address of the entry point. */
#define ELF_MACHINE_START_ADDRESS(map, start) \

1
sysdeps/ia64/dl-machine.h
View File

@ -320,6 +320,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
/* According to the IA-64 specific documentation, Rela is always used. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
/* Return the address of the entry point. */
#define ELF_MACHINE_START_ADDRESS(map, start) \

1
sysdeps/m68k/dl-machine.h
View File

@ -178,6 +178,7 @@ _dl_start_user:\n\
/* The m68k never uses Elf32_Rel relocations. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
static inline Elf32_Addr
elf_machine_fixup_plt (struct link_map *map, lookup_t t,

1
sysdeps/microblaze/dl-machine.h
View File

@ -170,6 +170,7 @@ _dl_start_user:\n\
/* The microblaze never uses Elf32_Rel relocations. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
static inline Elf32_Addr
elf_machine_fixup_plt (struct link_map *map, lookup_t t,

2
sysdeps/mips/dl-machine.h
View File

@ -60,6 +60,8 @@
| (((type) == R_MIPS_COPY) * ELF_RTYPE_CLASS_COPY))
#define ELF_MACHINE_PLT_REL 1
#define ELF_MACHINE_NO_REL 0
#define ELF_MACHINE_NO_RELA 0
/* Translate a processor specific dynamic tag to the index
in l_info array. */

1
sysdeps/powerpc/powerpc32/dl-machine.h
View File

@ -148,6 +148,7 @@ __elf_preferred_address(struct link_map *loader, size_t maplength,
/* The PowerPC never uses REL relocations. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
/* Set up the loaded object described by MAP so its unrelocated PLT
entries will jump to the on-demand fixup code in dl-runtime.c.

1
sysdeps/powerpc/powerpc64/dl-machine.h
View File

@ -294,6 +294,7 @@ BODY_PREFIX "_dl_start_user:\n" \
/* The PowerPC never uses REL relocations. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
/* Stuff for the PLT. */
#if _CALL_ELF != 2

1
sysdeps/s390/s390-32/dl-machine.h
View File

@ -226,6 +226,7 @@ _dl_start_user:\n\
/* The S390 never uses Elf32_Rel relocations. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
/* We define an initialization functions. This is called very early in
_dl_sysdep_start. */

1
sysdeps/s390/s390-64/dl-machine.h
View File

@ -205,6 +205,7 @@ _dl_start_user:\n\
/* The 64 bit S/390 never uses Elf64_Rel relocations. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
/* We define an initialization functions. This is called very early in
_dl_sysdep_start. */

1
sysdeps/sh/dl-machine.h
View File

@ -251,6 +251,7 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rela *reloc,
/* SH never uses Elf32_Rel relocations. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
#ifdef RESOLVE_MAP

1
sysdeps/sparc/sparc32/dl-machine.h
View File

@ -197,6 +197,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
/* The SPARC never uses Elf32_Rel relocations. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
/* Undo the sub %sp, 6*4, %sp; add %sp, 22*4, %o0 below to get at the
value we want in __libc_stack_end. */

1
sysdeps/sparc/sparc64/dl-machine.h
View File

@ -119,6 +119,7 @@ elf_machine_plt_value (struct link_map *map, const Elf64_Rela *reloc,
/* The SPARC never uses Elf64_Rel relocations. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
/* Set up the loaded object described by L so its unrelocated PLT
entries will jump to the on-demand fixup code in dl-runtime.c. */

1
sysdeps/tile/dl-machine.h
View File

@ -223,6 +223,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
/* TILE never uses Elf32_Rel relocations. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
/* We define an initialization functions. This is called very early in
_dl_sysdep_start. */

1
sysdeps/x86_64/dl-machine.h
View File

@ -189,6 +189,7 @@ _dl_start_user:\n\
/* The x86-64 never uses Elf64_Rel/Elf32_Rel relocations. */
#define ELF_MACHINE_NO_REL 1
#define ELF_MACHINE_NO_RELA 0
/* We define an initialization function. This is called very early in
_dl_sysdep_start. */