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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 750f88df6e2063abdfb678a0caf9edd722297d9d..549211560f843e5033f0c18669393fef858765eb 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+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)

diff --git a/bfd/mach-o-target.c b/bfd/mach-o-target.c
index 00bd586c97aab8e6258d5f52c79adf35c48d59f8..36d0758f130f435be639ac7c665b81462894282b 100644 (file)
--- 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 c0cead740f195e067c4687ee5d7cca6822657c7c..4de1528597a85934d506598072f22164fafa3ce3 100644 (file)
--- 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 47b1bc56a5fa062e76b51792933741d238dc1c8a..a2bb60b2fdd2f68c44e5ab8b14d3af67c3a1e5e6 100644 (file)
--- 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 **);