diff options
| author | Renlin Li <renlin.li@arm.com> | 2016-02-24 14:51:12 +0000 |
|---|---|---|
| committer | Renlin Li <renlin.li@arm.com> | 2016-02-24 15:01:07 +0000 |
| commit | 92d77487b3dbfd934c5565bab09e0f3051e0b08d (patch) | |
| tree | 129937fb20e6794e744ff7269cb4a1decd4beaed | |
| parent | d54af2d07039335c18239bd5eb2e93847f535d37 (diff) | |
| download | binutils-gdb-92d77487b3dbfd934c5565bab09e0f3051e0b08d.tar.gz | |
Revert "ABS32"
This reverts commit 30bdf5c82e5734ac9f0b18eb7af631806d419270.
| -rw-r--r-- | bfd/elfnn-aarch64.c | 18 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/aarch64-elf.exp | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/relocs-258-dyn.d | 8 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/relocs-258-dyn.s | 8 |
4 files changed, 3 insertions, 32 deletions
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index af7b7898917..16a6eea9218 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -4983,9 +4983,6 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, bfd_set_error (bfd_error_bad_value); return FALSE; -#if ARCH_SIZE == 64 - case BFD_RELOC_AARCH64_32: -#endif case BFD_RELOC_AARCH64_NN: if (rel->r_addend != 0) { @@ -5158,9 +5155,6 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, *unresolved_reloc_p = FALSE; return bfd_reloc_ok; -#if ARCH_SIZE == 64 - case BFD_RELOC_AARCH64_32: -#endif case BFD_RELOC_AARCH64_NN: /* When generating a shared object or relocatable executable, these @@ -5326,6 +5320,9 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, } case BFD_RELOC_AARCH64_16: +#if ARCH_SIZE == 64 + case BFD_RELOC_AARCH64_32: +#endif case BFD_RELOC_AARCH64_ADD_LO12: case BFD_RELOC_AARCH64_BRANCH19: case BFD_RELOC_AARCH64_LDST128_LO12: @@ -6800,9 +6797,6 @@ elfNN_aarch64_gc_sweep_hook (bfd *abfd, case BFD_RELOC_AARCH64_MOVW_G1_NC: case BFD_RELOC_AARCH64_MOVW_G2_NC: case BFD_RELOC_AARCH64_MOVW_G3: -#if ARCH_SIZE == 64 - case BFD_RELOC_AARCH64_32: -#endif case BFD_RELOC_AARCH64_NN: if (h != NULL && bfd_link_executable (info)) { @@ -7108,9 +7102,6 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC: case BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC: case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: -#if ARCH_SIZE == 64 - case BFD_RELOC_AARCH64_32: -#endif case BFD_RELOC_AARCH64_NN: if (htab->root.dynobj == NULL) htab->root.dynobj = abfd; @@ -7126,9 +7117,6 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, switch (bfd_r_type) { -#if ARCH_SIZE == 64 - case BFD_RELOC_AARCH64_32: -#endif case BFD_RELOC_AARCH64_NN: /* We don't need to handle relocs into sections not going into diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp index 65a05498aa6..d0b33cf5a46 100644 --- a/ld/testsuite/ld-aarch64/aarch64-elf.exp +++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp @@ -185,7 +185,6 @@ run_dump_test "farcall-bl-none-function" run_dump_test "farcall-b-section" run_dump_test "farcall-bl-section" -run_dump_test "relocs-258-dyn" run_dump_test "tls-relax-all" run_dump_test "tls-relax-gd-le" run_dump_test "tls-relax-gdesc-le" diff --git a/ld/testsuite/ld-aarch64/relocs-258-dyn.d b/ld/testsuite/ld-aarch64/relocs-258-dyn.d deleted file mode 100644 index 4b769b78d57..00000000000 --- a/ld/testsuite/ld-aarch64/relocs-258-dyn.d +++ /dev/null @@ -1,8 +0,0 @@ -#source: relocs-258-dyn.s -#ld: --defsym dummy=0x45034 -T aarch64.ld -shared -#readelf: -Wr - -Relocation section '\.rela\.dyn' at offset 0x8080 contains 2 entries: - Offset Info Type Symbol's Value Symbol's Name \+ Addend -0000000000008010 0000000000000403 R_AARCH64_RELATIVE 800c -000000000000800c 0000000200000102 R_AARCH64_ABS32 0000000000045034 dummy \+ 0 diff --git a/ld/testsuite/ld-aarch64/relocs-258-dyn.s b/ld/testsuite/ld-aarch64/relocs-258-dyn.s deleted file mode 100644 index 91d4738170e..00000000000 --- a/ld/testsuite/ld-aarch64/relocs-258-dyn.s +++ /dev/null @@ -1,8 +0,0 @@ -.text - ldr x0, .LC0 - ldr x0, .LC1 - ret -.LC0: - .word dummy -.LC1: - .word .LC0 |