summaryrefslogtreecommitdiff
path: root/sys-libs/compiler-rt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-11-03 16:06:58 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-11-03 16:06:58 +0000
commitbd4aeefe33e63f613512604e47bfca7b2187697d (patch)
treeadb35b5a9a00ee7ea591ab0c987f70167c23b597 /sys-libs/compiler-rt
parent48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
gentoo resync : 03.11.2019
Diffstat (limited to 'sys-libs/compiler-rt')
-rw-r--r--sys-libs/compiler-rt/Manifest7
-rw-r--r--sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild11
-rw-r--r--sys-libs/compiler-rt/compiler-rt-9.0.0-r1.ebuild (renamed from sys-libs/compiler-rt/compiler-rt-9.0.0.ebuild)17
-rw-r--r--sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild12
-rw-r--r--sys-libs/compiler-rt/files/9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch41
5 files changed, 60 insertions, 28 deletions
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index d6b20e0bb439..8d9f6f2b3b9d 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,11 +1,12 @@
+AUX 9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch 1552 BLAKE2B 5045e2cc506282a6fb708c21e916a0e4ff24f0ccfbeb6d27af506c085ff759c203377e12ab969e40a2fbb9834bbc190de0e649061aec1b2ddd36b52ed99ede11 SHA512 d52245c1eaf650f8f666b9ec352332202fa5d76bdefd37a85f0c6939fecd8be80e386485851990efc918e53e82280489d0653d7c4e90637f328bd131bde6f6cb
DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
DIST compiler-rt-9.0.0.src.tar.xz 1993084 BLAKE2B 4aece9570df4cc38aaa58a3740aa0e1b5cbfe0bfc2d1a590e9e95871fda6ba4dcdeab6125d243c31ce5130386235475339f13da9f900b505eb2fec850a711646 SHA512 a7bb0a67165d29317cee58c22ed79f0d6a9cb9279dcd355d4267f3cd6c531a7be455a28267c591d6e2c0f9c56e363d40c10a405391e07d02ab3e30f00ffef2a8
-EBUILD compiler-rt-10.0.0.9999.ebuild 2921 BLAKE2B 3f96154943747cc7a8945c8af75880650e919266dda3232fb1c6984c8fb2af92dde32e0557f2c3b9805cefac69166fa34aa42b42f6bb1ec328b389757f7f2fa1 SHA512 fc713062020b5ed70e12ceaaf2043d4e907a8d840e152b43a8177f892985d116475818048262162fd856392ba2080a6c7b830a52bc590b5d12c379d375e7c1be
+EBUILD compiler-rt-10.0.0.9999.ebuild 2750 BLAKE2B c1be7a966c49f9b035b9ba8cdbb0b2e5b839a6a96ca68b45cc412a1bd5e94c41dcdb1df865723a758365cf176a5e5e77d2be1eed3dfb67cae341a854258849e8 SHA512 3958a62494587f94138cfe86e588f456ac75442f9ab7081c7aebb1719345e828e41dcf79f13d7fd2f857d52acf450aa3331589cc285c02ab8a86d9e330c52e38
EBUILD compiler-rt-6.0.1.ebuild 2899 BLAKE2B 9db37364c5e328b38c64dc2c6ed076b944e2d3528e17bb34ec2ade4e498226f8c3f26196ac416ff51bd0b64335856b7161a6ca2b264a8db331fa4626d9b3eac6 SHA512 ea9086fc9943fc9910522d1672fb0448b47c51ad81aa3c0d59282c6109f63a87190392c46c3cb234427ef190fa116e8b4232f089c428e1b28ea80744285e8e50
EBUILD compiler-rt-7.1.0.ebuild 2900 BLAKE2B 60bec479b6e5caa39b98e5bf54621e9cf395c7e20ce0269d336153811f39de065b53744c11bded995899a6be33cf207c0c4a091b4be8a9ce8b8b479d26b057e8 SHA512 6cf5d533db3bbc75125f40439f8a6132f6c0c4fa04bd1d6007e9014ae4638fb1e99d475da780e07d12509873c26d129696cbd657c6c0b79521aa0561a927b23e
EBUILD compiler-rt-8.0.1.ebuild 2938 BLAKE2B 6ce7229e928bbd6b269b3d37ad233f188e831fc2dd3153346eecad4a031a6a6f7a82fa8c25020fc8169eeeeede6e138aee2d7b3f520be02c1f5450bb802fac9a SHA512 567c3cd3d932f02a5d0f627cac45fbbeb403b346a421e805a8a48289bddc8868d1307f35cd37f7d6ab60ecf466c0651c93dc1ace24b99971a3a131f0d12d6261
-EBUILD compiler-rt-9.0.0.ebuild 2966 BLAKE2B 242c593f1dda27843a3bd6c929ea535d8455435392f48fb2581bddc3e9e6ed81bca70838d94553892c82e306ad40ec5a9ca0a639e97c2ff422b2febde226cb02 SHA512 3edb443f357d3e2508b08616259e668b5f49281a90ccd32c6c5d290c6ec4dd2b500f28cc631974806d8c7006340c21b45034b76ebe4026eb88cd116be49c2e88
-EBUILD compiler-rt-9.0.1.9999.ebuild 2946 BLAKE2B 94fd398f887d1d5726a8397621864353d72b081b57e981bb2cc77199cb42419f590c0f45cb7c2e3ea8ad431efccef0091557d7169b009c5796a92d384c0c84f1 SHA512 8ea75505267484b1aa9f9f873fba4bdb745903f4618d38a151cfb1f66b9e251c5f6647731fb99d108447a4bac1d9878e06b958cf4d922cb8a4a5601d879219b0
+EBUILD compiler-rt-9.0.0-r1.ebuild 2997 BLAKE2B 641abc9127b63a93a8c79762fc2a4a0136cec073b1869a9a9bdae1be0cb2db8b933d2562d26bb43f69b81828fb8af334f2737c2012af625437e824629eed7cb7 SHA512 af614fd60c9aba59d4ff7d35155632befa2f5d364572fc784c9c43fe5f1e76bfa0571bc84376e05cc1aa3f3b8f9b3d8219a0fd9e08dbfc016d7ce64c7b9a4098
+EBUILD compiler-rt-9.0.1.9999.ebuild 2750 BLAKE2B c1be7a966c49f9b035b9ba8cdbb0b2e5b839a6a96ca68b45cc412a1bd5e94c41dcdb1df865723a758365cf176a5e5e77d2be1eed3dfb67cae341a854258849e8 SHA512 3958a62494587f94138cfe86e588f456ac75442f9ab7081c7aebb1719345e828e41dcf79f13d7fd2f857d52acf450aa3331589cc285c02ab8a86d9e330c52e38
MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
index 13a5397acde0..1c0ee0530aff 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
@@ -3,19 +3,14 @@
EAPI=7
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils flag-o-matic git-r3 llvm multiprocessing \
+inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
python-any-r1 toolchain-funcs
DESCRIPTION="Compiler runtime library for clang (built-in part)"
HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git
- https://github.com/llvm-mirror/compiler-rt.git"
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="$(ver_cut 1-3)"
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.0-r1.ebuild
index bfb57a667381..ed72a058928f 100644
--- a/sys-libs/compiler-rt/compiler-rt-9.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9.0.0-r1.ebuild
@@ -3,19 +3,14 @@
EAPI=7
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils flag-o-matic llvm multiprocessing \
+inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
python-any-r1 toolchain-funcs
-MY_P=${P}.src
DESCRIPTION="Compiler runtime library for clang (built-in part)"
HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="$(ver_cut 1-3)"
@@ -37,6 +32,12 @@ BDEPEND="
# least intrusive of all
CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+ # Fix building broken crtbegin/crtend
+ # https://bugs.gentoo.org/698086
+ "${FILESDIR}"/9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch
+)
+
pkg_pretend() {
if ! use clang && ! tc-is-clang; then
ewarn "Building using a compiler other than clang may result in broken atomics"
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild
index 88bfd8aa0ad2..1c0ee0530aff 100644
--- a/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild
@@ -3,20 +3,14 @@
EAPI=7
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils flag-o-matic git-r3 llvm multiprocessing \
+inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
python-any-r1 toolchain-funcs
DESCRIPTION="Compiler runtime library for clang (built-in part)"
HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git
- https://github.com/llvm-mirror/compiler-rt.git"
-EGIT_BRANCH="release_90"
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="$(ver_cut 1-3)"
diff --git a/sys-libs/compiler-rt/files/9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch b/sys-libs/compiler-rt/files/9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch
new file mode 100644
index 000000000000..ccae96cad98a
--- /dev/null
+++ b/sys-libs/compiler-rt/files/9.0.0/0001-compiler-rt-crt-make-test-case-nontrivial-in-check_c.patch
@@ -0,0 +1,41 @@
+From 155a43edb0c161bb5122ad4eeee991b43a0278bc Mon Sep 17 00:00:00 2001
+From: Jian Cai <caij2003@gmail.com>
+Date: Mon, 16 Sep 2019 21:47:47 +0000
+Subject: [PATCH] [compiler-rt][crt] make test case nontrivial in
+ check_cxx_section_exists
+
+Summary:
+.init_array gets optimized away when building with -O2 and as a result,
+check_cxx_section_exists failed to pass -DCOMPILER_RT_HAS_INITFINI_ARRAY
+when building crtbegin.o and crtend.o, which causes binaries linked with
+them encounter segmentation fault. See https://crbug.com/855759 for
+details. This change prevents .init_array section to be optimized away
+even with -O2 or higher optimization level.
+
+Subscribers: dberris, mgorny, #sanitizers, llvm-commits
+
+Tags: #sanitizers, #llvm
+
+Differential Revision: https://reviews.llvm.org/D67628
+
+llvm-svn: 372038
+---
+ lib/crt/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/crt/CMakeLists.txt b/lib/crt/CMakeLists.txt
+index 34c368f7ca4..90e94b93db4 100644
+--- a/lib/crt/CMakeLists.txt
++++ b/lib/crt/CMakeLists.txt
+@@ -70,7 +70,7 @@ function(check_cxx_section_exists section output)
+ endfunction()
+
+ check_cxx_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY
+- SOURCE "__attribute__((constructor)) void f() {}\nint main() { return 0; }\n")
++ SOURCE "volatile int x;\n__attribute__((constructor)) void f() {x = 0;}\nint main() { return 0; }\n")
+
+ append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 CRT_CFLAGS)
+ append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS)
+--
+2.23.0
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 21:43:12 +0000