230915.201652.HKT let the fortran compilers be calm with the dll expo…

…rtation directives
zequipe · Sep 15, 2023 · 03baa39 · 03baa39
1 parent 8b85e68
commit 03baa39
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/fortran/examples/bobyqa/Makefile b/fortran/examples/bobyqa/Makefile
@@ -55,10 +55,10 @@ ftest: FC := flang -Wall -Wextra -std=f$(FSTD) -Mstandard
 
 # GNU gfortran: due to `error stop` and `backtrace`, we must either compile wit no `-std` or
 # use `-std=f20xy -fall-intrinsics` with xy >= 18.
-gtest: FC := gfortran -Wall -Wextra -Wno-function-elimination -std=f$(FSTD) -fall-intrinsics
+gtest: FC := gfortran -Wall -Wextra -Wno-attributes -Wno-function-elimination -std=f$(FSTD) -fall-intrinsics
 
 # Intel ifort
-itest: FC := ifort -warn all -stand f$(FS)
+itest: FC := ifort -warn all -diag-disable:7025,7841 -stand f$(FS)
 
 # NAG nagfor
 ntest: FC := nagfor -C -f$(FSTD)
@@ -72,7 +72,7 @@ RFORT := $(shell find -L /opt/arm -type f -executable -name armflang -print 2> /
 rtest: FC := $(RFORT) -Wall -Wextra -std=f$(FSTD) -Mstandard
 
 # Intel ifx
-xtest: FC := ifx -warn all -stand f$(FS)
+xtest: FC := ifx -warn all -diag-disable:7025,7841 -stand f$(FS)
 
 ####################################################################################################
 # Compile the binary needed for a compiler-specific test

diff --git a/fortran/examples/cobyla/Makefile b/fortran/examples/cobyla/Makefile
@@ -55,10 +55,10 @@ ftest: FC := flang -Wall -Wextra -std=f$(FSTD) -Mstandard
 
 # GNU gfortran: due to `error stop` and `backtrace`, we must either compile wit no `-std` or
 # use `-std=f20xy -fall-intrinsics` with xy >= 18.
-gtest: FC := gfortran -Wall -Wextra -Wno-function-elimination -std=f$(FSTD) -fall-intrinsics
+gtest: FC := gfortran -Wall -Wextra -Wno-attributes -Wno-function-elimination -std=f$(FSTD) -fall-intrinsics
 
 # Intel ifort
-itest: FC := ifort -warn all -stand f$(FS)
+itest: FC := ifort -warn all -diag-disable:7025,7841 -stand f$(FS)
 
 # NAG nagfor
 ntest: FC := nagfor -C -f$(FSTD)
@@ -72,7 +72,7 @@ RFORT := $(shell find -L /opt/arm -type f -executable -name armflang -print 2> /
 rtest: FC := $(RFORT) -Wall -Wextra -std=f$(FSTD) -Mstandard
 
 # Intel ifx
-xtest: FC := ifx -warn all -stand f$(FS)
+xtest: FC := ifx -warn all -diag-disable:7025,7841 -stand f$(FS)
 
 ####################################################################################################
 # Compile the binary needed for a compiler-specific test

diff --git a/fortran/examples/lincoa/Makefile b/fortran/examples/lincoa/Makefile
@@ -55,10 +55,10 @@ ftest: FC := flang -Wall -Wextra -std=f$(FSTD) -Mstandard
 
 # GNU gfortran: due to `error stop` and `backtrace`, we must either compile wit no `-std` or
 # use `-std=f20xy -fall-intrinsics` with xy >= 18.
-gtest: FC := gfortran -Wall -Wextra -Wno-function-elimination -std=f$(FSTD) -fall-intrinsics
+gtest: FC := gfortran -Wall -Wextra -Wno-attributes -Wno-function-elimination -std=f$(FSTD) -fall-intrinsics
 
 # Intel ifort
-itest: FC := ifort -warn all -stand f$(FS)
+itest: FC := ifort -warn all -diag-disable:7025,7841 -stand f$(FS)
 
 # NAG nagfor
 ntest: FC := nagfor -C -f$(FSTD)
@@ -73,7 +73,7 @@ RFORT := $(shell find -L /opt/arm -type f -executable -name armflang -print 2> /
 rtest: FC := $(RFORT) -Wall -Wextra -std=f$(FSTD) -Mstandard
 
 # Intel ifx
-xtest: FC := ifx -warn all -stand f$(FS)
+xtest: FC := ifx -warn all -diag-disable:7025,7841 -stand f$(FS)
 
 ####################################################################################################
 # Compile the binary needed for a compiler-specific test

diff --git a/fortran/examples/newuoa/Makefile b/fortran/examples/newuoa/Makefile
@@ -55,10 +55,10 @@ ftest: FC := flang -Wall -Wextra -std=f$(FSTD) -Mstandard
 
 # GNU gfortran: due to `error stop` and `backtrace`, we must either compile wit no `-std` or
 # use `-std=f20xy -fall-intrinsics` with xy >= 18.
-gtest: FC := gfortran -Wall -Wextra -Wno-function-elimination -std=f$(FSTD) -fall-intrinsics
+gtest: FC := gfortran -Wall -Wextra -Wno-attributes -Wno-function-elimination -std=f$(FSTD) -fall-intrinsics
 
 # Intel ifort
-itest: FC := ifort -warn all -stand f$(FS)
+itest: FC := ifort -warn all -diag-disable:7025,7841 -stand f$(FS)
 
 # NAG nagfor
 ntest: FC := nagfor -C -f$(FSTD)
@@ -72,7 +72,7 @@ RFORT := $(shell find -L /opt/arm -type f -executable -name armflang -print 2> /
 rtest: FC := $(RFORT) -Wall -Wextra -std=f$(FSTD) -Mstandard
 
 # Intel ifx
-xtest: FC := ifx -warn all -stand f$(FS)
+xtest: FC := ifx -warn all -diag-disable:7025,7841 -stand f$(FS)
 
 ####################################################################################################
 # Compile the binary needed for a compiler-specific test

diff --git a/fortran/examples/uobyqa/Makefile b/fortran/examples/uobyqa/Makefile
@@ -55,10 +55,10 @@ ftest: FC := flang -Wall -Wextra -std=f$(FSTD) -Mstandard
 
 # GNU gfortran: due to `error stop` and `backtrace`, we must either compile wit no `-std` or
 # use `-std=f20xy -fall-intrinsics` with xy >= 18.
-gtest: FC := gfortran -Wall -Wextra -Wno-function-elimination -std=f$(FSTD) -fall-intrinsics
+gtest: FC := gfortran -Wall -Wextra -Wno-attributes -Wno-function-elimination -std=f$(FSTD) -fall-intrinsics
 
 # Intel ifort
-itest: FC := ifort -warn all -stand f$(FS)
+itest: FC := ifort -warn all -diag-disable:7025,7841 -stand f$(FS)
 
 # NAG nagfor
 ntest: FC := nagfor -C -f$(FSTD)
@@ -72,7 +72,7 @@ RFORT := $(shell find -L /opt/arm -type f -executable -name armflang -print 2> /
 rtest: FC := $(RFORT) -Wall -Wextra -std=f$(FSTD) -Mstandard
 
 # Intel ifx
-xtest: FC := ifx -warn all -stand f$(FS)
+xtest: FC := ifx -warn all -diag-disable:7025,7841 -stand f$(FS)
 
 ####################################################################################################
 # Compile the binary needed for a compiler-specific test

diff --git a/fortran/tests/makefiles/Makefile.common b/fortran/tests/makefiles/Makefile.common
@@ -479,7 +479,7 @@ gtest_i2_r16_d1_tst_c gtest_i4_r16_d1_tst_c gtest_i8_r16_d1_tst_c gtest_i2_r16_d
 # protect_parens, realloc_lhs1, recursion, std_intent_in, std_minus0_rounding1, std_mod_proc_name,
 # and std_value1.
 IFORT := ifort
-IFORT := $(IFORT) -diag-disable:7841  # avoid complaints about `attributes dllexport`
+IFORT := $(IFORT) -diag-disable:7025,7841  # avoid complaints about `attributes dllexport`
 IFORT := $(IFORT) -warn all -debug extended -warn errors -traceback -debug-parameters all #-diag-error-limit 1
 # `-auto` causes all local, non-SAVEd variables to be allocated to the run-time stack.
 # `-no-heap-arrays`, which is the default for `ifort`, causes the compiler puts automatic arrays
@@ -645,7 +645,7 @@ stest_i2_r16_d1_tst_c stest_i4_r16_d1_tst_c stest_i8_r16_d1_tst_c stest_i2_r16_d
 
 # Intel ifx
 XFORT := ifx
-XFORT := $(XFORT) -diag-disable:7841  # avoid complaints about `attributes dllexport`
+XFORT := $(XFORT) -diag-disable:7025,7841  # avoid complaints about `attributes dllexport`
 XFORT := $(XFORT) -warn all -debug extended -warn errors -traceback -debug-parameters all #-diag-error-limit 1
 # `-auto` causes all local, non-SAVEd variables to be allocated to the run-time stack.
 # `-no-heap-arrays`, which is the default for `ifort`, causes the compiler puts automatic arrays