bfd/ * bfd-in.h (bfd_elf64_aarch64_set_options): Add 'extern'. * bfd-in2.h: Re-generated. * e

Programming / Debugging / GDB - yufeng [ufeng] - 20 June 2013 11:01 UTC

bfd/
- bfd-in.h (bfd_elf64_aarch64_set_options): Add 'extern'.
- bfd-in2.h: Re-generated.
- elf64-aarch64.c (RELOC_SECTION): Removed. (SWAP_RELOC_IN, SWAP_RELOC_OUT): Ditto. (AARCH64_ELF_OS_ABI_VERSION): Ditto. (elf64_aarch64_link_hash_traverse): Ditto. (elf64_aarch64_size_stubs): Change 'Aarch64' to 'AArch64' in the comment.

opcodes/

- aarch64-dis.c (EMBEDDED_ENV): Remove the check on it. (SYMTAB_AVAILABLE): Removed. (#include "elf/aarch64.h): Ditto.

###

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d3773c4..af0ba3a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+2013-06-20 Yufeng Zhang
+
+ * bfd-in.h (bfd_elf64_aarch64_set_options): Add 'extern'.
+ * bfd-in2.h: Re-generated.
+ * elf64-aarch64.c (RELOC_SECTION): Removed.
+ (SWAP_RELOC_IN, SWAP_RELOC_OUT): Ditto.
+ (AARCH64_ELF_OS_ABI_VERSION): Ditto.
+ (elf64_aarch64_link_hash_traverse): Ditto.
+ (elf64_aarch64_size_stubs): Change 'Aarch64' to 'AArch64' in the
+ comment.
+
2013-06-19 Will Newton

* configure: Regenerated.
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 1d51932..03cac6e 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -933,7 +933,7 @@ extern unsigned int _bfd_elf_ppc_at_tprel_transform
extern void bfd_elf64_aarch64_init_maps
(bfd *);

-void bfd_elf64_aarch64_set_options
+extern void bfd_elf64_aarch64_set_options
(bfd *, struct bfd_link_info *, int, int, int);

/* ELF AArch64 mapping symbol support. */
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index f5b98c5..a20abc0 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -940,7 +940,7 @@ extern unsigned int _bfd_elf_ppc_at_tprel_transform
extern void bfd_elf64_aarch64_init_maps
(bfd *);

-void bfd_elf64_aarch64_set_options
+extern void bfd_elf64_aarch64_set_options
(bfd *, struct bfd_link_info *, int, int, int);

/* ELF AArch64 mapping symbol support. */
diff --git a/bfd/elf64-aarch64.c b/bfd/elf64-aarch64.c
index 68f03fc..5d926a4 100644
--- a/bfd/elf64-aarch64.c
+++ b/bfd/elf64-aarch64.c
@@ -185,23 +185,10 @@ bfd_elf_aarch64_put_addend (bfd *abfd,

#define ELIMINATE_COPY_RELOCS 0

-/* Return the relocation section associated with NAME. HTAB is the
- bfd's elf64_aarch64_link_hash_entry. */
-#define RELOC_SECTION(HTAB, NAME) \
- ((HTAB)->use_rel ? ".rel" NAME : ".rela" NAME)
-
/* Return size of a relocation entry. HTAB is the bfd's
elf64_aarch64_link_hash_entry. */
#define RELOC_SIZE(HTAB) (sizeof (Elf64_External_Rela))

-/* Return function to swap relocations in. HTAB is the bfd's
- elf64_aarch64_link_hash_entry. */
-#define SWAP_RELOC_IN(HTAB) (bfd_elf64_swap_reloca_in)
-
-/* Return function to swap relocations out. HTAB is the bfd's
- elf64_aarch64_link_hash_entry. */
-#define SWAP_RELOC_OUT(HTAB) (bfd_elf64_swap_reloca_out)
-
/* GOT Entry size - 8 bytes. */
#define GOT_ENTRY_SIZE (8)
#define PLT_ENTRY_SIZE (32)
@@ -264,7 +251,6 @@ elf64_aarch64_tlsdesc_small_plt_entry[PLT_TLSDESC_ENTRY_SIZE] =
#define elf_info_to_howto_rel elf64_aarch64_info_to_howto

#define AARCH64_ELF_ABI_VERSION 0
-#define AARCH64_ELF_OS_ABI_VERSION 0

/* In case we're on a 32-bit machine, construct a 64-bit "-1" value. */
#define ALL_ONES (~ (bfd_vma) 0)
@@ -1784,13 +1770,6 @@ elf64_aarch64_symbol_got_type (struct elf_link_hash_entry *h,
return elf64_aarch64_locals (abfd)[r_symndx].got_type;
}

-/* Traverse an AArch64 ELF linker hash table. */
-#define elf64_aarch64_link_hash_traverse(table, func, info) \
- (elf_link_hash_traverse \
- (&(table)->root, \
- (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func), \
- (info)))
-
/* Get the AArch64 elf linker hash table from a link_info structure. */
#define elf64_aarch64_hash_table(info) \
((struct elf64_aarch64_link_hash_table *) ((info)->hash))
@@ -2735,7 +2714,7 @@ elf64_aarch64_size_stubs (bfd *output_bfd,
if (stub_group_size == 1)
{
/* Default values. */
- /* Aarch64 branch range is +-128MB. The value used is 1MB less. */
+ /* AArch64 branch range is +-128MB. The value used is 1MB less. */
stub_group_size = 127 * 1024 * 1024;
}

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d1b106e..002bd89 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-20 Yufeng Zhang
+
+ * aarch64-dis.c (EMBEDDED_ENV): Remove the check on it.
+ (SYMTAB_AVAILABLE): Removed.
+ (#include "elf/aarch64.h): Ditto.
+
2013-06-17 Catherine Moore
Maciej W. Rozycki
Chao-Ying Fu
diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c
index d8bd290..c757316 100644
--- a/opcodes/aarch64-dis.c
+++ b/opcodes/aarch64-dis.c
@@ -24,12 +24,7 @@
#include "libiberty.h"
#include "opintl.h"
#include "aarch64-dis.h"
-
-#if !defined(EMBEDDED_ENV)
-#define SYMTAB_AVAILABLE 1
#include "elf-bfd.h"
-#include "elf/aarch64.h"
-#endif

#define ERR_OK 0
#define ERR_UND -1

27ef916 bfd/ * bfd-in.h (bfd_elf64_aarch64_set_options): Add 'extern'. * bfd-in2.h: Re-generated. * elf64-aarch64.c (RELOC_SECTION): Removed. (SWAP_RELOC_IN, SWAP_RELOC_OUT): Ditto. (AARCH64_ELF_OS_ABI_VERSION): Ditto. (elf64_aarch64_link_hash_traverse): Ditto. (elf64_aarch64_size_stubs): Change 'Aarch64' to 'AArch64' in the comment.
bfd/ChangeLog | 11 +++++++++++
bfd/bfd-in.h | 2 +-
bfd/bfd-in2.h | 2 +-
bfd/elf64-aarch64.c | 23 +----------------------
opcodes/ChangeLog | 6 ++++++
opcodes/aarch64-dis.c | 5 -----
6 files changed, 20 insertions(+), 29 deletions(-)

Upstream: sourceware.org

  • Share