This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
xcoff binutils testsuite failures
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Date: Fri, 10 Dec 2010 19:13:43 +1030
- Subject: xcoff binutils testsuite failures
The --target support addition to ar broke a number of xcoff tests, due
to the silly "target ignored" messages.
FAIL: ar symbol table
FAIL: ar thin archive
FAIL: ar thin archive with nested archive
FAIL: ar argument parsing
FAIL: Build libentry.a
This patch rewrites emul_aix.c to avoid all the target nonsense,
removing the above fails. Note that passing the thin archive tests
doesn't mean thin archives actually work. :-(
* binemul.h (do_ar_emul_append): Declare.
* binemul.c (any_ok): New function.
(do_ar_emul_append): Rename from do_ar_emul_default_append. Make
global, add check arg. Adjust callers.
(ar_emul_default_replace): Tidy.
* configure.tgt (powerpc-*-aix[5-9]*,rs6000-*-aix[5-9]*): Use
bin_aix_emulation.
* emul_aix.c (bin_aix5_emulation, ar_emul_aix_internal): Delete.
(ar_emul_aix5_append, ar_emul_aix5_replace): Delete.
(check_aix): New function.
(ar_emul_aix_append, ar_emul_aix_replace): Rewrite.
Index: binutils/binemul.c
===================================================================
RCS file: /cvs/src/src/binutils/binemul.c,v
retrieving revision 1.13
diff -u -p -r1.13 binemul.c
--- binutils/binemul.c 15 Sep 2010 17:10:15 -0000 1.13
+++ binutils/binemul.c 9 Dec 2010 14:12:12 -0000
@@ -50,9 +50,16 @@ ar_emul_append (bfd **after_bfd, char *f
}
static bfd_boolean
-do_ar_emul_default_append (bfd **after_bfd, bfd *new_bfd,
- bfd_boolean verbose, bfd_boolean flatten)
- {
+any_ok (bfd *new_bfd ATTRIBUTE_UNUSED)
+{
+ return TRUE;
+}
+
+bfd_boolean
+do_ar_emul_append (bfd **after_bfd, bfd *new_bfd,
+ bfd_boolean verbose, bfd_boolean flatten,
+ bfd_boolean (*check) (bfd *))
+{
/* When flattening, add the members of an archive instead of the
archive itself. */
if (flatten && bfd_check_format (new_bfd, bfd_archive))
@@ -64,7 +71,7 @@ do_ar_emul_default_append (bfd **after_b
elt;
elt = bfd_openr_next_archived_file (new_bfd, elt))
{
- if (do_ar_emul_default_append (after_bfd, elt, verbose, TRUE))
+ if (do_ar_emul_append (after_bfd, elt, verbose, TRUE, check))
{
added = TRUE;
after_bfd = &((*after_bfd)->archive_next);
@@ -74,6 +81,9 @@ do_ar_emul_default_append (bfd **after_b
return added;
}
+ if (!check (new_bfd))
+ return FALSE;
+
AR_EMUL_APPEND_PRINT_VERBOSE (verbose, new_bfd->filename);
new_bfd->archive_next = *after_bfd;
@@ -91,7 +101,7 @@ ar_emul_default_append (bfd **after_bfd,
new_bfd = bfd_openr (file_name, target);
AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);
- return do_ar_emul_default_append (after_bfd, new_bfd, verbose, flatten);
+ return do_ar_emul_append (after_bfd, new_bfd, verbose, flatten, any_ok);
}
bfd_boolean
@@ -109,15 +119,15 @@ bfd_boolean
ar_emul_default_replace (bfd **after_bfd, char *file_name,
const char *target, bfd_boolean verbose)
{
- bfd *temp;
+ bfd *new_bfd;
- temp = *after_bfd;
- *after_bfd = bfd_openr (file_name, target);
+ new_bfd = bfd_openr (file_name, target);
+ AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);
- AR_EMUL_ELEMENT_CHECK (*after_bfd, file_name);
AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name);
- (*after_bfd)->archive_next = temp;
+ new_bfd->archive_next = *after_bfd;
+ *after_bfd = new_bfd;
return TRUE;
}
Index: binutils/binemul.h
===================================================================
RCS file: /cvs/src/src/binutils/binemul.h,v
retrieving revision 1.12
diff -u -p -r1.12 binemul.h
--- binutils/binemul.h 15 Sep 2010 17:10:15 -0000 1.12
+++ binutils/binemul.h 9 Dec 2010 14:12:12 -0000
@@ -32,6 +32,9 @@ extern bfd_boolean ar_emul_append (bfd *
bfd_boolean, bfd_boolean);
extern bfd_boolean ar_emul_default_append (bfd **, char *, const char *,
bfd_boolean, bfd_boolean);
+extern bfd_boolean do_ar_emul_append (bfd **, bfd *,
+ bfd_boolean, bfd_boolean,
+ bfd_boolean (*)(bfd *));
extern bfd_boolean ar_emul_replace (bfd **, char *, const char *,
bfd_boolean);
extern bfd_boolean ar_emul_default_replace (bfd **, char *,
Index: binutils/configure.tgt
===================================================================
RCS file: /cvs/src/src/binutils/configure.tgt,v
retrieving revision 1.2
diff -u -p -r1.2 configure.tgt
--- binutils/configure.tgt 14 Mar 2009 09:11:38 -0000 1.2
+++ binutils/configure.tgt 9 Dec 2010 14:12:12 -0000
@@ -11,7 +11,7 @@
case "${targ}" in
powerpc-*-aix[5-9]* | rs6000-*-aix[5-9]*)
targ_emul=aix
- targ_emul_vector=bin_aix5_emulation
+ targ_emul_vector=bin_aix_emulation
;;
powerpc-*-aix4.3* | rs6000-*-aix4.3*)
Index: binutils/emul_aix.c
===================================================================
RCS file: /cvs/src/src/binutils/emul_aix.c,v
retrieving revision 1.14
diff -u -p -d -r1.14 emul_aix.c
--- binutils/emul_aix.c 18 Sep 2010 00:42:25 -0000 1.14
+++ binutils/emul_aix.c 9 Dec 2010 14:29:50 -0000
@@ -27,6 +27,7 @@
#include "libxcoff.h"
/* Default to <bigaf>. */
+/* FIXME: write only variable. */
static bfd_boolean big_archive = TRUE;
/* Whether to include 32 bit objects. */
@@ -47,88 +49,54 @@ ar_emul_aix_usage (FILE *fp)
}
static bfd_boolean
-ar_emul_aix_internal (bfd ** after_bfd,
- char * file_name,
- bfd_boolean verbose,
- const char * target_name,
- bfd_boolean is_append,
- bfd_boolean flatten ATTRIBUTE_UNUSED)
+check_aix (bfd *try_bfd)
{
- bfd *temp;
- bfd *try_bfd;
-
- temp = *after_bfd;
-
- /* Try 64 bit. */
- try_bfd = bfd_openr (file_name, target_name);
-
- /* Failed or the object is possibly 32 bit. */
- if (NULL == try_bfd || ! bfd_check_format (try_bfd, bfd_object))
- try_bfd = bfd_openr (file_name, "aixcoff-rs6000");
-
- AR_EMUL_ELEMENT_CHECK (try_bfd, file_name);
-
- if (bfd_xcoff_is_xcoff64 (try_bfd) && (! X64))
- return FALSE;
-
- if (bfd_xcoff_is_xcoff32 (try_bfd)
- && bfd_check_format (try_bfd, bfd_object) && (! X32))
- return FALSE;
+ extern const bfd_target rs6000coff_vec;
+ extern const bfd_target rs6000coff64_vec;
+ extern const bfd_target aix5coff64_vec;
- if (is_append)
- {
- AR_EMUL_APPEND_PRINT_VERBOSE (verbose, file_name);
- }
- else
+ if (bfd_check_format (try_bfd, bfd_object))
{
- AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name);
- }
-
- *after_bfd = try_bfd;
- (*after_bfd)->archive_next = temp;
+ if (!X32 && try_bfd->xvec == &rs6000coff_vec)
+ return FALSE;
+ if (!X64 && (try_bfd->xvec == &rs6000coff64_vec
+ || try_bfd->xvec == &aix5coff64_vec))
+ return FALSE;
+ }
return TRUE;
}
-
static bfd_boolean
ar_emul_aix_append (bfd **after_bfd, char *file_name, const char *target,
bfd_boolean verbose, bfd_boolean flatten)
{
- if (target)
- non_fatal (_("target `%s' ignored."), target);
- return ar_emul_aix_internal (after_bfd, file_name, verbose,
- "aixcoff64-rs6000", TRUE, flatten);
-}
+ bfd *new_bfd;
-static bfd_boolean
-ar_emul_aix5_append (bfd **after_bfd, char *file_name, const char *target,
- bfd_boolean verbose, bfd_boolean flatten)
-{
- if (target)
- non_fatal (_("target `%s' ignored."), target);
- return ar_emul_aix_internal (after_bfd, file_name, verbose,
- "aix5coff64-rs6000", TRUE, flatten);
+ new_bfd = bfd_openr (file_name, target);
+ AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);
+
+ return do_ar_emul_append (after_bfd, new_bfd, verbose, flatten, check_aix);
}
static bfd_boolean
ar_emul_aix_replace (bfd **after_bfd, char *file_name, const char *target,
bfd_boolean verbose)
{
- if (target)
- non_fatal (_("target `%s' ignored."), target);
- return ar_emul_aix_internal (after_bfd, file_name, verbose,
- "aixcoff64-rs6000", FALSE, FALSE);
-}
+ bfd *new_bfd;
-static bfd_boolean
-ar_emul_aix5_replace (bfd **after_bfd, char *file_name,
- const char *target, bfd_boolean verbose)
-{
- if (target)
- non_fatal (_("target `%s' ignored."), target);
- return ar_emul_aix_internal (after_bfd, file_name, verbose,
- "aix5coff64-rs6000", FALSE, FALSE);
+ new_bfd = bfd_openr (file_name, target);
+ AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);
+
+ if (!check_aix (new_bfd))
+ return FALSE;
+
+ AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name);
+
+ new_bfd->archive_next = *after_bfd;
+ *after_bfd = new_bfd;
+
+ return TRUE;
}
static bfd_boolean
@@ -171,11 +139,3 @@ struct bin_emulation_xfer_struct bin_aix
ar_emul_aix_replace,
ar_emul_aix_parse_arg,
};
-
-struct bin_emulation_xfer_struct bin_aix5_emulation =
-{
- ar_emul_aix_usage,
- ar_emul_aix5_append,
- ar_emul_aix5_replace,
- ar_emul_aix_parse_arg,
-};
--
Alan Modra
Australia Development Lab, IBM