This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Committed, scanasm.exp: Adjust for c++filt moved to binutils
- From: Hans-Peter Nilsson <hp at bitrange dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 19 Sep 2002 20:55:20 -0400 (EDT)
- Subject: Committed, scanasm.exp: Adjust for c++filt moved to binutils
Committed as obvious. All tests using scan-assembler-dem or
scan-assembler-dem-not broke with the recent c++filt move (and
it's called cxxfilt until installed). When testing in a unified
tree, if those tests didn't break for you, then you have tested
using *installed* tools. Tsk tsk. 1/2 ;-) Tested using
mmix-knuth-mmixware (for example).
* lib/scanasm.exp (scan-assembler-dem, scan-assembler-dem-not):
Adjust for c++filt moved to binutils.
Index: scanasm.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/scanasm.exp,v
retrieving revision 1.7
diff -p -c -r1.7 scanasm.exp
*** scanasm.exp 16 May 2002 05:10:10 -0000 1.7
--- scanasm.exp 20 Sep 2002 00:39:14 -0000
*************** proc scan-assembler-dem { args } {
*** 114,122 ****
# 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"
}
--- 114,124 ----
# Find c++filt like we find g++ in g++.exp.
if ![info exists cxxfilt] {
! 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"
}
*************** proc scan-assembler-dem-not { args } {
*** 158,174 ****
# 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]]]
verbose -log "c++filt is $cxxfilt"
}
--- 160,170 ----
# Find c++filt like we find g++ in g++.exp.
if ![info exists cxxfilt] {
! 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"
}
brgds, H-P