aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstefson <herrtimson@yahoo.de>2018-10-27 18:44:33 +0200
committerAnthony G. Basile <blueness@gentoo.org>2018-10-29 07:38:04 -0400
commit184148a287f9c84840a8b3cec607be1ca2aa7623 (patch)
tree194f52d0d10a3d32cec0594bb01978e6512eacce /sys-libs
parentsys-devel/gcc: upgrade patchsets, this fixes insecure runtime paths of libvtv (diff)
downloadmusl-184148a287f9c84840a8b3cec607be1ca2aa7623.tar.gz
musl-184148a287f9c84840a8b3cec607be1ca2aa7623.tar.bz2
musl-184148a287f9c84840a8b3cec607be1ca2aa7623.zip
sys-libs/compiler-rt-sanitizers: fix compile for arm
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild4
-rw-r--r--sys-libs/compiler-rt-sanitizers/files/0001-fixup-for-interception_type_test.patch14
2 files changed, 17 insertions, 1 deletions
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
index d2a3805..176e836 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
@@ -40,7 +40,9 @@ DEPEND="
S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}"/${PN}-6.0.1-musl-patches.patch )
+PATCHES=( "${FILESDIR}"/${PN}-6.0.1-musl-patches.patch
+ "${FILESDIR}"/0001-fixup-for-interception_type_test.patch
+ )
# least intrusive of all
CMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/sys-libs/compiler-rt-sanitizers/files/0001-fixup-for-interception_type_test.patch b/sys-libs/compiler-rt-sanitizers/files/0001-fixup-for-interception_type_test.patch
new file mode 100644
index 0000000..746f53c
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/files/0001-fixup-for-interception_type_test.patch
@@ -0,0 +1,14 @@
+diff --git a/lib/interception/interception_type_test.cc b/lib/interception/interception_type_test.cc
+index 2b3a6d5..21c2fb3 100644
+--- a/lib/interception/interception_type_test.cc
++++ b/lib/interception/interception_type_test.cc
+@@ -32,8 +32,8 @@ COMPILER_CHECK(sizeof(::OFF64_T) == sizeof(off64_t));
+ // The following are the cases when pread (and friends) is used instead of
+ // pread64. In those cases we need OFF_T to match off_t. We don't care about the
+ // rest (they depend on _FILE_OFFSET_BITS setting when building an application).
+-# if SANITIZER_ANDROID || !defined _FILE_OFFSET_BITS || \
+- _FILE_OFFSET_BITS != 64
++# if SANITIZER_ANDROID || !defined _FILE_OFFSET_BITS && !SANITIZER_NONGNU || \
++ _FILE_OFFSET_BITS != 64 && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(::OFF_T) == sizeof(off_t));
+ # endif