summaryrefslogtreecommitdiff
path: root/openmp/cmake
diff options
context:
space:
mode:
authorMatt Arsenault <Matthew.Arsenault@amd.com>2022-01-18 14:10:26 -0500
committerMatt Arsenault <Matthew.Arsenault@amd.com>2022-11-16 11:54:13 -0800
commit2142dc31df05c46bc9294640715f6ebbed41f48c (patch)
tree37084765fc2a45fb4f1c823aa803415ea80001e3 /openmp/cmake
parente989b8bb5fb36abac6e8f82809f06144dd762113 (diff)
downloadllvm-2142dc31df05c46bc9294640715f6ebbed41f48c.tar.gz
OpenMP: Remove -fno-experimental-isel flag from testing
This effectively reverts 6f9e25d3824fb7b03dc6a403e1962d80a9c88ebe. 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.
Diffstat (limited to 'openmp/cmake')
-rw-r--r--openmp/cmake/DetectTestCompiler/CMakeLists.txt14
-rw-r--r--openmp/cmake/OpenMPTesting.cmake3
2 files changed, 1 insertions, 16 deletions
diff --git a/openmp/cmake/DetectTestCompiler/CMakeLists.txt b/openmp/cmake/DetectTestCompiler/CMakeLists.txt
index dc709f59684a..bc2aa52fbc1c 100644
--- a/openmp/cmake/DetectTestCompiler/CMakeLists.txt
+++ b/openmp/cmake/DetectTestCompiler/CMakeLists.txt
@@ -30,20 +30,6 @@ find_package(Threads REQUIRED)
set(C_FLAGS "${OpenMP_C_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
set(CXX_FLAGS "${OpenMP_CXX_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
-# TODO: Implement blockaddress in GlobalISel and remove this flag!
-if (CMAKE_C_COMPILER_ID STREQUAL "Clang")
- check_c_compiler_flag("-fno-experimental-isel" C_HAS_EXPERIMENTAL_ISEL_FLAG)
- check_cxx_compiler_flag("-fno-experimental-isel" CXX_HAS_EXPERIMENTAL_ISEL_FLAG)
- macro(add_experimental_isel_flag lang)
- if (${lang}_HAS_EXPERIMENTAL_ISEL_FLAG)
- set(${lang}_FLAGS "-fno-experimental-isel ${${lang}_FLAGS}")
- endif()
- endmacro(add_experimental_isel_flag)
-
- add_experimental_isel_flag(C)
- add_experimental_isel_flag(CXX)
-endif()
-
check_c_compiler_flag("-fno-omit-frame-pointer" C_HAS_OMIT_FRAME_POINTER)
check_cxx_compiler_flag("-fno-omit-frame-pointer" CXX_HAS_OMIT_FRAME_POINTER)
diff --git a/openmp/cmake/OpenMPTesting.cmake b/openmp/cmake/OpenMPTesting.cmake
index 1a9e0ded01aa..a93f7199ed7a 100644
--- a/openmp/cmake/OpenMPTesting.cmake
+++ b/openmp/cmake/OpenMPTesting.cmake
@@ -154,8 +154,7 @@ else()
set(OPENMP_TEST_COMPILER_HAS_TSAN_FLAGS 0)
endif()
set(OPENMP_TEST_COMPILER_HAS_OMP_H 1)
- # TODO: Implement blockaddress in GlobalISel and remove this flag!
- set(OPENMP_TEST_COMPILER_OPENMP_FLAGS "-fopenmp ${OPENMP_TEST_COMPILER_THREAD_FLAGS} -fno-experimental-isel")
+ set(OPENMP_TEST_COMPILER_OPENMP_FLAGS "-fopenmp ${OPENMP_TEST_COMPILER_THREAD_FLAGS}")
set(OPENMP_TEST_COMPILER_HAS_OMIT_FRAME_POINTER_FLAGS 1)
endif()