ia64 bfd.h tidy

bfd/
	* bfd-in.h: Move ia64 function declarations..
	* elfxx-ia64.h: ..to here.
	* bfd-in2.h: Regenerate.
ld/
	* emultempl/ia64elf.em: Include elfxx-ia64.h.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 61d31aaf97421f2af7ce9552e7ebcac4ae9289de..a08cd7e20f0316c067dfa708184faaaeea0ddba8 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2019-09-23  Alan Modra  <amodra@gmail.com>
+
+       * bfd-in.h: Move ia64 function declarations..
+       * elfxx-ia64.h: ..to here.
+       * bfd-in2.h: Regenerate.
+
 2019-09-23  Alan Modra  <amodra@gmail.com>
 
        * bfd-in.h: Move v850 function declarations..

diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index fe5e16812836baad6ac8dd27a9e394543afff602..1d0262ffaeca0d007ac746add4264c7a4e04187e 100644 (file)
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -1005,10 +1005,3 @@ extern int bfd_ticoff_get_section_load_page
 /* H8/300 functions.  */
 extern bfd_vma bfd_h8300_pad_address
   (bfd *, bfd_vma);
-
-/* IA64 Itanium code generation.  Called from linker.  */
-extern void bfd_elf32_ia64_after_parse
-  (int);
-
-extern void bfd_elf64_ia64_after_parse
-  (int);

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 6d92b89e2a55f84023a1d4b577c5b8fb50b001ec..88ca55011a2a6d74c2468a976b6fedef7cf7111a 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1012,13 +1012,6 @@ extern int bfd_ticoff_get_section_load_page
 /* H8/300 functions.  */
 extern bfd_vma bfd_h8300_pad_address
   (bfd *, bfd_vma);
-
-/* IA64 Itanium code generation.  Called from linker.  */
-extern void bfd_elf32_ia64_after_parse
-  (int);
-
-extern void bfd_elf64_ia64_after_parse
-  (int);
 /* Extracted from init.c.  */
 unsigned int bfd_init (void);
 

diff --git a/bfd/elfxx-ia64.h b/bfd/elfxx-ia64.h
index 915df8208974bf4bfdf7e2ad259a9442651157d2..628cbf6a13c9865cd11d7afa43f6f5f0e326ed1f 100644 (file)
--- a/bfd/elfxx-ia64.h
+++ b/bfd/elfxx-ia64.h
@@ -31,3 +31,10 @@ void ia64_elf_relax_ldxmov (bfd_byte *contents, bfd_vma off);
 
 bfd_reloc_status_type ia64_elf_install_value (bfd_byte *hit_addr, bfd_vma v,
                                              unsigned int r_type);
+
+/* IA64 Itanium code generation.  Called from linker.  */
+extern void bfd_elf32_ia64_after_parse
+  (int);
+
+extern void bfd_elf64_ia64_after_parse
+  (int);

diff --git a/ld/ChangeLog b/ld/ChangeLog
index fa5913e7becffe8302953e46a1445633b183a15c..3eddd55ddf84a04907955456081475eb6bbd927b 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2019-09-23  Alan Modra  <amodra@gmail.com>
+
+       * emultempl/ia64elf.em: Include elfxx-ia64.h.
+
 2019-09-23  Alan Modra  <amodra@gmail.com>
 
        * emultempl/v850elf.em: Include elf32-v850.h.

diff --git a/ld/emultempl/ia64elf.em b/ld/emultempl/ia64elf.em
index 59e1d8da79cd82ae22d00760aa7cf33151c9b82d..ae45956d770b89d93b6e45703fbf76b6a542d45c 100644 (file)
--- a/ld/emultempl/ia64elf.em
+++ b/ld/emultempl/ia64elf.em
@@ -27,6 +27,8 @@
 #
 fragment <<EOF
 
+#include "elfxx-ia64.h"
+
 /* None zero if generating binary for Intel Itanium processor.  */
 static int itanium = 0;