This is an archive of the discontinued LLVM Phabricator instance.

Differential D75772

[compiler-rt] Set builtins and cxx library for target arch test
AcceptedPublic

Authored by phosek on Mar 6 2020, 2:37 PM.

Details

Reviewers
smeenai
beanz
Summary

When testing whether target arch is supported, take the selected
builtins and cxx library into consideration otherwise the test may
fail even when it shouldn't.

Diff Detail

Event Timeline

phosek created this revision.Mar 6 2020, 2:37 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMar 6 2020, 2:37 PM
Herald added subscribers: llvm-commits, Restricted Project, mgorny, dberris. · View Herald Transcript
Harbormaster completed remote builds in B48397: Diff 248832.Mar 6 2020, 3:29 PM
smeenai accepted this revision.Mar 6 2020, 4:01 PM

LGTM barring the question about the duplication.

compiler-rt/cmake/Modules/CompilerRTUtils.cmake
143

Hmm, I guess try_compile doesn't honor CMAKE_REQUIRED_LIBRARIES? That's surprising.

145

Was it intentional to duplicate this line?

This revision is now accepted and ready to land.Mar 6 2020, 4:01 PM

Revision Contents

PathSize
compiler-rt/
cmake/
Modules/
7 lines

Diff 248832

compiler-rt/cmake/Modules/CompilerRTUtils.cmake

Show First 20 Lines • Show All 130 Lines • ▼ Show 20 Lines elseif(TEST_COMPILE_ONLY)
try_compile_only(CAN_TARGET_${arch} FLAGS ${TARGET_${arch}_CFLAGS}) try_compile_only(CAN_TARGET_${arch} FLAGS ${TARGET_${arch}_CFLAGS})
else() else()
set(FLAG_NO_EXCEPTIONS "") set(FLAG_NO_EXCEPTIONS "")
if(COMPILER_RT_HAS_FNO_EXCEPTIONS_FLAG) if(COMPILER_RT_HAS_FNO_EXCEPTIONS_FLAG)
set(FLAG_NO_EXCEPTIONS " -fno-exceptions ") set(FLAG_NO_EXCEPTIONS " -fno-exceptions ")
endif() endif()
set(SAVED_CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}) set(SAVED_CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${argstring}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${argstring}")
if(SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++" AND SANITIZER_CXX_ABI_INTREE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib++")
endif()
if(COMPILER_RT_USE_BUILTINS_LIBRARY)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${COMPILER_RT_BUILTINS_LIBRARY}")
smeenaiUnsubmitted
Not Done
ReplyInline Actions

Hmm, I guess try_compile doesn't honor CMAKE_REQUIRED_LIBRARIES? That's surprising.

smeenai: Hmm, I guess `try_compile` doesn't honor `CMAKE_REQUIRED_LIBRARIES`? That's surprising.
endif()
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${argstring}")
smeenaiUnsubmitted
Not Done
ReplyInline Actions

Was it intentional to duplicate this line?

smeenai: Was it intentional to duplicate this line?
try_compile(CAN_TARGET_${arch} ${CMAKE_BINARY_DIR} ${SIMPLE_SOURCE} try_compile(CAN_TARGET_${arch} ${CMAKE_BINARY_DIR} ${SIMPLE_SOURCE}
COMPILE_DEFINITIONS "${TARGET_${arch}_CFLAGS} ${FLAG_NO_EXCEPTIONS}" COMPILE_DEFINITIONS "${TARGET_${arch}_CFLAGS} ${FLAG_NO_EXCEPTIONS}"
OUTPUT_VARIABLE TARGET_${arch}_OUTPUT) OUTPUT_VARIABLE TARGET_${arch}_OUTPUT)
set(CMAKE_EXE_LINKER_FLAGS ${SAVED_CMAKE_EXE_LINKER_FLAGS}) set(CMAKE_EXE_LINKER_FLAGS ${SAVED_CMAKE_EXE_LINKER_FLAGS})
endif() endif()
endif() endif()
if(${CAN_TARGET_${arch}}) if(${CAN_TARGET_${arch}})
list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch}) list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
▲ Show 20 Lines • Show All 331 Lines • Show Last 20 Lines