[binutils-gdb] csky bfd.h tidy
Alan Modra
amodra@sourceware.org
Mon Sep 23 00:58:00 GMT 2019
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6e67e6b05abcb29148cda042c1297ad63e6c75f2
commit 6e67e6b05abcb29148cda042c1297ad63e6c75f2
Author: Alan Modra <amodra@gmail.com>
Date: Mon Sep 23 09:58:42 2019 +0930
csky bfd.h tidy
bfd/
* bfd-in.h: Move csky function declarations to..
* elf32-csky.h: ..here, new file.
* elf32-csky.c: Include elf32-csky.h.
* bfd-in2.h: Regenerate.
ld/
* emultempl/cskyelf.em: Include elf32-csky.h.
Diff:
---
bfd/ChangeLog | 7 +++++++
bfd/bfd-in.h | 12 ------------
bfd/bfd-in2.h | 12 ------------
bfd/elf32-csky.c | 1 +
bfd/elf32-csky.h | 30 ++++++++++++++++++++++++++++++
ld/ChangeLog | 4 ++++
ld/emultempl/cskyelf.em | 1 +
7 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b1a4aeb..906ff1d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2019-09-23 Alan Modra <amodra@gmail.com>
+
+ * bfd-in.h: Move csky function declarations to..
+ * elf32-csky.h: ..here, new file.
+ * elf32-csky.c: Include elf32-csky.h.
+ * bfd-in2.h: Regenerate.
+
2019-09-20 Nelson Chu <nelson.chu@sifive.com>
* elfnn-riscv.c (riscv_pcgp_hi_reloc): Add new field undefined_weak.
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 969a965..56a006e 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -1023,15 +1023,3 @@ extern bfd_boolean v850_elf_set_note
/* MIPS ABI flags data access. For the disassembler. */
struct elf_internal_abiflags_v0;
extern struct elf_internal_abiflags_v0 *bfd_mips_elf_get_abiflags (bfd *);
-
-/* C-SKY functions. */
-extern bfd_boolean elf32_csky_build_stubs
- (struct bfd_link_info *);
-extern bfd_boolean elf32_csky_size_stubs
- (bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
- struct bfd_section *(*) (const char*, struct bfd_section*),
- void (*) (void));
-extern void elf32_csky_next_input_section
- (struct bfd_link_info *, struct bfd_section *);
-extern int elf32_csky_setup_section_lists
- (bfd *, struct bfd_link_info *);
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 44bce06..1aa2975 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1030,18 +1030,6 @@ extern bfd_boolean v850_elf_set_note
/* MIPS ABI flags data access. For the disassembler. */
struct elf_internal_abiflags_v0;
extern struct elf_internal_abiflags_v0 *bfd_mips_elf_get_abiflags (bfd *);
-
-/* C-SKY functions. */
-extern bfd_boolean elf32_csky_build_stubs
- (struct bfd_link_info *);
-extern bfd_boolean elf32_csky_size_stubs
- (bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
- struct bfd_section *(*) (const char*, struct bfd_section*),
- void (*) (void));
-extern void elf32_csky_next_input_section
- (struct bfd_link_info *, struct bfd_section *);
-extern int elf32_csky_setup_section_lists
- (bfd *, struct bfd_link_info *);
/* Extracted from init.c. */
unsigned int bfd_init (void);
diff --git a/bfd/elf32-csky.c b/bfd/elf32-csky.c
index 16897b3..85fddf8 100644
--- a/bfd/elf32-csky.c
+++ b/bfd/elf32-csky.c
@@ -28,6 +28,7 @@
#include "opcode/csky.h"
#include <assert.h>
#include "libiberty.h"
+#include "elf32-csky.h"
/* Data structures used for merging different arch variants.
V1 (510/610) and V2 (8xx) processors are incompatible, but
diff --git a/bfd/elf32-csky.h b/bfd/elf32-csky.h
new file mode 100644
index 0000000..2ca0749
--- /dev/null
+++ b/bfd/elf32-csky.h
@@ -0,0 +1,30 @@
+/* 32-bit ELF support for C-SKY.
+ 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 elf32_csky_build_stubs
+ (struct bfd_link_info *);
+extern bfd_boolean elf32_csky_size_stubs
+ (bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
+ struct bfd_section *(*) (const char*, struct bfd_section*),
+ void (*) (void));
+extern void elf32_csky_next_input_section
+ (struct bfd_link_info *, struct bfd_section *);
+extern int elf32_csky_setup_section_lists
+ (bfd *, struct bfd_link_info *);
diff --git a/ld/ChangeLog b/ld/ChangeLog
index eb7981e..56fc0a2 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2019-09-23 Alan Modra <amodra@gmail.com>
+
+ * emultempl/cskyelf.em: Include elf32-csky.h.
+
2019-09-22 Alan Modra <amodra@gmail.com>
* testsuite/ld-srec/sr3.cc (FOO_MSG_LEN): Set to 4.
diff --git a/ld/emultempl/cskyelf.em b/ld/emultempl/cskyelf.em
index 9184808..9215824 100644
--- a/ld/emultempl/cskyelf.em
+++ b/ld/emultempl/cskyelf.em
@@ -25,6 +25,7 @@ fragment <<EOF
#include "ldctor.h"
#include "elf/csky.h"
+#include "elf32-csky.h"
/* To use branch stub or not. */
extern bfd_boolean use_branch_stub;
More information about the Binutils-cvs
mailing list