This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Change _bfd_elf_link_setup_gnu_properties to bfd *
- From: H.J.Lu <hjl at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 27 Apr 2017 16:09:04 -0000
- Subject: [binutils-gdb] Change _bfd_elf_link_setup_gnu_properties to bfd *
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fba37edd96c8dc65a63bd5b4fef5366de45b165a
commit fba37edd96c8dc65a63bd5b4fef5366de45b165a
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Apr 27 09:07:23 2017 -0700
Change _bfd_elf_link_setup_gnu_properties to bfd *
Change setup_gnu_properties to return the first relocatable ELF input
with GNU properties so that a backend can make decision based on GNU
properties.
* elf-bfd.h (elf_backend_data): Change setup_gnu_properties
to return bfd *.
(_bfd_elf_link_setup_gnu_properties): Return bfd *.
* elf-properties.c (_bfd_elf_link_setup_gnu_properties): Return
the first relocatable ELF input with GNU properties.
Diff:
---
bfd/ChangeLog | 8 ++++++++
bfd/elf-bfd.h | 4 ++--
bfd/elf-properties.c | 11 +++++++----
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5f8f67c..e036de5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,13 @@
2017-04-27 H.J. Lu <hongjiu.lu@intel.com>
+ * elf-bfd.h (elf_backend_data): Change setup_gnu_properties
+ to return bfd *.
+ (_bfd_elf_link_setup_gnu_properties): Return bfd *.
+ * elf-properties.c (_bfd_elf_link_setup_gnu_properties): Return
+ the first relocatable ELF input with GNU properties.
+
+2017-04-27 H.J. Lu <hongjiu.lu@intel.com>
+
* elf32-i386.c (elf_i386_finish_dynamic_sections): Simplify
VxWorks for non-PIC.
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index 79f87b2..4110ace 100644
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -1441,7 +1441,7 @@ struct elf_backend_data
elf_property *);
/* Set up GNU properties. */
- void (*setup_gnu_properties) (struct bfd_link_info *);
+ bfd *(*setup_gnu_properties) (struct bfd_link_info *);
/* Encoding used for compact EH tables. */
int (*compact_eh_encoding) (struct bfd_link_info *);
@@ -2607,7 +2607,7 @@ extern bfd_boolean _bfd_elf_parse_gnu_properties
(bfd *, Elf_Internal_Note *);
extern elf_property * _bfd_elf_get_property
(bfd *, unsigned int, unsigned int);
-extern void _bfd_elf_link_setup_gnu_properties
+extern bfd *_bfd_elf_link_setup_gnu_properties
(struct bfd_link_info *);
/* The linker may need to keep track of the number of relocs that it
diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c
index 048ea9c..fda8875 100644
--- a/bfd/elf-properties.c
+++ b/bfd/elf-properties.c
@@ -299,9 +299,10 @@ elf_merge_gnu_property_list (bfd *abfd, elf_property_list **listp)
}
}
-/* Set up GNU properties. */
+/* Set up GNU properties. Return the first relocatable ELF input with
+ GNU properties if found. Otherwise, return NULL. */
-void
+bfd *
_bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info)
{
bfd *abfd, *first_pbfd = NULL;
@@ -336,7 +337,7 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info)
/* Do nothing if there is no .note.gnu.property section. */
if (!has_properties)
- return;
+ return NULL;
/* Merge .note.gnu.property sections. */
for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link.next)
@@ -411,7 +412,7 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info)
/* Discard .note.gnu.property section if all properties have
been removed. */
sec->output_section = bfd_abs_section_ptr;
- return;
+ return NULL;
}
/* Compute the section size. */
@@ -488,4 +489,6 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info)
/* Cache the section contents for elf_link_input_bfd. */
elf_section_data (sec)->this_hdr.contents = contents;
}
+
+ return first_pbfd;
}