Partially revert changes involving include/language-support.F90

bonachea · bonachea · commit 002a0a60afc4 · 2025-11-18T19:33:34.000-08:00
This header is no longer relevant to the test code
diff --git a/include/language-support.F90 b/include/language-support.F90
@@ -2,9 +2,7 @@
 ! Terms of use are as specified in LICENSE.txt
 
 #ifdef __GNUC__
-#  define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#else
-#  define GCC_VERSION 0
+#  define HAVE_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 #endif
 
 #ifndef HAVE_SELECTED_LOGICAL_KIND
@@ -21,7 +19,7 @@
   ! Define whether the compiler supports associating a procedure pointer dummy argument with an
   ! actual argument that is a valid target for the pointer dummy in a procedure assignment, a 
   ! feature introduced in Fortran 2008 and described in Fortran 2023 clause 15.5.2.10 paragraph 5.
-#if defined _CRAYFTN  || defined __INTEL_COMPILER  || defined NAGFOR  || defined __flang__ || (GCC_VERSION > 140200)
+#if defined(_CRAYFTN) || defined(__INTEL_COMPILER) || defined(NAGFOR) || defined(__flang__) || (HAVE_GCC_VERSION > 140200)
 #  define HAVE_PROCEDURE_ACTUAL_FOR_POINTER_DUMMY 1
 #else
 #  define HAVE_PROCEDURE_ACTUAL_FOR_POINTER_DUMMY 0
diff --git a/test/prif_co_broadcast_test.F90 b/test/prif_co_broadcast_test.F90
@@ -1,5 +1,3 @@
-#include "language-support.F90"
-
 module prif_co_broadcast_test_m
   use prif, only : prif_co_broadcast, prif_num_images, prif_this_image_no_coarray
   use julienne_m, only : &
diff --git a/test/prif_co_max_test.F90 b/test/prif_co_max_test.F90
@@ -1,5 +1,3 @@
-#include "language-support.F90"
-
 module prif_co_max_test_m
   use iso_c_binding, only: c_int8_t, c_int16_t, c_int32_t, c_int64_t, c_float, c_double
   use prif, only : prif_co_max, prif_co_max_character, prif_this_image_no_coarray, prif_num_images
diff --git a/test/prif_co_min_test.F90 b/test/prif_co_min_test.F90
@@ -1,5 +1,3 @@
-#include "language-support.F90"
-
 module prif_co_min_test_m
   use iso_c_binding, only: c_int8_t, c_int16_t, c_int32_t, c_int64_t, c_float, c_double
   use prif, only : prif_co_min, prif_co_min_character, prif_this_image_no_coarray, prif_num_images
diff --git a/test/prif_co_reduce_test.F90 b/test/prif_co_reduce_test.F90
@@ -1,5 +1,3 @@
-#include "language-support.F90"
-
 module prif_co_reduce_test_m
   use iso_c_binding, only: c_ptr, c_funptr, c_size_t, c_f_pointer, c_f_procpointer, c_funloc, c_loc, c_null_ptr
   use prif, only : prif_co_reduce, prif_num_images, prif_this_image_no_coarray, prif_operation_wrapper_interface
diff --git a/test/prif_co_sum_test.F90 b/test/prif_co_sum_test.F90
@@ -1,5 +1,3 @@
-#include "language-support.F90"
-
 module prif_co_sum_test_m
     use iso_c_binding, only: c_int8_t, c_int16_t, c_int32_t, c_int64_t, c_float, c_double
     use prif, only : prif_co_sum, prif_num_images, prif_this_image_no_coarray
diff --git a/test/prif_coarray_inquiry_test.F90 b/test/prif_coarray_inquiry_test.F90
@@ -1,5 +1,3 @@
-#include "language-support.F90"
-
 module prif_coarray_inquiry_test_m
   use prif, only : &
       prif_allocate_coarray, prif_deallocate_coarray, &
diff --git a/test/prif_image_queries_test.F90 b/test/prif_image_queries_test.F90
@@ -1,5 +1,3 @@
-#include "language-support.F90"
-
 module prif_image_queries_test_m
     use iso_c_binding, only: c_int
     use prif, only : prif_image_status, prif_stopped_images, prif_failed_images, PRIF_STAT_FAILED_IMAGE, PRIF_STAT_STOPPED_IMAGE
