powerpc max-page-size vs __QNXTARGET__

[deliverable/binutils-gdb.git] / bfd / aoutf1.h

diff --git a/bfd/aoutf1.h b/bfd/aoutf1.h
index 97e122b8e8ccb014fec20b6bd272369ca1d8fc3c..b039d6aea8b0852b8662774188987c89cac47599 100644 (file)
--- a/bfd/aoutf1.h
+++ b/bfd/aoutf1.h
@@ -1,5 +1,5 @@
 /* A.out "format 1" file handling code for BFD.
-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2018 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -75,8 +75,9 @@
 #define MY_bfd_merge_private_bfd_data sunos_merge_private_bfd_data
 
 static bfd_boolean
-sunos_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+sunos_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
 {
+  bfd *obfd = info->output_bfd;
   if (bfd_get_flavour (ibfd) != bfd_target_aout_flavour
       || bfd_get_flavour (obfd) != bfd_target_aout_flavour)
     return TRUE;
@@ -774,13 +775,13 @@ static const struct aout_backend_data sunos4_aout_backend =
   MY_finish_dynamic_link
 };
 \f
-#define        MY_core_file_failing_command    sunos4_core_file_failing_command
+#define        MY_core_file_failing_command    sunos4_core_file_failing_command
 #define        MY_core_file_failing_signal     sunos4_core_file_failing_signal
 #define        MY_core_file_matches_executable_p sunos4_core_file_matches_executable_p
 
-#define MY_bfd_debug_info_start                bfd_void
-#define MY_bfd_debug_info_end          bfd_void
-#define MY_bfd_debug_info_accumulate   (void (*) (bfd *, struct bfd_section *)) bfd_void
+#define MY_bfd_debug_info_start                _bfd_void_bfd
+#define MY_bfd_debug_info_end          _bfd_void_bfd
+#define MY_bfd_debug_info_accumulate   _bfd_void_bfd_asection
 #define MY_core_file_p                 sunos4_core_file_p
 #define MY_write_object_contents       NAME(aout, sunos4_write_object_contents)
 #define MY_backend_data                        & sunos4_aout_backend