diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2013-06-06 22:09:07 +0000 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@linux-mips.org> | 2013-06-06 22:09:07 +0000 |
| commit | 7fb24f7dd028f26f5f744333d1e036f7121a1e00 (patch) | |
| tree | 8c86da72c75c168e03d4a89dc03508d6f3c304a8 /include | |
| parent | 7bab49c71b1bb3555d92e418e440a140f9a96497 (diff) | |
| download | binutils-redhat-7fb24f7dd028f26f5f744333d1e036f7121a1e00.tar.gz | |
* mips.h (ELF_ST_SET_MIPS_PIC): Clear any STO_MIPS16 setting.
Diffstat (limited to 'include')
| -rw-r--r-- | include/elf/ChangeLog | 4 | ||||
| -rw-r--r-- | include/elf/mips.h | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 9be3cff6c9..dcbe68633a 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,7 @@ +2013-06-06 Maciej W. Rozycki <macro@codesourcery.com> + + * mips.h (ELF_ST_SET_MIPS_PIC): Clear any STO_MIPS16 setting. + 2013-05-30 Paul Brook <paul@codesourcery.com> * mips.h (R_MIPS_EH): New. diff --git a/include/elf/mips.h b/include/elf/mips.h index b5f7e1a898..44d815e827 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -811,7 +811,10 @@ extern void bfd_mips_elf32_swap_reginfo_out although MIPS16 symbols are never considered to be MIPS_PIC. */ #define STO_MIPS_PIC 0x20 #define ELF_ST_IS_MIPS_PIC(other) (((other) & STO_MIPS_FLAGS) == STO_MIPS_PIC) -#define ELF_ST_SET_MIPS_PIC(other) (((other) & ~STO_MIPS_FLAGS) | STO_MIPS_PIC) +#define ELF_ST_SET_MIPS_PIC(other) \ + ((ELF_ST_IS_MIPS16 (other) \ + ? ((other) & ~(STO_MIPS16 | STO_MIPS_FLAGS)) \ + : ((other) & ~STO_MIPS_FLAGS)) | STO_MIPS_PIC) /* This value is used for a mips16 .text symbol. */ #define STO_MIPS16 0xf0 |