diff --git a/Fortran/UnitTests/finalization/README.md b/Fortran/UnitTests/finalization/README.md --- a/Fortran/UnitTests/finalization/README.md +++ b/Fortran/UnitTests/finalization/README.md @@ -59,7 +59,6 @@ ``` shell cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_Fortran_COMPILER:FILEPATH=/home/users//llvm-project/build/bin/flang-new \ - -DCMAKE_Fortran_FLAGS=-flang-experimental-exec \ -DTEST_SUITE_FORTRAN:BOOL=On \ -DTEST_SUITE_SUBDIRS=Fortran/UnitTests/finalization \ ../test-suite diff --git a/Fortran/gfortran/CMakeLists.txt b/Fortran/gfortran/CMakeLists.txt --- a/Fortran/gfortran/CMakeLists.txt +++ b/Fortran/gfortran/CMakeLists.txt @@ -6,15 +6,6 @@ # support for the flag is added, this should be removed. remove_definitions(-w) -# If the test suite was configured by adding -flang-experimental-exec, remove -# that flag from the default compilation flags. It is only needed at link-time -# anyway, and for that it is explicitly added to those targets that need it. -# -# NOTE: This should be removed once the -flang-experimental-exec flag is no -# longer needed. -string(REPLACE "-flang-experimental-exec" "" TMP_FFLAGS "${CMAKE_Fortran_FLAGS}") -set(CMAKE_Fortran_FLAGS "${TMP_FFLAGS}") - # This option is added because as of 2023/03/20, several tests in this # directory have been disabled. Some of them exercise unsupported non-standard # extensions, others trigger a "not yet implemented" assertion while some cause @@ -310,9 +301,6 @@ endif() endforeach() - # NOTE: This should be removed when the -flang-experimental-exec flag is no - # longer needed. - target_link_options(${test_target} PRIVATE -flang-experimental-exec) set_target_properties(${test_target} PROPERTIES LINKER_LANGUAGE Fortran) endfunction() diff --git a/Fortran/gfortran/README.md b/Fortran/gfortran/README.md --- a/Fortran/gfortran/README.md +++ b/Fortran/gfortran/README.md @@ -59,10 +59,6 @@ ### Usage ### -As of 18-Apr-2023, the `-flang-experimental-exec` flag may need to be used when -configuring and compiling these tests. This can be passed to `cmake` via -`CMAKE_Fortran_FLAGS`. - By default, the *unsupported*, *unimplemented*, *skipped*, and *failing* tests are not run. The intention is that all tests in the test suite should pass by default. @@ -91,7 +87,6 @@ -DCMAKE_C_COMPILER=/path/to/clang \ -DCMAKE_CXX_COMPILER=/path/to/clang++ \ -DCMAKE_Fortran_COMPILER=/path/to/flang-new \ - -DCMAKE_Fortran_FLAGS=-flang-experimental-exec \ -DTEST_SUITE_FORTRAN=On \ -DTEST_SUITE_SUBDIRS=Fortran \ -DTEST_SUITE_FORTRAN_ISO_C_HEADER_DIR=/path/to/dir/containing/header \ diff --git a/Fortran/gfortran/torture/compile/CMakeLists.txt b/Fortran/gfortran/torture/compile/CMakeLists.txt --- a/Fortran/gfortran/torture/compile/CMakeLists.txt +++ b/Fortran/gfortran/torture/compile/CMakeLists.txt @@ -90,8 +90,6 @@ file(WRITE ${DummySrc} "program test\nend program test") add_executable(${Dummy} ${DummySrc}) - # At some point, the -flang-experimental-exec flag will be removed. - target_link_options(${Dummy} PUBLIC "-flang-experimental-exec") # All the "compile" tests in the gfortran torture tests are expected to # pass. Since diagnostics are only saved on failure, the diagnostics