diff options
| author | Michał Górny <mgorny@moritz.systems> | 2021-09-15 10:24:37 +0200 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2021-09-17 16:35:02 -0700 |
| commit | d811546f803c0aa33d092f6fa181b77a1770869a (patch) | |
| tree | 3cb054ea5a82833abb2c72f60015298543db3a4f | |
| parent | 89f2c0c63c220fd5aa36279401a5cb883dfbbc34 (diff) | |
| download | llvm-d811546f803c0aa33d092f6fa181b77a1770869a.tar.gz | |
[compiler-rt] Move -fno-omit-frame-pointer check to common config-ix
9ee64c374605683ae80b9641d5312a72c2a67336 has started using
COMPILER_RT_HAS_OMIT_FRAME_POINTER_FLAG inside scudo. However,
the relevant CMake check was performed in builtin-config-ix.cmake,
so the definition was missing when builtins were not built. Move
the check to config-ix.cmake, so that it runs unconditionally of
the components being built.
Fixes PR#51847
Differential Revision: https://reviews.llvm.org/D109812
(cherry picked from commit 210d72e9d6b4a8e7633921d0bd7186fd3c7a2c8c)
| -rw-r--r-- | compiler-rt/cmake/builtin-config-ix.cmake | 1 | ||||
| -rw-r--r-- | compiler-rt/cmake/config-ix.cmake | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/cmake/builtin-config-ix.cmake b/compiler-rt/cmake/builtin-config-ix.cmake index 213741869336..fe5661b77636 100644 --- a/compiler-rt/cmake/builtin-config-ix.cmake +++ b/compiler-rt/cmake/builtin-config-ix.cmake @@ -10,7 +10,6 @@ builtin_check_c_compiler_flag(-fPIE COMPILER_RT_HAS_FPIE_FLAG) builtin_check_c_compiler_flag(-fno-builtin COMPILER_RT_HAS_FNO_BUILTIN_FLAG) builtin_check_c_compiler_flag(-std=c11 COMPILER_RT_HAS_STD_C11_FLAG) builtin_check_c_compiler_flag(-fvisibility=hidden COMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG) -builtin_check_c_compiler_flag(-fomit-frame-pointer COMPILER_RT_HAS_OMIT_FRAME_POINTER_FLAG) builtin_check_c_compiler_flag(-ffreestanding COMPILER_RT_HAS_FREESTANDING_FLAG) builtin_check_c_compiler_flag(-fxray-instrument COMPILER_RT_HAS_XRAY_COMPILER_FLAG) diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 6f13acfa2757..39b9120f00ad 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -55,6 +55,7 @@ endif () # CodeGen options. check_c_compiler_flag(-ffreestanding COMPILER_RT_HAS_FFREESTANDING_FLAG) +check_c_compiler_flag(-fomit-frame-pointer COMPILER_RT_HAS_OMIT_FRAME_POINTER_FLAG) check_c_compiler_flag(-std=c11 COMPILER_RT_HAS_STD_C11_FLAG) check_cxx_compiler_flag(-fPIC COMPILER_RT_HAS_FPIC_FLAG) check_cxx_compiler_flag(-fPIE COMPILER_RT_HAS_FPIE_FLAG) |