Commit d811546f authored Sep 15, 2021 by Michał Górny Committed by Tom Stellard Sep 17, 2021

[compiler-rt] Move -fno-omit-frame-pointer check to common config-ix

9ee64c37 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 210d72e9)

parent 89f2c0c6

compiler-rt/cmake/builtin-config-ix.cmake

+0 −1

Original line number	Diff line number	Diff line
		@@ -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)

compiler-rt/cmake/config-ix.cmake

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)