aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/mach-o-target.c2
-rw-r--r--bfd/mach-o.c2
-rw-r--r--bfd/mach-o.h2
4 files changed, 10 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 750f88d..5492115 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,12 @@
2014-04-18 Tristan Gingold <gingold@adacore.com>
+ * mach-o-target.c (bfd_mach_o_bfd_copy_private_header_data):
+ Define instead of bfd_mach_o_bfd_copy_private_bfd_data.
+ * mach-o.c (bfd_mach_o_bfd_copy_private_bfd_data): Rename.
+ * mach-o.h (bfd_mach_o_bfd_copy_private_bfd_data): Likewise.
+
+2014-04-18 Tristan Gingold <gingold@adacore.com>
+
* mach-o.h (bfd_mach_o_dylinker_command)
(bfd_mach_o_dylib_command, bfd_mach_o_fvmlib_command): Remove
name_len field.
diff --git a/bfd/mach-o-target.c b/bfd/mach-o-target.c
index 00bd586..36d0758 100644
--- a/bfd/mach-o-target.c
+++ b/bfd/mach-o-target.c
@@ -54,7 +54,7 @@
#define bfd_mach_o_bfd_discard_group bfd_generic_discard_group
#define bfd_mach_o_section_already_linked _bfd_generic_section_already_linked
#define bfd_mach_o_bfd_define_common_symbol bfd_generic_define_common_symbol
-#define bfd_mach_o_bfd_copy_private_header_data _bfd_generic_bfd_copy_private_header_data
+#define bfd_mach_o_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data
#define bfd_mach_o_core_file_matches_executable_p generic_core_file_matches_executable_p
#define bfd_mach_o_core_file_pid _bfd_nocore_core_file_pid
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index c0cead7..4de1528 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -575,7 +575,7 @@ bfd_mach_o_bfd_copy_private_section_data (bfd *ibfd ATTRIBUTE_UNUSED,
to the output bfd. */
bfd_boolean
-bfd_mach_o_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+bfd_mach_o_bfd_copy_private_header_data (bfd *ibfd, bfd *obfd)
{
if (bfd_get_flavour (ibfd) != bfd_target_mach_o_flavour
|| bfd_get_flavour (obfd) != bfd_target_mach_o_flavour)
diff --git a/bfd/mach-o.h b/bfd/mach-o.h
index 47b1bc5..a2bb60b 100644
--- a/bfd/mach-o.h
+++ b/bfd/mach-o.h
@@ -636,7 +636,7 @@ bfd_boolean bfd_mach_o_bfd_copy_private_symbol_data (bfd *, asymbol *,
bfd *, asymbol *);
bfd_boolean bfd_mach_o_bfd_copy_private_section_data (bfd *, asection *,
bfd *, asection *);
-bfd_boolean bfd_mach_o_bfd_copy_private_bfd_data (bfd *, bfd *);
+bfd_boolean bfd_mach_o_bfd_copy_private_header_data (bfd *, bfd *);
bfd_boolean bfd_mach_o_bfd_set_private_flags (bfd *, flagword);
long bfd_mach_o_get_symtab_upper_bound (bfd *);
long bfd_mach_o_canonicalize_symtab (bfd *, asymbol **);