aboutsummaryrefslogtreecommitdiff
path: root/bfd/elf-bfd.h
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-06-12 07:37:15 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-06-12 07:37:56 -0700
commit5c3ce2bc8adea307917d3bfeef53114795764db6 (patch)
treea3481bc43858592cf3fd95099928cf454f61ecc5 /bfd/elf-bfd.h
parent3704e3589d3d187fbf76e688388b1a92fd627c8d (diff)
downloadgdb-5c3ce2bc8adea307917d3bfeef53114795764db6.zip
gdb-5c3ce2bc8adea307917d3bfeef53114795764db6.tar.gz
gdb-5c3ce2bc8adea307917d3bfeef53114795764db6.tar.bz2
ELF: Pass bfd_link_info to merge_gnu_properties
Pass struct bfd_link_info * to merge_gnu_properties to give backend control of how GNU properties are merged based on linker command line options. * elf-bfd.h (elf_backend_data): Add struct bfd_link_info * to merge_gnu_properties. * elf-properties.c (elf_merge_gnu_properties): Add struct bfd_link_info * and pass it to merge_gnu_properties. (elf_merge_gnu_property_list): Add struct bfd_link_info * and pass it to elf_merge_gnu_properties. (_bfd_elf_link_setup_gnu_properties): Pass info to elf_merge_gnu_property_list. * elf32-i386.c (elf_i386_merge_gnu_properties): Add struct bfd_link_info *. * elf64-x86-64.c (elf_x86_64_merge_gnu_properties): Likewise.
Diffstat (limited to 'bfd/elf-bfd.h')
-rw-r--r--bfd/elf-bfd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index 820bc98..567b63a 100644
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -1437,8 +1437,8 @@ struct elf_backend_data
unsigned int);
/* Merge GNU properties. Return TRUE if property is updated. */
- bfd_boolean (*merge_gnu_properties) (bfd *, elf_property *,
- elf_property *);
+ bfd_boolean (*merge_gnu_properties) (struct bfd_link_info *, bfd *,
+ elf_property *, elf_property *);
/* Set up GNU properties. */
bfd *(*setup_gnu_properties) (struct bfd_link_info *);