From d35f63a92889677001f62f37b72754bc72160fb7 Mon Sep 17 00:00:00 2001
From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 10 Apr 2006 21:34:19 +0000
Subject: [PATCH] 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112833 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/lib/gcc-defs.exp | 2 +-
libffi/ChangeLog | 5 +++++
libffi/testsuite/lib/libffi-dg.exp | 2 +-
libgomp/ChangeLog | 5 +++++
libgomp/testsuite/lib/libgomp-dg.exp | 2 +-
libjava/ChangeLog | 5 +++++
libjava/testsuite/lib/libjava.exp | 2 +-
libmudflap/ChangeLog | 5 +++++
libmudflap/testsuite/lib/libmudflap.exp | 2 +-
libstdc++-v3/ChangeLog | 5 +++++
libstdc++-v3/testsuite/lib/libstdc++.exp | 2 +-
12 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7cf2a77e0aa2..9f16bfec7e42 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/gcc/testsuite/lib/gcc-defs.exp b/gcc/testsuite/lib/gcc-defs.exp
index afee893d9a19..3b60200a6001 100644
--- a/gcc/testsuite/lib/gcc-defs.exp
+++ b/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
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index def8e5c97b97..cf733efe4c0b 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/libffi/testsuite/lib/libffi-dg.exp b/libffi/testsuite/lib/libffi-dg.exp
index c3eecff96c0a..11dd39c33eee 100644
--- a/libffi/testsuite/lib/libffi-dg.exp
+++ b/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
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 33d1e78da2ee..2f8fe74f2d5d 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/libgomp/testsuite/lib/libgomp-dg.exp b/libgomp/testsuite/lib/libgomp-dg.exp
index ecd071360134..f8c6a427d18a 100644
--- a/libgomp/testsuite/lib/libgomp-dg.exp
+++ b/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
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2117abfe7779..e65b16cc4664 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 421b3d25b673..506982e50e95 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/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
diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index d7819e932b81..ca156e88e7ee 100644
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp
index e08f13d25ef1..94d060b3c75a 100644
--- a/libmudflap/testsuite/lib/libmudflap.exp
+++ b/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
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b03febe05a83..2fcdcfaae4e6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+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]
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index ab364191d682..0a9a6a8168d6 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/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
--
GitLab