Thanks for the review. I have now committed this version as r276754 (with splitting the long line).

If someone prefers the other variant or bits of it, I will do it as follow up.

Cheers,

Tobias

On 10/9/19 9:43 AM, Jakub Jelinek wrote:
On Tue, Oct 08, 2019 at 08:33:03PM +0200, Tobias Burnus wrote:
        libgomp/
        * testsuite/libgomp.fortran/fortran.exp: Add -lquadmath if available.
        * testsuite/libgomp.oacc-fortran/fortran.exp: Ditto.

diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp 
b/libgomp/testsuite/libgomp.fortran/fortran.exp
index d848ed4d47f..caffbfe0346 100644
--- a/libgomp/testsuite/libgomp.fortran/fortran.exp
+++ b/libgomp/testsuite/libgomp.fortran/fortran.exp
@@ -54,11 +54,15 @@ if { $lang_test_file_found } {
            # Allow for spec subsitution.
            lappend ALWAYS_CFLAGS 
"additional_flags=-B${blddir}/${quadmath_library_path}/"
            set ld_library_path 
"$always_ld_library_path:${blddir}/${lang_library_path}:${blddir}/${quadmath_library_path}"
+           append lang_link_flags " -lquadmath"
        } else {
            set ld_library_path 
"$always_ld_library_path:${blddir}/${lang_library_path}"
        }
      } else {
          set ld_library_path "$always_ld_library_path"
+        if { [check_no_compiler_messages has_libquadmath executable {int main() {return 
0;}} "-lgfortran -lquadmath"] } then {
Can you please split this line?  I know the above lines are quite long too,
but they at least have long strings that aren't easy to split.
While the check_no_compiler_messages are split very commonly in
target-supports.exp, like:
     return [check_no_compiler_messages libatomic_available executable {
         int main (void) { return 0; }
     } "-latomic"]

+            append lang_link_flags " -lquadmath"
      } else {
          set ld_library_path "$always_ld_library_path"
+        if { [check_no_compiler_messages has_libquadmath executable {int main() {return 
0;}} "-lgfortran -lquadmath"] } then {
+            append lang_link_flags " -lquadmath"
+        }
Ditto.  Ok with that change.

        Jakub

Reply via email to