diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2015-02-24 18:19:50 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2015-03-02 11:00:36 +0800 |
| commit | 4f16de34c2f531495992afc6ecaab46391b59ff8 (patch) | |
| tree | 01f524c40796b935704a60fcea338e056297c16f /binutils-2.25/bfd | |
| parent | fd6fc0c5f6ec26b3b526655a721b7b0af0b14644 (diff) | |
| download | toolchain_binutils-4f16de34c2f531495992afc6ecaab46391b59ff8.zip toolchain_binutils-4f16de34c2f531495992afc6ecaab46391b59ff8.tar.gz toolchain_binutils-4f16de34c2f531495992afc6ecaab46391b59ff8.tar.bz2 | |
Fix build
1. revert https://android-review.googlesource.com/#/c/38591.
2. add a few constants from ToT
3. fix a typo about pthread_mutexattr_settype
Change-Id: I55a829e7907658f920aedbf1100c6d9b1a93052b
Diffstat (limited to 'binutils-2.25/bfd')
| -rw-r--r-- | binutils-2.25/bfd/elf32-arm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/binutils-2.25/bfd/elf32-arm.c b/binutils-2.25/bfd/elf32-arm.c index 51745d2..c507e4f 100644 --- a/binutils-2.25/bfd/elf32-arm.c +++ b/binutils-2.25/bfd/elf32-arm.c @@ -16214,6 +16214,11 @@ elf32_arm_get_synthetic_symtab (bfd *abfd, #define elf_backend_obj_attrs_order elf32_arm_obj_attrs_order #define elf_backend_obj_attrs_handle_unknown elf32_arm_obj_attrs_handle_unknown +#if 0 +/* Disable the following fix ported from https://android-review.googlesource.com/#/c/38591/1/binutils-2.21/bfd/elf32-arm.c + becaus elf32_arm_plt_entry isn't defined when FOUR_WORD_PLT isn't defined where elf32_arm_plt_entry_short + and elf32_arm_plt_entry_long are defined instead. + */ #undef elf_backend_plt_sym_val #define elf_backend_plt_sym_val elf32_arm_plt_sym_val @@ -16228,6 +16233,7 @@ elf32_arm_plt_sym_val (bfd_vma i, const asection *plt, ARRAY_SIZE(elf32_arm_plt0_entry) + ARRAY_SIZE(elf32_arm_plt_entry) * i); } +#endif #include "elf32-target.h" |