2002-04-07 Elena Zannoni <ezannoni@redhat.com>

        Work around for PR gdb/285:
	* gdb.asm/asm-source.exp: Bail out if multilibs are detected.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3fe54a0452846e06f2d9d14caf7035caa418806f..4cca82dd269739f55f77d7ad3591d65a6d04c084 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-07  Elena Zannoni  <ezannoni@redhat.com>
+
+        Work around for PR gdb/285:
+       * gdb.asm/asm-source.exp: Bail out if multilibs are detected.
+
 2002-04-07  Elena Zannoni  <ezannoni@redhat.com>
 
        * gdb.asm/asm-source.exp: Build symbolic link to arch specific

diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
index 04a1acd5df1dc6aafd79b9ed46503799f125fbae..11ced2970e00c8ea27e5c4af94756ddca8c4b1bc 100644 (file)
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ b/gdb/testsuite/gdb.asm/asm-source.exp
@@ -67,6 +67,21 @@ if { "${asm-arch}" == "" } {
     gdb_suppress_entire_file "Assembly source test -- not implemented for this target."
 }
 
+# Watch out, we are invoking the assembler, but the testsuite sets multilib
+# switches according to compiler syntax.  If we pass these options straight
+# to the assembler, they won't always make sense.  If we don't pass them to
+# the assembler, the final link will complain that the object files were
+# built with different defaults.  So no matter what we do, we lose.  We may as
+# well get out of this test sooner rather than later.
+set dest [target_info name]
+if [board_info $dest exists multilib_flags] {
+       set multilib_flags [board_info $dest multilib_flags]
+       if { "${multilib_flags}" != "" } {
+          gdb_suppress_entire_file "Assembly source test -- multilibs not supported by this test."
+          return;
+        }
+}
+
 set testfile "asm-source"
 set binfile ${objdir}/${subdir}/${testfile}
 set src1 ${srcdir}/${subdir}/asmsrc1.s