cr16 bfd.h tidy

bfd/
	* bfd-in.h: Move cr16 function declaration..
	* elf32-cr16.h: ..to here, new file.
	* elf32-cr16.c: Include elf32-cr16.h.
	* bfd-in2.h: Regenerate.
ld/
	* emultempl/cr16elf.em: Include elf32-cr16.h.

7 files changed, 35 insertions, 8 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 57cefe1..0b5ef97 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,12 @@
 2019-09-23  Alan Modra  <amodra@gmail.com>
 
+	* bfd-in.h: Move cr16 function declaration..
+	* elf32-cr16.h: ..to here, new file.
+	* elf32-cr16.c: Include elf32-cr16.h.
+	* bfd-in2.h: Regenerate.
+
+2019-09-23  Alan Modra  <amodra@gmail.com>
+
 	* bfd-in.h (bfd_sunos_get_needed_list),
 	(bfd_sunos_record_link_assignment),
 	(bfd_sunos_size_dynamic_sections),
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index a01f80d..61992fe 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -678,10 +678,6 @@ extern bfd_boolean bfd_bfin_elf32_create_embedded_relocs
   (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
    char **);
 
-extern bfd_boolean bfd_cr16_elf32_create_embedded_relocs
-  (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
-   char **);
-
 /* mmap hacks */
 
 struct _bfd_window_internal;
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 47df9e3..257f930 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -685,10 +685,6 @@ extern bfd_boolean bfd_bfin_elf32_create_embedded_relocs
   (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
    char **);
 
-extern bfd_boolean bfd_cr16_elf32_create_embedded_relocs
-  (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
-   char **);
-
 /* mmap hacks */
 
 struct _bfd_window_internal;
diff --git a/bfd/elf32-cr16.c b/bfd/elf32-cr16.c
index 72642e5..1a6bbbc 100644
--- a/bfd/elf32-cr16.c
+++ b/bfd/elf32-cr16.c
@@ -25,6 +25,7 @@
 #include "libiberty.h"
 #include "elf-bfd.h"
 #include "elf/cr16.h"
+#include "elf32-cr16.h"
 
 /* The cr16 linker needs to keep track of the number of relocs that
    it decides to copy in check_relocs for each symbol.  This is so
diff --git a/bfd/elf32-cr16.h b/bfd/elf32-cr16.h
new file mode 100644
index 0000000..6680c6e
--- /dev/null
+++ b/bfd/elf32-cr16.h
@@ -0,0 +1,22 @@
+/* BFD back-end for National Semiconductor's CR16 ELF
+   Copyright (C) 2019 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+extern bfd_boolean bfd_cr16_elf32_create_embedded_relocs
+  (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
+   char **);
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 5a20bf0..60a1fd6 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,9 @@
 2019-09-23  Alan Modra  <amodra@gmail.com>
 
+	* emultempl/cr16elf.em: Include elf32-cr16.h.
+
+2019-09-23  Alan Modra  <amodra@gmail.com>
+
 	* emultempl/aix.em: Include xcofflink.h.
 
 2019-09-23  Alan Modra  <amodra@gmail.com>
diff --git a/ld/emultempl/cr16elf.em b/ld/emultempl/cr16elf.em
index 9cdd356..eb06880 100644
--- a/ld/emultempl/cr16elf.em
+++ b/ld/emultempl/cr16elf.em
@@ -26,6 +26,7 @@
 fragment <<EOF
 
 #include "ldctor.h"
+#include "elf32-cr16.h"
 
 static void check_sections (bfd *, asection *, void *);