diff options
| -rw-r--r-- | bfd/ChangeLog | 11 | ||||
| -rw-r--r-- | bfd/aix5ppc-core.c | 21 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 3 | ||||
| -rw-r--r-- | bfd/corefile.c | 2 | ||||
| -rw-r--r-- | bfd/libbfd-in.h | 6 | ||||
| -rw-r--r-- | bfd/libbfd.h | 6 |
6 files changed, 26 insertions, 23 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 521d51b..f77f116 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,14 @@ +2005-12-24 Alan Modra <amodra@bigpond.net.au> + + * aix5ppc-core.c: Remove duplicate prototypes. + (xcoff64_core_file_matches_executable_p): Provide implementation + for !AIX_5_CORE. + * corefile.c (generic_core_file_matches_executable_p): Correct + syntax error in prototype. + * libbfd-in.h (generic_core_file_matches_executable_p): Delete. + * libbfd.h: Regenerate. + * bfd-in2.h: Regenerate. + 2005-12-23 Michael Weiser <michael@weiser.dinsnail.net> PR 1150 diff --git a/bfd/aix5ppc-core.c b/bfd/aix5ppc-core.c index ff58bf3..ee2a223 100644 --- a/bfd/aix5ppc-core.c +++ b/bfd/aix5ppc-core.c @@ -23,16 +23,16 @@ #include "bfd.h" -#ifdef AIX_5_CORE - -#include "sysdep.h" -#include "libbfd.h" - const bfd_target *xcoff64_core_p (bfd *); bfd_boolean xcoff64_core_file_matches_executable_p (bfd *, bfd *); char *xcoff64_core_file_failing_command (bfd *); int xcoff64_core_file_failing_signal (bfd *); +#ifdef AIX_5_CORE + +#include "sysdep.h" +#include "libbfd.h" + /* Aix 5.1 system include file. */ /* Need to define this macro so struct ld_info64 get included. */ @@ -318,11 +318,6 @@ xcoff64_core_file_failing_signal (bfd *abfd) #else /* AIX_5_CORE */ -const bfd_target *xcoff64_core_p (bfd *); -#define xcoff64_core_file_matches_executable_p generic_core_file_matches_executable_p -char *xcoff64_core_file_failing_command (bfd *); -int xcoff64_core_file_failing_signal (bfd *); - const bfd_target * xcoff64_core_p (bfd *abfd ATTRIBUTE_UNUSED) { @@ -330,6 +325,12 @@ xcoff64_core_p (bfd *abfd ATTRIBUTE_UNUSED) return 0; } +bfd_boolean +xcoff64_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd) +{ + return generic_core_file_matches_executable_p (core_bfd, exec_bfd); +} + char * xcoff64_core_file_failing_command (bfd *abfd ATTRIBUTE_UNUSED) { diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 0045345..3cf72f3 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -4637,6 +4637,9 @@ int bfd_core_file_failing_signal (bfd *abfd); bfd_boolean core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd); +bfd_boolean generic_core_file_matches_executable_p + (bfd *core_bfd, bfd *exec_bfd); + /* Extracted from targets.c. */ #define BFD_SEND(bfd, message, arglist) \ ((*((bfd)->xvec->message)) arglist) diff --git a/bfd/corefile.c b/bfd/corefile.c index aaf888bc..ce2c489 100644 --- a/bfd/corefile.c +++ b/bfd/corefile.c @@ -114,7 +114,7 @@ FUNCTION SYNOPSIS bfd_boolean generic_core_file_matches_executable_p - (bfd *core_bfd, bfd *exec_bfd) + (bfd *core_bfd, bfd *exec_bfd); DESCRIPTION Return TRUE if the core file attached to @var{core_bfd} diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index c838d90..e3468c1 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -247,12 +247,6 @@ extern int _bfd_nocore_core_file_failing_signal extern bfd_boolean _bfd_nocore_core_file_matches_executable_p (bfd *, bfd *); -/* A generic implementation of CORE_FILE_MATCHES_EXECUTABLE_P that - is independent of the target. */ - -extern bfd_boolean generic_core_file_matches_executable_p - (bfd *core_bfd, bfd *exec_bfd); - /* Routines to use for BFD_JUMP_TABLE_ARCHIVE when there is no archive file support. Use BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive). */ diff --git a/bfd/libbfd.h b/bfd/libbfd.h index 48a8b9b..5a8c216 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -252,12 +252,6 @@ extern int _bfd_nocore_core_file_failing_signal extern bfd_boolean _bfd_nocore_core_file_matches_executable_p (bfd *, bfd *); -/* A generic implementation of CORE_FILE_MATCHES_EXECUTABLE_P that - is independent of the target. */ - -extern bfd_boolean generic_core_file_matches_executable_p - (bfd *core_bfd, bfd *exec_bfd); - /* Routines to use for BFD_JUMP_TABLE_ARCHIVE when there is no archive file support. Use BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive). */ |