This is an archive of the discontinued LLVM Phabricator instance.

Differential D156388

[libc] _INCLUDE_SCUDO: check for compiler-rt in enabled RUNTIMES too
ClosedPublic

Authored by alfredfo on Jul 26 2023, 6:34 PM.

Details

Reviewers
michaelrj
sivachandra
thesamesam
Commits
rGfe9c3c786837: [libc] _INCLUDE_SCUDO: check for compiler-rt in enabled RUNTIMES too
Summary

Previously including SCUDO in a libc build with runtimes/ as root was
not possible since this code only checked for compiler-rt enabled via
LLVM_ENABLED_PROJECTS.

Diff Detail

Event Timeline

alfredfo created this revision.Jul 26 2023, 6:34 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJul 26 2023, 6:34 PM
Herald added subscribers: libc-commits, yaneury, Chia-hungDuan and 2 others. · View Herald Transcript
alfredfo requested review of this revision.Jul 26 2023, 6:34 PM
Harbormaster completed remote builds in B248420: Diff 544576.Jul 26 2023, 6:41 PM
thesamesam accepted this revision.Jul 26 2023, 7:41 PM
thesamesam added inline comments.
libc/CMakeLists.txt
168

Maybe tweak this, but I don't feel super strongly about it.

This revision is now accepted and ready to land.Jul 26 2023, 7:41 PM
alfredfo updated this revision to Diff 544582.Jul 26 2023, 8:47 PM

change msg

Harbormaster completed remote builds in B248425: Diff 544582.Jul 26 2023, 8:52 PM
Closed by commit rGfe9c3c786837: [libc] _INCLUDE_SCUDO: check for compiler-rt in enabled RUNTIMES too (authored by alfredfo, committed by thesamesam). · Explain WhyJul 26 2023, 9:12 PM
This revision was automatically updated to reflect the committed changes.
thesamesam added a commit: rGfe9c3c786837: [libc] _INCLUDE_SCUDO: check for compiler-rt in enabled RUNTIMES too.

Revision Contents

PathSize
libc/
2 lines

Diff 544576

libc/CMakeLists.txt

Show First 20 Lines • Show All 158 Lines • ▼ Show 20 Lines else()
To disable linting set LLVM_LIBC_ENABLE_LINTING to OFF To disable linting set LLVM_LIBC_ENABLE_LINTING to OFF
(pass -DLLVM_LIBC_ENABLE_LINTING=OFF to cmake).") (pass -DLLVM_LIBC_ENABLE_LINTING=OFF to cmake).")
endif() endif()
endif() endif()
endif() endif()
option(LLVM_LIBC_INCLUDE_SCUDO "Include the SCUDO standalone as the allocator for LLVM libc" OFF) option(LLVM_LIBC_INCLUDE_SCUDO "Include the SCUDO standalone as the allocator for LLVM libc" OFF)
if(LLVM_LIBC_INCLUDE_SCUDO) if(LLVM_LIBC_INCLUDE_SCUDO)
if (NOT "compiler-rt" IN_LIST LLVM_ENABLE_PROJECTS) if (NOT ("compiler-rt" IN_LIST LLVM_ENABLE_PROJECTS OR "compiler-rt" IN_LIST LLVM_ENABLE_RUNTIMES))
message(FATAL_ERROR "SCUDO cannot be included without adding compiler-rt to LLVM_ENABLE_PROJECTS") message(FATAL_ERROR "SCUDO cannot be included without adding compiler-rt to LLVM_ENABLE_PROJECTS")
thesamesamUnsubmitted
Not Done
ReplyInline Actions

Maybe tweak this, but I don't feel super strongly about it.

thesamesam: Maybe tweak this, but I don't feel super strongly about it.
endif() endif()
endif() endif()
option(LIBC_INCLUDE_DOCS "Build the libc documentation." ${LLVM_INCLUDE_DOCS}) option(LIBC_INCLUDE_DOCS "Build the libc documentation." ${LLVM_INCLUDE_DOCS})
include(CMakeParseArguments) include(CMakeParseArguments)
include(LLVMLibCCheckCpuFeatures) include(LLVMLibCCheckCpuFeatures)
include(LLVMLibCRules) include(LLVMLibCRules)
▲ Show 20 Lines • Show All 84 Lines • Show Last 20 Lines