This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH] bfd: Move elf-properties.lo to BFD32_LIBS
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: binutils at sourceware dot org
- Date: Fri, 10 Aug 2018 10:05:50 -0700
- Subject: [PATCH] bfd: Move elf-properties.lo to BFD32_LIBS
commit 6404ab993797d1d6cd3d9e97cc281e3cb6226c12
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed Aug 8 21:00:04 2018 -0700
Convert .note.gnu.property section between ELF32 and ELF64
updated bfd_convert_section_size and bfd_convert_section_contents
in bfd.c to call _bfd_elf_convert_gnu_property_size and
_bfd_elf_convert_gnu_properties, which are defined in elf-properties.c.
It led to
bfd.c:2484: undefined reference to `_bfd_elf_convert_gnu_property_size'
for non-ELF targets. Since elf-properties.c is a generic implementation
and doesn't reference any ELF specific functions directly, this patch
moves elf-properties.lo BFD32_LIBS.
Tested for many ELF and non-ELF targets.
PR binutils/23494
* Makefile.am (BFD32_LIBS): Add elf-properties.lo.
(BFD32_LIBS_CFILES): Add elf-properties.c.
(BFD32_BACKENDS): Remove elf-properties.lo.
(BFD32_BACKENDS_CFILES): Remove elf-properties.c.
* configure.ac (elf): Remove elf-properties.lo.
* Makefile.in: Regenerated.
* configure: Likewise.
---
bfd/Makefile.am | 12 +++++-------
bfd/Makefile.in | 21 ++++++++++-----------
bfd/configure | 4 ++--
bfd/configure.ac | 4 ++--
4 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 9c299df8d8..2626ceb0a5 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -70,17 +70,17 @@ BFD_H = bfd.h
# need two copies of the executable, one to download and one for the
# debugger).
BFD32_LIBS = \
- archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo \
- cache.lo coff-bfd.lo compress.lo corefile.lo format.lo hash.lo \
- init.lo libbfd.lo linker.lo merge.lo opncls.lo reloc.lo \
+ archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo cache.lo \
+ coff-bfd.lo compress.lo corefile.lo elf-properties.lo format.lo \
+ hash.lo init.lo libbfd.lo linker.lo merge.lo opncls.lo reloc.lo \
section.lo simple.lo stab-syms.lo stabs.lo syms.lo targets.lo \
binary.lo ihex.lo srec.lo tekhex.lo verilog.lo
BFD64_LIBS = archive64.lo
BFD32_LIBS_CFILES = \
- archive.c archures.c bfd.c bfdio.c bfdwin.c \
- cache.c coff-bfd.c compress.c corefile.c format.c hash.c \
+ archive.c archures.c bfd.c bfdio.c bfdwin.c cache.c coff-bfd.c \
+ compress.c corefile.c elf-properties.c format.c hash.c \
init.c libbfd.c linker.c merge.c opncls.c reloc.c \
section.c simple.c stab-syms.c stabs.c syms.c targets.c \
binary.c ihex.c srec.c tekhex.c verilog.c
@@ -293,7 +293,6 @@ BFD32_BACKENDS = \
elf-m10200.lo \
elf-m10300.lo \
elf-nacl.lo \
- elf-properties.lo \
elf-strtab.lo \
elf-vxworks.lo \
elf.lo \
@@ -431,7 +430,6 @@ BFD32_BACKENDS_CFILES = \
elf-m10200.c \
elf-m10300.c \
elf-nacl.c \
- elf-properties.c \
elf-strtab.c \
elf-vxworks.c \
elf.c \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index c1c02924c5..e63d63ab9e 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -182,10 +182,11 @@ am__installdirs = "$(DESTDIR)$(bfdlibdir)" \
LTLIBRARIES = $(bfdlib_LTLIBRARIES) $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
am__objects_1 = archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo \
- cache.lo coff-bfd.lo compress.lo corefile.lo format.lo hash.lo \
- init.lo libbfd.lo linker.lo merge.lo opncls.lo reloc.lo \
- section.lo simple.lo stab-syms.lo stabs.lo syms.lo targets.lo \
- binary.lo ihex.lo srec.lo tekhex.lo verilog.lo
+ cache.lo coff-bfd.lo compress.lo corefile.lo elf-properties.lo \
+ format.lo hash.lo init.lo libbfd.lo linker.lo merge.lo \
+ opncls.lo reloc.lo section.lo simple.lo stab-syms.lo stabs.lo \
+ syms.lo targets.lo binary.lo ihex.lo srec.lo tekhex.lo \
+ verilog.lo
am_libbfd_la_OBJECTS = $(am__objects_1)
libbfd_la_OBJECTS = $(am_libbfd_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -493,16 +494,16 @@ BFD_H = bfd.h
# need two copies of the executable, one to download and one for the
# debugger).
BFD32_LIBS = \
- archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo \
- cache.lo coff-bfd.lo compress.lo corefile.lo format.lo hash.lo \
- init.lo libbfd.lo linker.lo merge.lo opncls.lo reloc.lo \
+ archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo cache.lo \
+ coff-bfd.lo compress.lo corefile.lo elf-properties.lo format.lo \
+ hash.lo init.lo libbfd.lo linker.lo merge.lo opncls.lo reloc.lo \
section.lo simple.lo stab-syms.lo stabs.lo syms.lo targets.lo \
binary.lo ihex.lo srec.lo tekhex.lo verilog.lo
BFD64_LIBS = archive64.lo
BFD32_LIBS_CFILES = \
- archive.c archures.c bfd.c bfdio.c bfdwin.c \
- cache.c coff-bfd.c compress.c corefile.c format.c hash.c \
+ archive.c archures.c bfd.c bfdio.c bfdwin.c cache.c coff-bfd.c \
+ compress.c corefile.c elf-properties.c format.c hash.c \
init.c libbfd.c linker.c merge.c opncls.c reloc.c \
section.c simple.c stab-syms.c stabs.c syms.c targets.c \
binary.c ihex.c srec.c tekhex.c verilog.c
@@ -716,7 +717,6 @@ BFD32_BACKENDS = \
elf-m10200.lo \
elf-m10300.lo \
elf-nacl.lo \
- elf-properties.lo \
elf-strtab.lo \
elf-vxworks.lo \
elf.lo \
@@ -854,7 +854,6 @@ BFD32_BACKENDS_CFILES = \
elf-m10200.c \
elf-m10300.c \
elf-nacl.c \
- elf-properties.c \
elf-strtab.c \
elf-vxworks.c \
elf.c \
diff --git a/bfd/configure b/bfd/configure
index 2ba044d786..8c83a6a08e 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -14637,8 +14637,8 @@ selarchs="$f"
# Target backend .o files.
tb=
-elf="elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-properties.lo
- elf-eh-frame.lo dwarf1.lo dwarf2.lo"
+elf="elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-eh-frame.lo
+ dwarf1.lo dwarf2.lo"
coffgen="coffgen.lo dwarf2.lo"
coff="cofflink.lo $coffgen"
ecoff="ecofflink.lo $coffgen"
diff --git a/bfd/configure.ac b/bfd/configure.ac
index fc4331c617..787ac7fa65 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -405,8 +405,8 @@ selarchs="$f"
# Target backend .o files.
tb=
-elf="elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-properties.lo
- elf-eh-frame.lo dwarf1.lo dwarf2.lo"
+elf="elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-eh-frame.lo
+ dwarf1.lo dwarf2.lo"
coffgen="coffgen.lo dwarf2.lo"
coff="cofflink.lo $coffgen"
ecoff="ecofflink.lo $coffgen"
--
2.17.1