compat.exp: Add LD_LIBRARY_PATH_32/64 for Solaris.

2004-01-23  Andreas Tobler  <a.tobler@schweiz.ch>

	* 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

+2004-01-23  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* 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  <ebotcazou@libertysurf.fr>
 
 	* gcc.dg/struct-by-value-2.c: New test.

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
     }
 }
 

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
     }
 

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"

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]
 }