Skip to content

Commit 95e9020

Browse files
committed
Remove legacy Fortran handling
1 parent 2e72c7a commit 95e9020

File tree

5 files changed

+2
-48
lines changed

5 files changed

+2
-48
lines changed

flang/test/lit.cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ def get_resource_module_intrinsic_dir(modfile):
180180
config.available_features.add("openmp_runtime")
181181

182182
# Search path for omp_lib.h with LLVM_ENABLE_RUNTIMES=openmp
183-
# FIXME: Do not hardcode, openmp should write this into the resource directory
183+
# FIXME: openmp should write this file into the resource directory
184184
extra_intrinsics_search_args += ["-I", f"{config.flang_obj_root}/../../runtimes/runtimes-bins/openmp/runtime/src"]
185185
else:
186-
lit_config.warning(f"OpenMP modules found not in driver default paths: OpenMP tests disabled: Use FLANG_TEST_ENABLE_OPENMP=ON to force-enable")
186+
lit_config.warning(f"OpenMP modules found not in driver default paths: OpenMP tests disabled; Use FLANG_TEST_ENABLE_OPENMP=ON to force-enable")
187187

188188

189189
lit_config.note(f"using flang: {flang_exe}")

openmp/runtime/cmake/LibompCheckFortranFlag.cmake

Lines changed: 0 additions & 29 deletions
This file was deleted.

openmp/runtime/cmake/LibompHandleFlags.cmake

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,6 @@ function(libomp_get_libflags libflags)
156156
set(${libflags} ${libflags_local_list} PARENT_SCOPE)
157157
endfunction()
158158

159-
# Fortran flags
160-
function(libomp_get_fflags fflags)
161-
set(fflags_local)
162-
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
163-
libomp_append(fflags_local -m32 LIBOMP_HAVE_M32_FORTRAN_FLAG)
164-
endif()
165-
set(fflags_local ${fflags_local} ${LIBOMP_FFLAGS})
166-
libomp_setup_flags(fflags_local)
167-
set(${fflags} ${fflags_local} PARENT_SCOPE)
168-
endfunction()
169-
170159
# Python generate-defs.py flags (For Windows only)
171160
function(libomp_get_gdflags gdflags)
172161
set(gdflags_local)

openmp/runtime/cmake/config-ix.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ include(CheckIncludeFile)
1616
include(CheckLibraryExists)
1717
include(CheckIncludeFiles)
1818
include(CheckSymbolExists)
19-
include(LibompCheckFortranFlag)
2019
include(LLVMCheckCompilerLinkerFlag)
2120

2221
# Check for versioned symbols
@@ -97,9 +96,6 @@ if(WIN32)
9796
endforeach()
9897
endforeach()
9998
endif()
100-
if(${LIBOMP_FORTRAN_MODULES})
101-
libomp_check_fortran_flag(-m32 LIBOMP_HAVE_M32_FORTRAN_FLAG)
102-
endif()
10399

104100
# Check non-posix pthread API here before CMAKE_REQUIRED_DEFINITIONS gets messed up
105101
check_symbol_exists(pthread_setname_np "pthread.h" LIBOMP_HAVE_PTHREAD_SETNAME_NP)

openmp/runtime/src/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,6 @@ if(LIBOMP_FORTRAN_MODULES)
455455
)
456456
set_target_properties(libomp-mod PROPERTIES FOLDER "OpenMP/Fortran Modules")
457457

458-
libomp_get_fflags(LIBOMP_CONFIGURED_FFLAGS)
459-
target_compile_options(libomp-mod PRIVATE ${LIBOMP_CONFIGURED_FFLAGS})
460458
if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
461459
target_compile_options(libomp-mod PRIVATE -fno-range-check)
462460
endif()

0 commit comments

Comments
 (0)