diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2117abf..e65b16c 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 421b3d2..506982e 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 |