From 967b2c539ac8232a7922ed303106d1e5fde120d7 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 9 Apr 2014 10:16:39 +0200 Subject: [PATCH] mach-o: Define copy_private_header instead of copy_private_bfd. bfd/ * 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. --- bfd/ChangeLog | 7 +++++++ bfd/mach-o-target.c | 2 +- bfd/mach-o.c | 2 +- bfd/mach-o.h | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 750f88df6e2..549211560f8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2014-04-18 Tristan Gingold + + * 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 * mach-o.h (bfd_mach_o_dylinker_command) diff --git a/bfd/mach-o-target.c b/bfd/mach-o-target.c index 00bd586c97a..36d0758f130 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 c0cead740f1..4de1528597a 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 47b1bc56a5f..a2bb60b2fdd 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 **); -- 2.30.2