diff options
| author | Alan Modra <amodra@gmail.com> | 2013-10-29 16:34:35 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2013-11-15 15:45:06 +1030 |
| commit | 068f9cf74e0d3ff2332258b69c6260586427c31a (patch) | |
| tree | 8d98990e63b33e20aab00855bff5034e3d535dd9 /include/elf | |
| parent | 8ac63197263548be217ee623cfe44bbac16e0337 (diff) | |
| download | ppe42-binutils-068f9cf74e0d3ff2332258b69c6260586427c31a.tar.gz ppe42-binutils-068f9cf74e0d3ff2332258b69c6260586427c31a.zip | |
Replace DT_PPC_TLSOPT with DT_PPC_OPT.
(cherry picked from commit e8910a83af41c3dbfd00191b2720d4094f8d9532)
Diffstat (limited to 'include/elf')
| -rw-r--r-- | include/elf/ChangeLog | 6 | ||||
| -rw-r--r-- | include/elf/ppc.h | 3 | ||||
| -rw-r--r-- | include/elf/ppc64.h | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 9a62478ca5..622efb0a1f 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -2,6 +2,12 @@ Apply changes from mainline to 2.24 2013-10-30 Alan Modra <amodra@gmail.com> + * ppc.h (DT_PPC_TLSOPT): Delete. + (DT_PPC_OPT, PPC_OPT_TLS): Define. + * ppc64.h (DT_PPC64_TLSOPT): Delete. + (DT_PPC64_OPT, PPC64_OPT_TLS, PPC64_OPT_MULTI_TOC): Define. + + 2013-10-30 Alan Modra <amodra@gmail.com> * ppc64.h (STO_PPC64_LOCAL_BIT, STO_PPC64_LOCAL_MASK): Define. (ppc64_decode_local_entry, ppc64_encode_local_entry): New functions. (PPC64_LOCAL_ENTRY_OFFSET, PPC64_SET_LOCAL_ENTRY_OFFSET): Define. diff --git a/include/elf/ppc.h b/include/elf/ppc.h index f80a1e8a3e..da00df8688 100644 --- a/include/elf/ppc.h +++ b/include/elf/ppc.h @@ -176,7 +176,8 @@ END_RELOC_NUMBERS (R_PPC_max) #define DT_PPC_GOT (DT_LOPROC) /* Specify that tls descriptors should be optimized. */ -#define DT_PPC_TLSOPT (DT_LOPROC + 1) +#define DT_PPC_OPT (DT_LOPROC + 1) +#define PPC_OPT_TLS 1 /* Processor specific flags for the ELF header e_flags field. */ diff --git a/include/elf/ppc64.h b/include/elf/ppc64.h index d3cfdfb82c..78d947baea 100644 --- a/include/elf/ppc64.h +++ b/include/elf/ppc64.h @@ -234,7 +234,9 @@ ppc64_encode_local_entry(unsigned int val) #define DT_PPC64_OPD (DT_LOPROC + 1) #define DT_PPC64_OPDSZ (DT_LOPROC + 2) -/* Specify that tls descriptors should be optimized. */ -#define DT_PPC64_TLSOPT (DT_LOPROC + 3) +/* Specify whether various optimisations are possible. */ +#define DT_PPC64_OPT (DT_LOPROC + 3) +#define PPC64_OPT_TLS 1 +#define PPC64_OPT_MULTI_TOC 2 #endif /* _ELF_PPC64_H */ |
