Modify -mabi=64 C++ Testing
Jeffrey Oldham
oldham@codesourcery.com
Mon Jun 4 08:28:00 GMT 2001
I committed a patch to permit -mabi=64 C++ testing for
mips-sgi-irix6.5
( http://gcc.gnu.org/ml/gcc-patches/2001-05/msg01647.html ). The
command-line I use is something like
make -k RUNTESTFLAGS="--tool_opts '-mabi=64'" check-g++
Rainer Orth uses something like
make -k RUNTESTFLAGS='--target_board "unix{-mabi=64}"' check-g++
which then was broken
( http://gcc.gnu.org/ml/gcc-patches/2001-05/msg02059.html ). This patch
permits using either method.
2001-06-04 Jeffrey Oldham <oldham@codesourcery.com>
* lib/g++.exp (g++_include_flags): Change `args' to gccpath's value.
(g++_link_flags): Likewise.
(g++_init): Pass gccpath's value to two previous functions.
Tested on mips-sgi-irix6.5 gcc 3.[10], i686-pc-linux-gnu gcc 3.1
Approved by Mark Mitchell (mark@codesourcery.com)
Thanks,
Jeffrey D. Oldham
oldham@codesourcery.com
Index: g++.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/lib/g++.exp,v
retrieving revision 1.17.2.2
diff -c -p -r1.17.2.2 g++.exp
*** g++.exp 2001/05/23 16:12:56 1.17.2.2
--- g++.exp 2001/06/01 23:54:18
*************** proc g++_version { } {
*** 63,69 ****
# provide new versions of g++_include_flags and g++_link_flags (both
# originally from libgloss.exp) which know about the new gcc tree structure
#
! proc g++_include_flags { args } {
global srcdir
global HAVE_LIBSTDCXX_V3
--- 63,69 ----
# provide new versions of g++_include_flags and g++_link_flags (both
# originally from libgloss.exp) which know about the new gcc tree structure
#
! proc g++_include_flags { paths } {
global srcdir
global HAVE_LIBSTDCXX_V3
*************** proc g++_include_flags { args } {
*** 78,84 ****
append flags "-I${dir} -I${dir}/src "
}
! set gccpath [get_multilibs ${args}]
if { ${HAVE_LIBSTDCXX_V3} } {
set odir_v3 [lookfor_file ${gccpath} libstdc++-v3]
--- 78,84 ----
append flags "-I${dir} -I${dir}/src "
}
! set gccpath ${paths}
if { ${HAVE_LIBSTDCXX_V3} } {
set odir_v3 [lookfor_file ${gccpath} libstdc++-v3]
*************** proc g++_include_flags { args } {
*** 92,103 ****
return "$flags"
}
! proc g++_link_flags { args } {
global rootme
global srcdir
global ld_library_path
! set gccpath [get_multilibs ${args}];
set libio_dir ""
set flags ""
set ld_library_path "."
--- 92,103 ----
return "$flags"
}
! proc g++_link_flags { paths } {
global rootme
global srcdir
global ld_library_path
! set gccpath ${paths}
set libio_dir ""
set flags ""
set ld_library_path "."
*************** proc g++_init { args } {
*** 212,222 ****
if ![is_remote host] {
if [info exists TOOL_OPTIONS] {
! lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags ${TOOL_OPTIONS}]";
! lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags ${TOOL_OPTIONS}]";
} else {
! lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags]";
! lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags]";
}
}
--- 212,222 ----
if ![is_remote host] {
if [info exists TOOL_OPTIONS] {
! lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs ${TOOL_OPTIONS}] ]";
! lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags [get_multilibs ${TOOL_OPTIONS}] ]";
} else {
! lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs] ]";
! lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags [get_multilibs] ]";
}
}
More information about the Gcc-patches
mailing list