commit: 659e44e507c880979f9b59a6f0dbcd1d2bca7983
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 4 08:04:30 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 4 08:05:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659e44e5
sys-libs/compiler-rt-sanitizers: Add orc flag for 13+
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
profiles/arch/amd64/package.use.mask | 2 +-
profiles/arch/base/package.use.mask | 2 +-
.../compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild | 5 +++--
.../compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc1.ebuild | 5 +++--
.../compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild | 5 +++--
sys-libs/compiler-rt-sanitizers/metadata.xml | 1 +
6 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/profiles/arch/amd64/package.use.mask
b/profiles/arch/amd64/package.use.mask
index e2b47d92c06..45038734214 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -53,7 +53,7 @@ net-misc/asterisk -blocks
sys-libs/compiler-rt-sanitizers -asan -dfsan -lsan -msan -hwasan -tsan
sys-libs/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
sys-libs/compiler-rt-sanitizers -gwp-asan
-sys-libs/compiler-rt-sanitizers -libfuzzer -memprof -profile -xray
+sys-libs/compiler-rt-sanitizers -libfuzzer -memprof -orc -profile -xray
# Sam James <s...@gentoo.org> (2020-10-24)
# asm redc is only available on amd64,
diff --git a/profiles/arch/base/package.use.mask
b/profiles/arch/base/package.use.mask
index e9acf79d2f2..40d37ef6f55 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -48,7 +48,7 @@ net-misc/asterisk blocks
sys-libs/compiler-rt-sanitizers asan dfsan lsan msan hwasan tsan
sys-libs/compiler-rt-sanitizers ubsan safestack cfi scudo
sys-libs/compiler-rt-sanitizers shadowcallstack gwp-asan
-sys-libs/compiler-rt-sanitizers libfuzzer memprof profile xray
+sys-libs/compiler-rt-sanitizers libfuzzer memprof orc profile xray
# Sam James <s...@gentoo.org> (2020-10-24)
# asm redc is only available on amd64,
diff --git
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
index cc239e8feec..86e4d10a7c7 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
@@ -14,7 +14,7 @@ SLOT="$(ver_cut 1-3)"
KEYWORDS=""
IUSE="+clang test elibc_glibc"
# base targets
-IUSE+=" +libfuzzer +memprof +profile +xray"
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
# sanitizer targets, keep in sync with config-ix.cmake
# NB: ubsan, scudo deliberately match two entries
SANITIZER_FLAGS=(
@@ -23,7 +23,7 @@ SANITIZER_FLAGS=(
)
IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
REQUIRED_USE="
- || ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray )
+ || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
test? (
cfi? ( ubsan )
gwp-asan? ( scudo )
@@ -126,6 +126,7 @@ src_configure() {
-DCOMPILER_RT_BUILD_CRT=OFF
-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+ -DCOMPILER_RT_BUILD_ORC=$(usex orc)
-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
diff --git
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc1.ebuild
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc1.ebuild
index cc239e8feec..86e4d10a7c7 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc1.ebuild
@@ -14,7 +14,7 @@ SLOT="$(ver_cut 1-3)"
KEYWORDS=""
IUSE="+clang test elibc_glibc"
# base targets
-IUSE+=" +libfuzzer +memprof +profile +xray"
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
# sanitizer targets, keep in sync with config-ix.cmake
# NB: ubsan, scudo deliberately match two entries
SANITIZER_FLAGS=(
@@ -23,7 +23,7 @@ SANITIZER_FLAGS=(
)
IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
REQUIRED_USE="
- || ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray )
+ || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
test? (
cfi? ( ubsan )
gwp-asan? ( scudo )
@@ -126,6 +126,7 @@ src_configure() {
-DCOMPILER_RT_BUILD_CRT=OFF
-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+ -DCOMPILER_RT_BUILD_ORC=$(usex orc)
-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
diff --git
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
index cc239e8feec..86e4d10a7c7 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
@@ -14,7 +14,7 @@ SLOT="$(ver_cut 1-3)"
KEYWORDS=""
IUSE="+clang test elibc_glibc"
# base targets
-IUSE+=" +libfuzzer +memprof +profile +xray"
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
# sanitizer targets, keep in sync with config-ix.cmake
# NB: ubsan, scudo deliberately match two entries
SANITIZER_FLAGS=(
@@ -23,7 +23,7 @@ SANITIZER_FLAGS=(
)
IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
REQUIRED_USE="
- || ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray )
+ || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
test? (
cfi? ( ubsan )
gwp-asan? ( scudo )
@@ -126,6 +126,7 @@ src_configure() {
-DCOMPILER_RT_BUILD_CRT=OFF
-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+ -DCOMPILER_RT_BUILD_ORC=$(usex orc)
-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
diff --git a/sys-libs/compiler-rt-sanitizers/metadata.xml
b/sys-libs/compiler-rt-sanitizers/metadata.xml
index b1905bb2cb0..bfdf4ba33fb 100644
--- a/sys-libs/compiler-rt-sanitizers/metadata.xml
+++ b/sys-libs/compiler-rt-sanitizers/metadata.xml
@@ -9,6 +9,7 @@
than the default CC/CXX).</flag>
<flag name="libfuzzer">Build fuzzing runtime.</flag>
<flag name="memprof">Build memory profiler runtime.</flag>
+ <flag name="orc">Build ORC runtime.</flag>
<flag name="profile">Build profiling runtime.</flag>
<flag name="sanitize">Build sanitizer runtimes.</flag>
<flag name="xray">Build XRay runtime.</flag>
