From 3a1cac0f85fe31cd529dd64338b0144935f246db Mon Sep 17 00:00:00 2001 From: Andreas Tobler Date: Fri, 23 Jan 2004 05:42:39 +0100 Subject: [PATCH] compat.exp: Add LD_LIBRARY_PATH_32/64 for Solaris. 2004-01-23 Andreas Tobler * g++.dg/compat/compat.exp: Add LD_LIBRARY_PATH_32/64 for Solaris. * lib/g77.exp: Likewise. * lib/objc.exp: Likewise. * lib/g++.exp: Likewise. From-SVN: r76397 --- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/g++.dg/compat/compat.exp | 3 +++ gcc/testsuite/lib/g++.exp | 8 ++++++-- gcc/testsuite/lib/g77.exp | 8 ++++++-- gcc/testsuite/lib/objc.exp | 10 +++++++--- 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9d8d1fb01bc..20b71833ae3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2004-01-23 Andreas Tobler + + * g++.dg/compat/compat.exp: Add LD_LIBRARY_PATH_32/64 for Solaris. + * lib/g77.exp: Likewise. + * lib/objc.exp: Likewise. + * lib/g++.exp: Likewise. + 2004-01-22 Eric Botcazou * gcc.dg/struct-by-value-2.c: New test. diff --git a/gcc/testsuite/g++.dg/compat/compat.exp b/gcc/testsuite/g++.dg/compat/compat.exp index 94da38c77de..df8dac96992 100644 --- a/gcc/testsuite/g++.dg/compat/compat.exp +++ b/gcc/testsuite/g++.dg/compat/compat.exp @@ -49,6 +49,9 @@ proc compat-fix-library-path { } { setenv SHLIB_PATH $ld_library_path setenv LD_LIBRARYN32_PATH $ld_library_path setenv LD_LIBRARY64_PATH $ld_library_path + setenv LD_LIBRARY_PATH_32 $ld_library_path + setenv LD_LIBRARY_PATH_64 $ld_library_path + setenv DYLD_LIBRARY_PATH $ld_library_path } } diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 8b30b60af14..a9f99fa26d8 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -170,14 +170,18 @@ proc g++_link_flags { paths } { # called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH # (for the 64-bit ABI). The right way to do this would be to modify # unix.exp -- but that's not an option since it's part of DejaGNU - # proper, so we do it here. We really only need to do - # this on IRIX, but it shouldn't hurt to do it anywhere else. + # proper, so we do it here. + # The same applies to Darwin (DYLD_LIBRARY_PATH), Solaris 32 bit + # (LD_LIBRARY_PATH_32), Solaris 64 bit (LD_LIBRARY_PATH_64), and HP-UX + # (SHLIB_PATH). # Doing this does cause trouble when testing cross-compilers. if {![is_remote target]} { setenv LD_LIBRARY_PATH $ld_library_path setenv SHLIB_PATH $ld_library_path setenv LD_LIBRARYN32_PATH $ld_library_path setenv LD_LIBRARY64_PATH $ld_library_path + setenv LD_LIBRARY_PATH_32 $ld_library_path + setenv LD_LIBRARY_PATH_64 $ld_library_path setenv DYLD_LIBRARY_PATH $ld_library_path } diff --git a/gcc/testsuite/lib/g77.exp b/gcc/testsuite/lib/g77.exp index f8c517163bf..c722c20c31a 100644 --- a/gcc/testsuite/lib/g77.exp +++ b/gcc/testsuite/lib/g77.exp @@ -114,12 +114,16 @@ proc g77_link_flags { paths } { # called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH # (for the 64-bit ABI). The right way to do this would be to modify # unix.exp -- but that's not an option since it's part of DejaGNU - # proper, so we do it here. We really only need to do - # this on IRIX, but it shouldn't hurt to do it anywhere else. + # proper, so we do it here. + # The same applies to Darwin (DYLD_LIBRARY_PATH), Solaris 32 bit + # (LD_LIBRARY_PATH_32), Solaris 64 bit (LD_LIBRARY_PATH_64), and HP-UX + # (SHLIB_PATH). setenv LD_LIBRARY_PATH $ld_library_path setenv SHLIB_PATH $ld_library_path setenv LD_LIBRARYN32_PATH $ld_library_path setenv LD_LIBRARY64_PATH $ld_library_path + setenv LD_LIBRARY_PATH_32 $ld_library_path + setenv LD_LIBRARY_PATH_64 $ld_library_path setenv DYLD_LIBRARY_PATH $ld_library_path return "$flags" diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp index 14bdf133168..1b6c10d60fe 100644 --- a/gcc/testsuite/lib/objc.exp +++ b/gcc/testsuite/lib/objc.exp @@ -188,13 +188,17 @@ proc objc_target_compile { source dest type options } { # called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH # (for the 64-bit ABI). The right way to do this would be to modify # unix.exp -- but that's not an option since it's part of DejaGNU - # proper, so we do it here. We really only need to do - # this on IRIX, but it shouldn't hurt to do it anywhere else. + # proper, so we do it here. + # The same applies to Darwin (DYLD_LIBRARY_PATH), Solaris 32 bit + # (LD_LIBRARY_PATH_32), Solaris 64 bit (LD_LIBRARY_PATH_64), and HP-UX + # (SHLIB_PATH). setenv LD_LIBRARY_PATH $ld_library_path setenv SHLIB_PATH $ld_library_path setenv LD_LIBRARYN32_PATH $ld_library_path setenv LD_LIBRARY64_PATH $ld_library_path - setenv DYLD_LIBRARY_PATH $ld_library_path + setenv LD_LIBRARY_PATH_32 $ld_library_path + setenv LD_LIBRARY_PATH_64 $ld_library_path + setenv DYLD_LIBRARY_PATH $ld_library_path return [target_compile $source $dest $type $options] } -- 2.30.2