Skip to content

Commit 2142dc3

Browse files
committed
OpenMP: Remove -fno-experimental-isel flag from testing
This effectively reverts 6f9e25d. I didn't follow the complete history, but it seems this was added due to AArch64's output changing in some fallback. Blockaddress definitely works now, so just remove this.
1 parent e989b8b commit 2142dc3

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

openmp/cmake/DetectTestCompiler/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,6 @@ find_package(Threads REQUIRED)
3030
set(C_FLAGS "${OpenMP_C_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
3131
set(CXX_FLAGS "${OpenMP_CXX_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
3232

33-
# TODO: Implement blockaddress in GlobalISel and remove this flag!
34-
if (CMAKE_C_COMPILER_ID STREQUAL "Clang")
35-
check_c_compiler_flag("-fno-experimental-isel" C_HAS_EXPERIMENTAL_ISEL_FLAG)
36-
check_cxx_compiler_flag("-fno-experimental-isel" CXX_HAS_EXPERIMENTAL_ISEL_FLAG)
37-
macro(add_experimental_isel_flag lang)
38-
if (${lang}_HAS_EXPERIMENTAL_ISEL_FLAG)
39-
set(${lang}_FLAGS "-fno-experimental-isel ${${lang}_FLAGS}")
40-
endif()
41-
endmacro(add_experimental_isel_flag)
42-
43-
add_experimental_isel_flag(C)
44-
add_experimental_isel_flag(CXX)
45-
endif()
46-
4733
check_c_compiler_flag("-fno-omit-frame-pointer" C_HAS_OMIT_FRAME_POINTER)
4834
check_cxx_compiler_flag("-fno-omit-frame-pointer" CXX_HAS_OMIT_FRAME_POINTER)
4935

openmp/cmake/OpenMPTesting.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,7 @@ else()
154154
set(OPENMP_TEST_COMPILER_HAS_TSAN_FLAGS 0)
155155
endif()
156156
set(OPENMP_TEST_COMPILER_HAS_OMP_H 1)
157-
# TODO: Implement blockaddress in GlobalISel and remove this flag!
158-
set(OPENMP_TEST_COMPILER_OPENMP_FLAGS "-fopenmp ${OPENMP_TEST_COMPILER_THREAD_FLAGS} -fno-experimental-isel")
157+
set(OPENMP_TEST_COMPILER_OPENMP_FLAGS "-fopenmp ${OPENMP_TEST_COMPILER_THREAD_FLAGS}")
159158
set(OPENMP_TEST_COMPILER_HAS_OMIT_FRAME_POINTER_FLAGS 1)
160159
endif()
161160

0 commit comments

Comments
 (0)