This is an archive of the discontinued LLVM Phabricator instance.

Differential D158906

[BOLT] Fix cross-compilation build
ClosedPublic

Authored by rafauler on Aug 25 2023, 4:09 PM.

Details

Reviewers
Amir
maksfb
Group Reviewers
Restricted Project
Commits
rGb9deec1cd9ca: [BOLT] Fix cross-compilation build
Summary

Don't enable BOLT runtime when cross compiling as we don't
support this scenario yet.

Diff Detail

Event Timeline

rafauler created this revision.Aug 25 2023, 4:09 PM
Herald added a reviewer: Amir. · View Herald TranscriptAug 25 2023, 4:09 PM
Herald added a reviewer: maksfb. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: treapster, ayermolo. · View Herald Transcript
rafauler requested review of this revision.Aug 25 2023, 4:09 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 25 2023, 4:09 PM
Herald added subscribers: llvm-commits, yota9. · View Herald Transcript
rafauler mentioned this in D151942: [BOLT] Instrumentation: AArch64 instrumentation support in runtime.Aug 25 2023, 4:09 PM
rafauler added a comment.Aug 25 2023, 5:32 PM

I'll commit this fix since this seems low-risk enough to unblock buildbots crosscompiling. If it is not an adequate fix, feel free to revert it.

This revision was not accepted when it landed; it landed in state Needs Review.Aug 25 2023, 5:33 PM
This revision was landed with ongoing or failed builds.
Closed by commit rGb9deec1cd9ca: [BOLT] Fix cross-compilation build (authored by rafauler). · Explain Why
This revision was automatically updated to reflect the committed changes.
rafauler added a commit: rGb9deec1cd9ca: [BOLT] Fix cross-compilation build.
Harbormaster completed remote builds in B255023: Diff 553659.Aug 25 2023, 5:50 PM

Revision Contents

PathSize
bolt/
3 lines

Diff 553676

bolt/CMakeLists.txt

Show All 29 Linesforeach (tgt ${BOLT_TARGETS_TO_BUILD})
endif() endif()
message(STATUS "Targeting ${tgt} in llvm-bolt") message(STATUS "Targeting ${tgt} in llvm-bolt")
endforeach() endforeach()
set(BOLT_ENABLE_RUNTIME_default OFF) set(BOLT_ENABLE_RUNTIME_default OFF)
if ((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" if ((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64"
OR CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") OR CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
AND (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND (CMAKE_SYSTEM_NAME STREQUAL "Linux"
OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")) OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
AND (NOT CMAKE_CROSSCOMPILING))
set(BOLT_ENABLE_RUNTIME_default ON) set(BOLT_ENABLE_RUNTIME_default ON)
endif() endif()
option(BOLT_ENABLE_RUNTIME "Enable BOLT runtime" ${BOLT_ENABLE_RUNTIME_default}) option(BOLT_ENABLE_RUNTIME "Enable BOLT runtime" ${BOLT_ENABLE_RUNTIME_default})
if (BOLT_ENABLE_RUNTIME) if (BOLT_ENABLE_RUNTIME)
# Some systems prevent reading /proc/self/map_files # Some systems prevent reading /proc/self/map_files
execute_process(COMMAND ls /proc/self/map_files execute_process(COMMAND ls /proc/self/map_files
RESULT_VARIABLE LS OUTPUT_QUIET ERROR_QUIET) RESULT_VARIABLE LS OUTPUT_QUIET ERROR_QUIET)
if (LS) if (LS)
▲ Show 20 Lines • Show All 103 Lines • Show Last 20 Lines