libjava.exp (libjava_init): Recognize multilib directory names containing underscores.

gcc/testsuite:
2006-04-10  Matthias Klose  <doko@debian.org>

	* testsuite/lib/libjava.exp (libjava_init): Recognize multilib
	directory names containing underscores.

libffi:
2006-04-10  Matthias Klose  <doko@debian.org>

	* testsuite/lib/libjava.exp (libjava_init): Recognize multilib
	directory names containing underscores.

libgomp:
2006-04-10  Matthias Klose  <doko@debian.org>

	* testsuite/lib/libjava.exp (libjava_init): Recognize multilib
	directory names containing underscores.

libjava:
2006-04-10  Matthias Klose  <doko@debian.org>

	* testsuite/lib/libjava.exp (libjava_init): Recognize multilib
	directory names containing underscores.

libmudflap:
2006-04-10  Matthias Klose  <doko@debian.org>

	* testsuite/lib/libjava.exp (libjava_init): Recognize multilib
	directory names containing underscores.

libstdc++:
2006-04-10  Matthias Klose  <doko@debian.org>

	* testsuite/lib/libjava.exp (libjava_init): Recognize multilib
	directory names containing underscores.

From-SVN: r112833

gcc/testsuite/ChangeLog

+2006-04-10  Matthias Klose  <doko@debian.org>
+
+	* testsuite/lib/gcc-defs.exp (gcc-set-multilib-library-path):
+	Recognize multilib directory names containing underscores.
+
 2006-04-10  Roger Sayle  <roger@eyesopen.com>
 
 	* gcc.target/i386/vecinit-1.c: New test case.

gcc/testsuite/lib/gcc-defs.exp

@@ -238,7 +238,7 @@ proc gcc-set-multilib-library-path { compiler } {
     if { [is_remote host] == 0 && [which $compiler] != 0 } {
 	foreach i "[exec $compiler --print-multi-lib]" {
 	    set mldir ""
-	    regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+	    regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 	    set mldir [string trimright $mldir "\;@"]
 	    if { "$mldir" == "." } {
 		continue

libffi/ChangeLog

+2006-04-10  Matthias Klose  <doko@debian.org>
+
+	* testsuite/lib/libffi-dg.exp (libffi-init): Recognize multilib
+	directory names containing underscores.
+
 2006-04-07  James E Wilson  <wilson@specifix.com>
 
 	* testsuite/libffi.call/float4.c: New testcase.

libffi/testsuite/lib/libffi-dg.exp

@@ -120,7 +120,7 @@ proc libffi-init { args } {
     if { [is_remote host] == 0 && [which $compiler] != 0 } {
 	foreach i "[exec $compiler --print-multi-lib]" {
 	    set mldir ""
-	    regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+	    regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 	    set mldir [string trimright $mldir "\;@"]
 	    if { "$mldir" == "." } {
 		continue

libgomp/ChangeLog

+2006-04-10  Matthias Klose  <doko@debian.org>
+
+	* testsuite/lib/libgomp.exp (libgomp_init): Recognize multilib
+	directory names containing underscores.
+
 2006-03-21  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/26691

libgomp/testsuite/lib/libgomp-dg.exp

@@ -107,7 +107,7 @@ proc libgomp_init { args } {
 	if { [is_remote host] == 0 && [which $compiler] != 0 } {
 	  foreach i "[exec $compiler --print-multi-lib]" {
 	    set mldir ""
-	    regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+	    regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 	    set mldir [string trimright $mldir "\;@"]
 	    if { "$mldir" == "." } {
 	      continue

libjava/ChangeLog

+2006-04-10  Matthias Klose  <doko@debian.org>
+
+	* testsuite/lib/libjava.exp (libjava_init): Recognize multilib
+	directory names containing underscores.
+
 2006-04-10  Andrew Haley  <aph@redhat.com>
 
 	* include/x86_64-signal.h (HANDLE_DIVIDE_OVERFLOW): New.

libjava/testsuite/lib/libjava.exp

@@ -212,7 +212,7 @@ proc libjava_init { args } {
 	if { [is_remote host] == 0 && [which $compiler] != 0 } {
 	    foreach i "[exec $compiler --print-multi-lib]" {
 		set mldir ""
-		regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+		regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 		set mldir [string trimright $mldir "\;@"]
 		if { "$mldir" == "." } {
 		    continue

libmudflap/ChangeLog

+2006-04-10  Matthias Klose  <doko@debian.org>
+
+	* testsuite/lib/libmudflap.exp (libmudflap-init): Recognize multilib
+	directory names containing underscores.
+
 2005-11-22  Janis Johnson  <janis187@us.ibm.com>
 
 	* testsuite/lib/libmudflap.exp (libmudflap-init): Remove -static from

libmudflap/testsuite/lib/libmudflap.exp

@@ -69,7 +69,7 @@ proc libmudflap-init { language } {
     if {[is_remote host] == 0} {
 	foreach i "[exec ${gccdir}/xgcc --print-multi-lib]" {
 	    set mldir ""
-	    regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+	    regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 	    set mldir [string trimright $mldir "\;@"]
 	    if { "$mldir" == "." } {
 		continue

libstdc++-v3/ChangeLog

+2006-04-10  Matthias Klose  <doko@debian.org>
+
+	* testsuite/lib/libstdc++.exp (libstdc++_init): Recognize multilib
+	directory names containing underscores.
+
 2006-04-10  Paolo Carlini  <pcarlini@suse.de>
 
 	DR 538, [Ready]

libstdc++-v3/testsuite/lib/libstdc++.exp

@@ -150,7 +150,7 @@ proc libstdc++_init { testfile } {
 	if { [is_remote host] == 0 && [which $compiler] != 0 } {
 	  foreach i "[exec $compiler --print-multi-lib]" {
 	    set mldir ""
-	    regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+	    regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 	    set mldir [string trimright $mldir "\;@"]
 	    if { "$mldir" == "." } {
 	      continue