diff options
| author | Hans-Peter Nilsson <hp@bitrange.com> | 2002-09-20 00:52:14 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2002-09-20 00:52:14 +0000 |
| commit | 1db76181e50f810f81f144507f8c118c78b57943 (patch) | |
| tree | 3524fffe0565233821c48c83f3882ffe6292f56d | |
| parent | e2bb0cb4b31693f70f5b32014787f6d687f741ed (diff) | |
| download | gcc-1db76181e50f810f81f144507f8c118c78b57943.zip gcc-1db76181e50f810f81f144507f8c118c78b57943.tar.gz gcc-1db76181e50f810f81f144507f8c118c78b57943.tar.bz2 | |
scanasm.exp (scan-assembler-dem, [...]): Adjust for c++filt moved to binutils.
* lib/scanasm.exp (scan-assembler-dem, scan-assembler-dem-not):
Adjust for c++filt moved to binutils.
From-SVN: r57325
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/scanasm.exp | 24 |
2 files changed, 15 insertions, 14 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4757867..1e69b6c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2002-09-20 Hans-Peter Nilsson <hp@bitrange.com> + + * lib/scanasm.exp (scan-assembler-dem, scan-assembler-dem-not): + Adjust for c++filt moved to binutils. + 2002-09-19 Geoffrey Keating <geoffk@apple.com> * gcc.dg/20020312-2.c: Update for darwin. diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index 637b298..ebca4ca 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -114,9 +114,11 @@ proc scan-assembler-dem { args } { # Find c++filt like we find g++ in g++.exp. if ![info exists cxxfilt] { - set cxxfilt [findfile $base_dir/../c++filt $base_dir/../c++filt \ - [findfile $base_dir/c++filt $base_dir/c++filt \ - [transform c++filt]]] + set cxxfilt [findfile $base_dir/../../binutils/cxxfilt \ + $base_dir/../../binutils/cxxfilt \ + [findfile $base_dir/../c++filt $base_dir/../c++filt \ + [findfile $base_dir/c++filt $base_dir/c++filt \ + [transform c++filt]]]] verbose -log "c++filt is $cxxfilt" } @@ -158,17 +160,11 @@ proc scan-assembler-dem-not { args } { # Find c++filt like we find g++ in g++.exp. if ![info exists cxxfilt] { - set cxxfilt [findfile $base_dir/../c++filt $base_dir/../c++filt \ - [findfile $base_dir/c++filt $base_dir/c++filt \ - [transform c++filt]]] - verbose -log "c++filt is $cxxfilt" - } - - # Find c++filt like we find g++ in g++.exp. - if ![info exists cxxfilt] { - set cxxfilt [findfile $base_dir/../c++filt $base_dir/../c++filt \ - [findfile $base_dir/c++filt $base_dir/c++filt \ - [transform c++filt]]] + set cxxfilt [findfile $base_dir/../../binutils/cxxfilt \ + $base_dir/../../binutils/cxxfilt \ + [findfile $base_dir/../c++filt $base_dir/../c++filt \ + [findfile $base_dir/c++filt $base_dir/c++filt \ + [transform c++filt]]]] verbose -log "c++filt is $cxxfilt" } |