diff options
Diffstat (limited to 'gcc/testsuite/lib')
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 29 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g77.exp | 29 | ||||
| -rw-r--r-- | gcc/testsuite/lib/objc.exp | 26 |
3 files changed, 36 insertions, 48 deletions
diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 274a0965201..a9a49e4e619 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -159,6 +159,18 @@ proc g++_link_flags { paths } { append flags "-L${librx} "; } } + + # On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but + # 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. + 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 + return "$flags" } @@ -279,23 +291,6 @@ proc g++_target_compile { source dest type options } { } # -# g++_set_ld_library_path -- -# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but -# 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, by trickery. We really only need to do -# this on IRIX, but it shouldn't hurt to do it anywhere else. -# - -proc ${tool}_set_ld_library_path { name element op } { - setenv LD_LIBRARYN32_PATH [getenv LD_LIBRARY_PATH] - setenv LD_LIBRARY64_PATH [getenv LD_LIBRARY_PATH] -} - -trace variable env(LD_LIBRARY_PATH) w ${tool}_set_ld_library_path - -# # ${tool}_option_help # diff --git a/gcc/testsuite/lib/g77.exp b/gcc/testsuite/lib/g77.exp index 78a3384d68b..8ad51e9b56b 100644 --- a/gcc/testsuite/lib/g77.exp +++ b/gcc/testsuite/lib/g77.exp @@ -94,6 +94,18 @@ proc g77_link_flags { paths } { } append ld_library_path ":${rootme}" } + + # On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but + # 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. + 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 + return "$flags" } @@ -191,20 +203,3 @@ proc g77_target_compile { source dest type options } { return [target_compile $source $dest $type $options] } - -# -# g77_set_ld_library_path -- -# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but -# 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, by trickery. We really only need to do -# this on IRIX, but it shouldn't hurt to do it anywhere else. -# - -proc ${tool}_set_ld_library_path { name element op } { - setenv LD_LIBRARYN32_PATH [getenv LD_LIBRARY_PATH] - setenv LD_LIBRARY64_PATH [getenv LD_LIBRARY_PATH] -} - -trace variable env(LD_LIBRARY_PATH) w ${tool}_set_ld_library_path diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp index 7bd03cacf82..d82442c4382 100644 --- a/gcc/testsuite/lib/objc.exp +++ b/gcc/testsuite/lib/objc.exp @@ -157,6 +157,18 @@ proc objc_target_compile { source dest type options } { append ld_library_path ":${libobjc_dir}" } lappend options "compiler=$OBJC_UNDER_TEST" + + # On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but + # 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. + 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 + return [target_compile $source $dest $type $options] } @@ -241,20 +253,6 @@ if { [info procs prune_warnings] == "" } then { } } -# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but -# 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, by trickery. We really only need to do -# this on IRIX, but it shouldn't hurt to do it anywhere else. - -proc ${tool}_set_ld_library_path { name element op } { - setenv LD_LIBRARYN32_PATH [getenv LD_LIBRARY_PATH] - setenv LD_LIBRARY64_PATH [getenv LD_LIBRARY_PATH] -} - -trace variable env(LD_LIBRARY_PATH) w ${tool}_set_ld_library_path - # Utility used by mike-gcc.exp and c-torture.exp. # Check the compiler(/assembler/linker) output for text indicating that # the testcase should be marked as "unsupported". |