diff --git a/test/prif_init_test.F90 b/test/prif_init_test.F90
@@ -1,5 +1,3 @@
-#include "language-support.F90"
-
 module prif_init_test_m
     use prif, only : prif_init, PRIF_STAT_ALREADY_INIT
     use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, operator(.equalsExpected.), usher
diff --git a/test/prif_num_images_test.F90 b/test/prif_num_images_test.F90
@@ -1,5 +1,3 @@
-#include "language-support.F90"
-
 module prif_num_images_test_m
   use prif, only : prif_num_images
   use julienne_m, only:  &
diff --git a/test/prif_sync_images_test.F90 b/test/prif_sync_images_test.F90
@@ -1,5 +1,3 @@
-#include "language-support.F90"
-
 module prif_sync_images_test_m
     use iso_c_binding, only: c_int
     use prif, only : prif_sync_images, prif_this_image_no_coarray, prif_num_images, prif_sync_all
diff --git a/test/prif_this_image_test.F90 b/test/prif_this_image_test.F90
@@ -1,5 +1,3 @@
-#include "language-support.F90"
-
 module prif_this_image_no_coarray_test_m
   use prif, only : prif_this_image_no_coarray, prif_num_images, prif_co_sum
   use julienne_m, only: &

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include "language-support.F90"`
`2`		`-`
`3`	`1`	`module prif_co_broadcast_test_m`
`4`	`2`	`use prif, only : prif_co_broadcast, prif_num_images, prif_this_image_no_coarray`
`5`	`3`	`use julienne_m, only : &`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include "language-support.F90"`
`2`		`-`
`3`	`1`	`module prif_co_max_test_m`
`4`	`2`	`use iso_c_binding, only: c_int8_t, c_int16_t, c_int32_t, c_int64_t, c_float, c_double`
`5`	`3`	`use prif, only : prif_co_max, prif_co_max_character, prif_this_image_no_coarray, prif_num_images`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include "language-support.F90"`
`2`		`-`
`3`	`1`	`module prif_co_min_test_m`
`4`	`2`	`use iso_c_binding, only: c_int8_t, c_int16_t, c_int32_t, c_int64_t, c_float, c_double`
`5`	`3`	`use prif, only : prif_co_min, prif_co_min_character, prif_this_image_no_coarray, prif_num_images`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include "language-support.F90"`
`2`		`-`
`3`	`1`	`module prif_co_reduce_test_m`
`4`	`2`	`use iso_c_binding, only: c_ptr, c_funptr, c_size_t, c_f_pointer, c_f_procpointer, c_funloc, c_loc, c_null_ptr`
`5`	`3`	`use prif, only : prif_co_reduce, prif_num_images, prif_this_image_no_coarray, prif_operation_wrapper_interface`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include "language-support.F90"`
`2`		`-`
`3`	`1`	`module prif_co_sum_test_m`
`4`	`2`	`use iso_c_binding, only: c_int8_t, c_int16_t, c_int32_t, c_int64_t, c_float, c_double`
`5`	`3`	`use prif, only : prif_co_sum, prif_num_images, prif_this_image_no_coarray`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include "language-support.F90"`
`2`		`-`
`3`	`1`	`module prif_coarray_inquiry_test_m`
`4`	`2`	`use prif, only : &`
`5`	`3`	`prif_allocate_coarray, prif_deallocate_coarray, &`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include "language-support.F90"`
`2`		`-`
`3`	`1`	`module prif_image_queries_test_m`
`4`	`2`	`use iso_c_binding, only: c_int`
`5`	`3`	`use prif, only : prif_image_status, prif_stopped_images, prif_failed_images, PRIF_STAT_FAILED_IMAGE, PRIF_STAT_STOPPED_IMAGE`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include "language-support.F90"`
`2`		`-`
`3`	`1`	`module prif_init_test_m`
`4`	`2`	`use prif, only : prif_init, PRIF_STAT_ALREADY_INIT`
`5`	`3`	`use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, operator(.equalsExpected.), usher`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include "language-support.F90"`
`2`		`-`
`3`	`1`	`module prif_num_images_test_m`
`4`	`2`	`use prif, only : prif_num_images`
`5`	`3`	`use julienne_m, only: &`