g++ -mabi=64 testsuite failures on irix6.5

[Jeffrey Oldham]

David, you complained about numerous C++ execution failures for
mips-sgi-irix6.5 with -mabi=64.  Apparently, "-mabi=64" was not passed
to gcc/testsuite/lib/g++.exp:g++_include_flags and g++_link_flags,
which construct -I and -L compiler and linker options.  Thus, the
"mabi=64" was omitted from directory paths.

This patch fixes that so the linker no longer complains that n32
libraries are being provided when 64-bit libraries are desired.
Unfortunately, I now experience numerically more errors, some
execution and some excessive.  I'll look into these problems to see if
I am causing them or they were previously present.

Mon May 21 15:29:41 2001  Jeffrey D. Oldham  <joldham@n02.acl.lanl.gov>

	* lib/g++.exp (g++_include_flags): Use args to compute
 	get_multilibs.
	(g++_link_flags): Likewise.
	(g++_init): Pass TOOL_OPTIONS as arguments to two above functions.

Under development.

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.1
diff -c -p -r1.17.2.1 g++.exp
*** g++.exp	2001/05/14 19:38:10	1.17.2.1
--- g++.exp	2001/05/21 21:29:08
*************** proc g++_include_flags { args } {
*** 78,84 ****
        append flags "-I${dir} -I${dir}/src "
      }
  
!     set gccpath [get_multilibs]
  
      if { ${HAVE_LIBSTDCXX_V3} } {
        set odir_v3 [lookfor_file ${gccpath} libstdc++-v3]
--- 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]
*************** proc g++_link_flags { args } {
*** 97,103 ****
      global srcdir
      global ld_library_path
  
!     set gccpath [get_multilibs];
      set libio_dir ""
      set flags ""
      set ld_library_path "."
--- 97,103 ----
      global srcdir
      global ld_library_path
  
!     set gccpath [get_multilibs ${args}];
      set libio_dir ""
      set flags ""
      set ld_library_path "."
*************** proc g++_init { args } {
*** 211,218 ****
      set ALWAYS_CXXFLAGS ""
  
      if ![is_remote host] {
! 	lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags]";
! 	lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags]";
      }
  
      if [info exists TOOL_OPTIONS] {
--- 211,223 ----
      set ALWAYS_CXXFLAGS ""
  
      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]";
! 	}
      }
  
      if [info exists TOOL_OPTIONS] {