This is an archive of the discontinued LLVM Phabricator instance.

Differential D147103

[compiler-rt] Fix cross-compiling detection
ClosedPublic

Authored by hauhsu on Mar 28 2023, 8:23 PM.

Details

Reviewers
smeenai
ellis
phosek
Commits
rG7b67e965d97a: [compiler-rt] Fix cross-compiling detection
Summary

Previously the detection compares "CMAKE_SYSTEM_NAME" and
"CMAKE_TARGET_SYSTEM_NAME", which only contains OS names like "Linux".
This is not sufficient when cross-compiling for different target CPUs.

This patch uses CMAKE_CROSSCOMPILING, which sets automatically by CMake
when cross compiling.

Diff Detail

Event Timeline

hauhsu created this revision.Mar 28 2023, 8:23 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 28 2023, 8:23 PM
Herald added subscribers: Enna1, dberris. · View Herald Transcript
hauhsu requested review of this revision.Mar 28 2023, 8:23 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 28 2023, 8:23 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
hauhsu updated this revision to Diff 509200.Mar 28 2023, 8:32 PM

Remove a redundant space

Harbormaster completed remote builds in B222395: Diff 509200.Mar 28 2023, 8:33 PM
hauhsu added reviewers: ellis, phosek.Mar 28 2023, 8:33 PM
hauhsu updated this revision to Diff 509206.Mar 28 2023, 9:01 PM

Remove a redundant space.

Harbormaster completed remote builds in B222401: Diff 509206.Mar 28 2023, 9:41 PM
smeenai accepted this revision.Mar 28 2023, 11:16 PM
smeenai added a subscriber: beanz.

LGTM, unless @phosek or @beanz is aware of some subtlety here.

This revision is now accepted and ready to land.Mar 28 2023, 11:16 PM
phosek accepted this revision.Mar 28 2023, 11:51 PM

LGTM

Closed by commit rG7b67e965d97a: [compiler-rt] Fix cross-compiling detection (authored by hauhsu, committed by hau-hsu). · Explain WhyMar 29 2023, 10:17 PM
This revision was automatically updated to reflect the committed changes.
hau-hsu added a commit: rG7b67e965d97a: [compiler-rt] Fix cross-compiling detection.

Revision Contents

PathSize
compiler-rt/
2 lines

Diff 509548

compiler-rt/CMakeLists.txt

Show First 20 Lines • Show All 156 Lines • ▼ Show 20 Lines
set(COMPILER_RT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(COMPILER_RT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
pythonize_bool(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) pythonize_bool(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
# We support running instrumented tests when we're not cross-compiling # We support running instrumented tests when we're not cross-compiling
# and target a UNIX-like system or Windows. # and target a UNIX-like system or Windows.
# We can run tests on Android even when we are cross-compiling. # We can run tests on Android even when we are cross-compiling.
if(("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "${CMAKE_SYSTEM_NAME}" AND (UNIX OR WIN32)) if((NOT "${CMAKE_CROSSCOMPILING}" AND (UNIX OR WIN32))
OR ANDROID OR COMPILER_RT_EMULATOR) OR ANDROID OR COMPILER_RT_EMULATOR)
option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" ON) option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" ON)
else() else()
option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" OFF) option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" OFF)
endif() endif()
option(COMPILER_RT_DEBUG "Build runtimes with full debug info" OFF) option(COMPILER_RT_DEBUG "Build runtimes with full debug info" OFF)
option(COMPILER_RT_EXTERNALIZE_DEBUGINFO option(COMPILER_RT_EXTERNALIZE_DEBUGINFO
▲ Show 20 Lines • Show All 613 Lines • Show Last 20 Lines