commit: 876b76fa9d1a0746fb493e57387450a77b16d24a Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Fri Dec 13 01:52:23 2019 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Fri Dec 13 01:52:23 2019 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=876b76fa
sys-devel/clang: Remove stale clang Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> sys-devel/clang/Manifest | 4 - sys-devel/clang/clang-6.0.1.ebuild | 334 --------------------- ...d-invalidated-iterator-in-insertTargetAnd.patch | 55 ---- ...oss-DSO-CFI-Android-sanitizer-test-for-rt.patch | 30 -- .../files/6.0.0/0003-Add-Gentoo-Linux-distro.patch | 33 -- .../hardened/0001-Use-z-relro-on-Gentoo.patch | 11 - .../0002-Enable-Stack-Protector-by-default.patch | 25 -- .../hardened/0003-Enable-PIE-by-default.patch | 12 - ...04-Enable-FORTIFY_SOURCE-macro-by-default.patch | 35 --- ...005-Link-with-z-now-by-default-for-Gentoo.patch | 11 - ...oss-DSO-CFI-Android-sanitizer-test-for-rt.patch | 30 -- .../files/6.0.1/darwin_prefix-include-paths.patch | 18 -- sys-devel/clang/metadata.xml | 35 --- 13 files changed, 633 deletions(-) diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest deleted file mode 100644 index 6abbf06..0000000 --- a/sys-devel/clang/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9 -DIST clang-tools-extra-6.0.1.src.tar.xz 757256 BLAKE2B 1d91d7459a34e7251007af91db1803ee6d04f1ef3e0fcf134a7e0d1d3456b094a80339ee60db3f0bdd12961f3a05caee7edfc5c6b9c48d49cd55a5dc3c102c3a SHA512 cf29d117b6dabcb7a8e5f6dab5016ce5a5c8f475679001a43fd5c935f2c368f37cdef50aae2080a1e4524f647f6d83458d4a5dec5b45d03fb374f463caf7c3f5 -DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df54505d5db2504bc61860a7260343722ec8cdd5e937d0843263a5bf5077b9cf386c337fa127039b996bab10d2ca5c2caeb59 SHA512 c468e97a2d5610aee9e72cb795e4e65375a079d733550f05380230fb44ba0ed67d407ad06e2340b66f13d19c06583b657e8d01fcdca2146ae43964cea309e0b3 -DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9 diff --git a/sys-devel/clang/clang-6.0.1.ebuild b/sys-devel/clang/clang-6.0.1.ebuild deleted file mode 100644 index 3cf5d11..0000000 --- a/sys-devel/clang/clang-6.0.1.ebuild +++ /dev/null @@ -1,334 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils eapi7-ver flag-o-matic llvm \ - multilib-minimal multiprocessing pax-utils prefix python-single-r1 \ - toolchain-funcs - -MY_P=cfe-${PV/_/}.src -EXTRA_P=clang-tools-extra-${PV/_/}.src -LLVM_P=llvm-${PV/_/}.src - -DESCRIPTION="C language family frontend for LLVM" -HOMEPAGE="https://llvm.org/" -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz - https://releases.llvm.org/${PV/_//}/${EXTRA_P}.tar.xz - test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz ) - !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )" - -# Keep in sync with sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} - -LICENSE="UoI-NCSA" -SLOT="$(ver_cut 1)" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="debug default-compiler-rt default-libcxx doc hardened +static-analyzer - test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}] - static-analyzer? ( - dev-lang/perl:* - z3? ( sci-mathematics/z3:0= ) - ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - ${PYTHON_DEPS}" -# configparser-3.2 breaks the build (3.3 or none at all are fine) -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) - xml? ( virtual/pkgconfig ) - !!<dev-python/configparser-3.3.0.2 - ${PYTHON_DEPS}" -RDEPEND="${RDEPEND} - !<sys-devel/llvm-4.0.0_rc:0 - !sys-devel/clang:0" -PDEPEND=" - sys-devel/clang-common - ~sys-devel/clang-runtime-${PV} - default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) - default-libcxx? ( >=sys-libs/libcxx-${PV} )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( ${ALL_LLVM_TARGETS[*]} )" - -# We need extra level of indirection for CLANG_RESOURCE_DIR -S=${WORKDIR}/x/y/${MY_P} - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - -PATCHES=( - # add Prefix include paths for Darwin - "${FILESDIR}"/6.0.1/darwin_prefix-include-paths.patch - - # fix test failure with default-compiler-rt - # https://bugs.gentoo.org/650316 - "${FILESDIR}"/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch - - # IsGentooLinux() is only used in hardened patches at the moment - "${FILESDIR}"/6.0.0/0003-Add-Gentoo-Linux-distro.patch -) -HARDENED_PATCHES=( - "${FILESDIR}"/6.0.0/hardened/0001-Use-z-relro-on-Gentoo.patch - "${FILESDIR}"/6.0.0/hardened/0002-Enable-Stack-Protector-by-default.patch - "${FILESDIR}"/6.0.0/hardened/0003-Enable-PIE-by-default.patch - "${FILESDIR}"/6.0.0/hardened/0004-Enable-FORTIFY_SOURCE-macro-by-default.patch - "${FILESDIR}"/6.0.0/hardened/0005-Link-with-z-now-by-default-for-Gentoo.patch -) - -# Multilib notes: -# 1. ABI_* flags control ABIs libclang* is built for only. -# 2. clang is always capable of compiling code for all ABIs for enabled -# target. However, you will need appropriate crt* files (installed -# e.g. by sys-devel/gcc and sys-libs/glibc). -# 3. ${CHOST}-clang wrappers are always installed for all ABIs included -# in the current profile (i.e. alike supported by sys-devel/gcc). -# -# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need -# multilib clang* libraries (not runtime, not wrappers). - -pkg_setup() { - LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup - python-single-r1_pkg_setup -} - -src_unpack() { - # create extra parent dir for CLANG_RESOURCE_DIR - mkdir -p x/y || die - cd x/y || die - - einfo "Unpacking ${MY_P}.tar.xz ..." - tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die - einfo "Unpacking ${EXTRA_P}.tar.xz ..." - tar -xf "${DISTDIR}/${EXTRA_P}.tar.xz" || die - - mv "${EXTRA_P}" "${S}"/tools/extra || die - if use test; then - einfo "Unpacking parts of ${LLVM_P}.tar.xz ..." - tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \ - "${LLVM_P}"/utils/{lit,llvm-lit,unittest} || die - mv "${LLVM_P}" "${WORKDIR}"/llvm || die - fi - - if ! use doc; then - einfo "Unpacking llvm-${PV}-manpages.tar.bz2 ..." - tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die - fi -} - -src_prepare() { - use hardened && eapply "${HARDENED_PATCHES[@]}" - - cmake-utils_src_prepare - eprefixify lib/Frontend/InitHeaderSearch.cpp -} - -multilib_src_configure() { - local llvm_version=$(llvm-config --version) || die - local clang_version=$(ver_cut 1-3 "${llvm_version}") - - local mycmakeargs=( - # ensure that the correct llvm-config is used - -DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - # relative to bindir - -DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}" - - -DBUILD_SHARED_LIBS=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" - -DLLVM_BUILD_TESTS=$(usex test) - - # these are not propagated reliably, so redefine them - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - - -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml) - # libgomp support fails to find headers without explicit -I - # furthermore, it provides only syntax checking - -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp - - # override default stdlib and rtlib - -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "") - -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "") - - -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) - -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) - # z3 is not multilib-friendly - -DCLANG_ANALYZER_BUILD_Z3=$(multilib_native_usex z3) - ) - use test && mycmakeargs+=( - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" - ) - - if multilib_is_native_abi; then - mycmakeargs+=( - # normally copied from LLVM_INCLUDE_DOCS but the latter - # is lacking value in stand-alone builds - -DCLANG_INCLUDE_DOCS=$(usex doc) - -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc) - ) - use doc && mycmakeargs+=( - -DLLVM_BUILD_DOCS=ON - -DLLVM_ENABLE_SPHINX=ON - -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" - -DSPHINX_WARNINGS_AS_ERRORS=OFF - ) - use z3 && mycmakeargs+=( - -DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3" - ) - else - mycmakeargs+=( - -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF - ) - fi - - if [[ -n ${EPREFIX} ]]; then - mycmakeargs+=( - -DGCC_INSTALL_PREFIX="${EPREFIX}/usr" - ) - fi - - if tc-is-cross-compiler; then - [[ -x "/usr/bin/clang-tblgen" ]] \ - || die "/usr/bin/clang-tblgen not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DCLANG_TABLEGEN=/usr/bin/clang-tblgen - ) - fi - - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - - # provide a symlink for tests - if [[ ! -L ${WORKDIR}/lib/clang ]]; then - mkdir -p "${WORKDIR}"/lib || die - ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die - fi -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check-clang - multilib_is_native_abi && cmake-utils_src_make check-clang-tools -} - -src_install() { - MULTILIB_WRAPPED_HEADERS=( - /usr/include/clang/Config/config.h - ) - - multilib-minimal_src_install - - # Move runtime headers to /usr/lib/clang, where they belong - mv "${ED%/}"/usr/include/clangrt "${ED%/}"/usr/lib/clang || die - # move (remaining) wrapped headers back - mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die - - # Apply CHOST and version suffix to clang tools - # note: we use two version components here (vs 3 in runtime path) - local llvm_version=$(llvm-config --version) || die - local clang_version=$(ver_cut 1-2 "${llvm_version}") - local clang_full_version=$(ver_cut 1-3 "${llvm_version}") - local clang_tools=( clang clang++ clang-cl clang-cpp ) - local abi i - - # cmake gives us: - # - clang-X.Y - # - clang -> clang-X.Y - # - clang++, clang-cl, clang-cpp -> clang - # we want to have: - # - clang-X.Y - # - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y - # - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y - # also in CHOST variant - for i in "${clang_tools[@]:1}"; do - rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die - dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}" - dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}" - done - - # now create target symlinks for all supported ABIs - for abi in $(get_all_abis); do - local abi_chost=$(get_abi_CHOST "${abi}") - for i in "${clang_tools[@]}"; do - dosym "${i}-${clang_version}" \ - "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}" - dosym "${abi_chost}-${i}-${clang_version}" \ - "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}" - done - done - - # Remove unnecessary headers on FreeBSD, bug #417171 - if use kernel_FreeBSD; then - rm "${ED}"usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die - fi -} - -multilib_src_install() { - cmake-utils_src_install - - # move headers to /usr/include for wrapping & ABI mismatch checks - # (also drop the version suffix from runtime headers) - rm -rf "${ED%/}"/usr/include || die - mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die - mv "${ED%/}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED%/}"/usr/include/clangrt || die -} - -multilib_src_install_all() { - python_fix_shebang "${ED}" - if use static-analyzer; then - python_optimize "${ED}"usr/lib/llvm/${SLOT}/share/scan-view - fi - - # install pre-generated manpages - if ! use doc; then - insinto "/usr/lib/llvm/${SLOT}/share/man/man1" - doins "${WORKDIR}/x/y/llvm-${PV}-manpages/clang"/*.1 - fi - - docompress "/usr/lib/llvm/${SLOT}/share/man" - # match 'html' non-compression - use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" - # +x for some reason; TODO: investigate - use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1" -} - -pkg_postinst() { - if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then - eselect compiler-shadow update all - fi - - elog "You can find additional utility scripts in:" - elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/clang" - elog "To use these scripts, you will need Python 2.7. Some of them are vim" - elog "integration scripts (with instructions inside). The run-clang-tidy.py" - elog "scripts requires the following additional package:" - elog " dev-python/pyyaml" -} - -pkg_postrm() { - if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then - eselect compiler-shadow clean all - fi -} diff --git a/sys-devel/clang/files/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch b/sys-devel/clang/files/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch deleted file mode 100644 index 20ba89b..0000000 --- a/sys-devel/clang/files/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 99418eabfbe5378d7a751444856c6c5c656519c4 Mon Sep 17 00:00:00 2001 -From: Serge Pavlov <sepavl...@gmail.com> -Date: Mon, 19 Mar 2018 16:13:43 +0000 -Subject: [PATCH 1/2] [Driver] Avoid invalidated iterator in - insertTargetAndModeArgs - -Doing an .insert() can potentially invalidate iterators by reallocating the -vector's storage. When all the stars align just right, this causes segfaults -or glibc aborts. - -Gentoo Linux bug (crashes while building Chromium): https://bugs.gentoo.org/650082. - -Patch by Hector Martin! - -Differential Revision: https://reviews.llvm.org/D44607 - - -git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@327863 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - tools/driver/driver.cpp | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp -index fa757da953..1b614accb2 100644 ---- a/tools/driver/driver.cpp -+++ b/tools/driver/driver.cpp -@@ -212,20 +212,21 @@ static void insertTargetAndModeArgs(const ParsedClangName &NameParts, - // Put target and mode arguments at the start of argument list so that - // arguments specified in command line could override them. Avoid putting - // them at index 0, as an option like '-cc1' must remain the first. -- auto InsertionPoint = ArgVector.begin(); -- if (InsertionPoint != ArgVector.end()) -+ int InsertionPoint = 0; -+ if (ArgVector.size() > 0) - ++InsertionPoint; - - if (NameParts.DriverMode) { - // Add the mode flag to the arguments. -- ArgVector.insert(InsertionPoint, -+ ArgVector.insert(ArgVector.begin() + InsertionPoint, - GetStableCStr(SavedStrings, NameParts.DriverMode)); - } - - if (NameParts.TargetIsValid) { - const char *arr[] = {"-target", GetStableCStr(SavedStrings, - NameParts.TargetPrefix)}; -- ArgVector.insert(InsertionPoint, std::begin(arr), std::end(arr)); -+ ArgVector.insert(ArgVector.begin() + InsertionPoint, -+ std::begin(arr), std::end(arr)); - } - } - --- -2.16.2 - diff --git a/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch b/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch deleted file mode 100644 index 0c66448..0000000 --- a/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f81bc3f2d174ac21e576cdddb736524531258fbe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> -Date: Mon, 19 Mar 2018 20:55:47 +0100 -Subject: [PATCH 2/2] [test] Fix Cross-DSO CFI Android sanitizer test for - -rtlib=compiler-rt - -Fix the CHECK-CFI-CROSS-DSO-ANDROID test to be more precise and match -specifically 'clang_rt.cfi' rather than any compiler-rt library. This -fixes the failure when the linker command-line contains -clang_rt.builtins library due to CLANG_DEFAULT_RTLIB=compiler-rt. ---- - test/Driver/sanitizer-ld.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/Driver/sanitizer-ld.c b/test/Driver/sanitizer-ld.c -index 0da4255f69..9309450186 100644 ---- a/test/Driver/sanitizer-ld.c -+++ b/test/Driver/sanitizer-ld.c -@@ -514,7 +514,7 @@ - // RUN: --sysroot=%S/Inputs/basic_android_tree \ - // RUN: | FileCheck --check-prefix=CHECK-CFI-CROSS-DSO-ANDROID %s - // CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}" --// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt. -+// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt.cfi - - // Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime. - // RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso %s -### -o %t.o 2>&1 \ --- -2.16.2 - diff --git a/sys-devel/clang/files/6.0.0/0003-Add-Gentoo-Linux-distro.patch b/sys-devel/clang/files/6.0.0/0003-Add-Gentoo-Linux-distro.patch deleted file mode 100644 index a11dcfe..0000000 --- a/sys-devel/clang/files/6.0.0/0003-Add-Gentoo-Linux-distro.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/include/clang/Driver/Distro.h -+++ b/include/clang/Driver/Distro.h -@@ -26,6 +26,7 @@ public: - // NB: Releases of a particular Linux distro should be kept together - // in this enum, because some tests are done by integer comparison against - // the first and last known member in the family, e.g. IsRedHat(). -+ GentooLinux, - AlpineLinux, - ArchLinux, - DebianLenny, -@@ -98,6 +99,10 @@ public: - /// @name Convenience Predicates - /// @{ - -+ bool IsGentooLinux() const { -+ return DistroVal == GentooLinux; -+ } -+ - bool IsRedhat() const { - return DistroVal == Fedora || (DistroVal >= RHEL5 && DistroVal <= RHEL7); - } ---- a/lib/Driver/Distro.cpp -+++ b/lib/Driver/Distro.cpp -@@ -129,6 +129,9 @@ static Distro::DistroType DetectDistro(vfs::FileSystem &VFS) { - if (VFS.exists("/etc/arch-release")) - return Distro::ArchLinux; - -+ if (VFS.exists("/etc/gentoo-release")) -+ return Distro::GentooLinux; -+ - return Distro::UnknownDistro; - } - diff --git a/sys-devel/clang/files/6.0.0/hardened/0001-Use-z-relro-on-Gentoo.patch b/sys-devel/clang/files/6.0.0/hardened/0001-Use-z-relro-on-Gentoo.patch deleted file mode 100644 index 653c933..0000000 --- a/sys-devel/clang/files/6.0.0/hardened/0001-Use-z-relro-on-Gentoo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/Driver/ToolChains/Linux.cpp -+++ b/lib/Driver/ToolChains/Linux.cpp -@@ -210,7 +210,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) - - Distro Distro(D.getVFS()); - -- if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux()) { -+ if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || Distro.IsGentooLinux()) { - ExtraOpts.push_back("-z"); - ExtraOpts.push_back("relro"); - } diff --git a/sys-devel/clang/files/6.0.0/hardened/0002-Enable-Stack-Protector-by-default.patch b/sys-devel/clang/files/6.0.0/hardened/0002-Enable-Stack-Protector-by-default.patch deleted file mode 100644 index 2f5faf5..0000000 --- a/sys-devel/clang/files/6.0.0/hardened/0002-Enable-Stack-Protector-by-default.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/lib/Driver/ToolChains/Linux.cpp -+++ b/lib/Driver/ToolChains/Linux.cpp -@@ -820,6 +820,10 @@ bool Linux::isPIEDefault() const { - getTriple().isMusl() || getSanitizerArgs().requiresPIE(); - } - -+unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const { -+ return 2; -+} -+ - SanitizerMask Linux::getSupportedSanitizers() const { - const bool IsX86 = getTriple().getArch() == llvm::Triple::x86; - const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64;diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp -diff --git a/lib/Driver/ToolChains/Linux.h b/lib/Driver/ToolChains/Linux.h -index 9778c1832cc..ddd46a1d587 100644 ---- a/lib/Driver/ToolChains/Linux.h -+++ b/lib/Driver/ToolChains/Linux.h -@@ -36,6 +36,7 @@ public: - void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const override; - bool isPIEDefault() const override; -+ unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const override; - SanitizerMask getSupportedSanitizers() const override; - void addProfileRTLibs(const llvm::opt::ArgList &Args, - llvm::opt::ArgStringList &CmdArgs) const override; diff --git a/sys-devel/clang/files/6.0.0/hardened/0003-Enable-PIE-by-default.patch b/sys-devel/clang/files/6.0.0/hardened/0003-Enable-PIE-by-default.patch deleted file mode 100644 index 2b9ad5e..0000000 --- a/sys-devel/clang/files/6.0.0/hardened/0003-Enable-PIE-by-default.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/lib/Driver/ToolChains/Linux.cpp -+++ b/lib/Driver/ToolChains/Linux.cpp -@@ -816,8 +816,7 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs, - } - - bool Linux::isPIEDefault() const { -- return (getTriple().isAndroid() && !getTriple().isAndroidVersionLT(16)) || -- getTriple().isMusl() || getSanitizerArgs().requiresPIE(); -+ return true; - } - - unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const { diff --git a/sys-devel/clang/files/6.0.0/hardened/0004-Enable-FORTIFY_SOURCE-macro-by-default.patch b/sys-devel/clang/files/6.0.0/hardened/0004-Enable-FORTIFY_SOURCE-macro-by-default.patch deleted file mode 100644 index 410bae9..0000000 --- a/sys-devel/clang/files/6.0.0/hardened/0004-Enable-FORTIFY_SOURCE-macro-by-default.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 68d39575cdff576b85907bea8e42b7ef26384dbb Mon Sep 17 00:00:00 2001 -From: Matthias Dahl <matthias.d...@binary-island.eu> -Date: Wed, 20 Sep 2017 16:17:31 +0200 -Subject: [PATCH 3/3] Enable FORTIFY_SOURCE macro by default - -FORTIFY_SOURCE only works for optimization levels > 0 and is currently not -compatible with the address sanitizer, thus the macro is only set if the input -language is C or C++ and the optimization level > 0 while the address sanitizer -is not requested. ---- - lib/Frontend/CompilerInvocation.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp -index 0d0869c815d..88c16534103 100644 ---- a/lib/Frontend/CompilerInvocation.cpp -+++ b/lib/Frontend/CompilerInvocation.cpp -@@ -2694,6 +2694,14 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Res, - !LangOpts.Sanitize.has(SanitizerKind::Address) && - !LangOpts.Sanitize.has(SanitizerKind::Memory); - -+ // Set the macro before the command line macros are being processed, so it can be -+ // properly unset if required to in case of incompatibilities. -+ if (Res.getCodeGenOpts().OptimizationLevel > 0 && -+ (DashX.getLanguage() == InputKind::C || DashX.getLanguage() == InputKind::CXX) && -+ !LangOpts.Sanitize.has(SanitizerKind::Address)) { -+ Res.getPreprocessorOpts().addMacroDef("_FORTIFY_SOURCE=2"); -+ } -+ - // FIXME: ParsePreprocessorArgs uses the FileManager to read the contents of - // PCH file and find the original header name. Remove the need to do that in - // ParsePreprocessorArgs and remove the FileManager --- -2.14.1 - diff --git a/sys-devel/clang/files/6.0.0/hardened/0005-Link-with-z-now-by-default-for-Gentoo.patch b/sys-devel/clang/files/6.0.0/hardened/0005-Link-with-z-now-by-default-for-Gentoo.patch deleted file mode 100644 index 28942ae..0000000 --- a/sys-devel/clang/files/6.0.0/hardened/0005-Link-with-z-now-by-default-for-Gentoo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/Driver/ToolChains/Linux.cpp -+++ b/lib/Driver/ToolChains/Linux.cpp -@@ -210,7 +210,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) - - Distro Distro(D.getVFS()); - -- if (Distro.IsAlpineLinux()) { -+ if (Distro.IsAlpineLinux() || Distro.IsGentooLinux()) { - ExtraOpts.push_back("-z"); - ExtraOpts.push_back("now"); - } diff --git a/sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch b/sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch deleted file mode 100644 index 0c66448..0000000 --- a/sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f81bc3f2d174ac21e576cdddb736524531258fbe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> -Date: Mon, 19 Mar 2018 20:55:47 +0100 -Subject: [PATCH 2/2] [test] Fix Cross-DSO CFI Android sanitizer test for - -rtlib=compiler-rt - -Fix the CHECK-CFI-CROSS-DSO-ANDROID test to be more precise and match -specifically 'clang_rt.cfi' rather than any compiler-rt library. This -fixes the failure when the linker command-line contains -clang_rt.builtins library due to CLANG_DEFAULT_RTLIB=compiler-rt. ---- - test/Driver/sanitizer-ld.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/Driver/sanitizer-ld.c b/test/Driver/sanitizer-ld.c -index 0da4255f69..9309450186 100644 ---- a/test/Driver/sanitizer-ld.c -+++ b/test/Driver/sanitizer-ld.c -@@ -514,7 +514,7 @@ - // RUN: --sysroot=%S/Inputs/basic_android_tree \ - // RUN: | FileCheck --check-prefix=CHECK-CFI-CROSS-DSO-ANDROID %s - // CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}" --// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt. -+// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt.cfi - - // Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime. - // RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso %s -### -o %t.o 2>&1 \ --- -2.16.2 - diff --git a/sys-devel/clang/files/6.0.1/darwin_prefix-include-paths.patch b/sys-devel/clang/files/6.0.1/darwin_prefix-include-paths.patch deleted file mode 100644 index 7744b94..0000000 --- a/sys-devel/clang/files/6.0.1/darwin_prefix-include-paths.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/lib/Frontend/InitHeaderSearch.cpp -+++ b/lib/Frontend/InitHeaderSearch.cpp -@@ -233,6 +233,7 @@ - case llvm::Triple::Bitrig: - break; - default: -+ AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false); - // FIXME: temporary hack: hard-coded paths. - AddPath("/usr/local/include", System, false); - break; -@@ -505,6 +506,7 @@ - // Add the default framework include paths on Darwin. - if (HSOpts.UseStandardSystemIncludes) { - if (triple.isOSDarwin()) { -+ AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true); - AddPath("/System/Library/Frameworks", System, true); - AddPath("/Library/Frameworks", System, true); - } diff --git a/sys-devel/clang/metadata.xml b/sys-devel/clang/metadata.xml deleted file mode 100644 index 04b324c..0000000 --- a/sys-devel/clang/metadata.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>l...@gentoo.org</email> - </maintainer> - <longdescription>The goal of the Clang project is to create a new C, C++, Objective C and Objective C++ front-end for the LLVM compiler. - -Features and Goals - -Some of the goals for the project include the following: - -End-User Features: -Fast compiles and low memory use -Expressive diagnostics -GCC compatibility -Utility and Applications: - -Modular library based architecture -Support diverse clients (refactoring, static analysis, code generation, etc) -Allow tight integration with IDEs -Use the LLVM BSD License -Internal Design and Implementation: - -A real-world, production quality compiler -A simple and hackable code base -A single unified parser for C, Objective C, C++, and Objective C++ -Conformance with C/C++/ObjC and their variants</longdescription> - <use> - <flag name="default-compiler-rt">Use compiler-rt instead of libgcc as the default rtlib for clang</flag> - <flag name="default-libcxx">Use libc++ instead of libstdc++ as the default stdlib for clang</flag> - <flag name="static-analyzer">Install the Clang static analyzer</flag> - <flag name="z3">Enable the static analyzer constraint manager backend using <pkg>sci-mathematics/z3</pkg></flag> - </use> -</pkgmetadata>