[binutils-gdb] ia64 bfd.h tidy

[Alan Modra]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3352ae9900037b231f9838e088af450a19bade17

commit 3352ae9900037b231f9838e088af450a19bade17
Author: Alan Modra <amodra@gmail.com>
Date:   Mon Sep 23 10:02:25 2019 +0930

    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:
---
 bfd/ChangeLog           | 6 ++++++
 bfd/bfd-in.h            | 7 -------
 bfd/bfd-in2.h           | 7 -------
 bfd/elfxx-ia64.h        | 7 +++++++
 ld/ChangeLog            | 4 ++++
 ld/emultempl/ia64elf.em | 2 ++
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 61d31aa..a08cd7e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
 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..
 	* elf32-v850.h: ..to here, new file.
 	* elf32-v850.c: Include elf32-v850.h.
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index fe5e168..1d0262f 100644
--- 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 6d92b89..88ca550 100644
--- 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 915df82..628cbf6 100644
--- 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 fa5913e..3eddd55 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,9 @@
 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.
 
 2019-09-23  Alan Modra  <amodra@gmail.com>
diff --git a/ld/emultempl/ia64elf.em b/ld/emultempl/ia64elf.em
index 59e1d8d..ae45956 100644
--- 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;