From 1274761efa7ef10c7a88081828a15ec66c5e3f28 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 7 Jan 2016 14:57:07 +0100 Subject: sys-devel/clang: Remove ancient 3.0 version --- sys-devel/clang/Manifest | 2 - sys-devel/clang/clang-3.0-r4.ebuild | 213 --------------------- .../files/clang-3.0-fix_cxx_include_root.patch | 21 -- .../clang-3.0-freebsd-runtime-gcc-detection.patch | 20 -- .../files/clang-3.0-gentoo-binutils-apple.patch | 29 --- .../clang-3.0-linux-runtime-gcc-detection.patch | 43 ----- .../clang-3.0-recognize-amd-k10-enable-sse4a.patch | 82 -------- sys-devel/clang/metadata.xml | 1 - 8 files changed, 411 deletions(-) delete mode 100644 sys-devel/clang/clang-3.0-r4.ebuild delete mode 100644 sys-devel/clang/files/clang-3.0-fix_cxx_include_root.patch delete mode 100644 sys-devel/clang/files/clang-3.0-freebsd-runtime-gcc-detection.patch delete mode 100644 sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch delete mode 100644 sys-devel/clang/files/clang-3.0-linux-runtime-gcc-detection.patch delete mode 100644 sys-devel/clang/files/clang-3.0-recognize-amd-k10-enable-sse4a.patch (limited to 'sys-devel/clang') diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest index dba86e3f77b9..aead620ae0ed 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -1,8 +1,6 @@ -DIST clang-3.0.tar.gz 7240578 SHA256 b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d SHA512 0a31a2600cd4555424259331e0762f7fceeb5d828e7792983b2f8ae92bb75b3dc92cf84474e047deb5d4dab46062b4ac6273e6079159052debb76ae69927e517 WHIRLPOOL 521169cc588520090423cd1a2fa639da84e119281bf8260ea4b7b24fd2d8627806a281ddbbba5c378a736fc31279e25f10c4d3a3c81abd2c202970079a949ba5 DIST clang-3.1.src.tar.gz 8158418 SHA256 ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786 SHA512 14c033eda3e0c0a887a8410f6b6a1335e0f6bfa05950a903d302b06b95fd58b03894320e91e50fb4d330c5323be9e955d9054cee62d035e2753290354ea8f8cd WHIRLPOOL cdb578c287a417896d2d6fb297e96e44e8b951bad6e7d286b97bdd346b40dac6ffbb7015b39d69fa0f9e0994dede26612307b643f71480e3c8917199fe926357 DIST clang-3.2.src.tar.gz 8805311 SHA256 2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658 SHA512 99fc57d19b76c42af9821eaaa762056a926eb68178f6b7dd5e8bf092c9ee201a554b91d760d5a30a57f38102eae340e080ef8c6a39327f6881eda391b20b108d WHIRLPOOL 2cf88d1db0f108d8b8e8b0cf691cca18694ddb00b129dc8c1894fca67b5494a7f53f92ac9401d99ce687c9d8fb30dc267be1e68ee70edc542e998f5486ba8730 DIST compiler-rt-3.1.src.tar.gz 1259340 SHA256 1bd4624e7465b05ea713198f19c1c235bae2d35a411c15a4648300bc74294f5c SHA512 a010ed625ca54383bcc08dba77c4a686aed1c74d70c237a3cd20eafe9c1208f644699a600cbf1d14239db1b05a6d55f026f511f5a1eeec0a68888683c653e6fe WHIRLPOOL 6e21d28b30b52a039d5f16fb5b96238f453b58d5fabffffe0cc181061f619aaec2925bbe9f8af3dfe1ac39002fa52943617f94c44fb21cfe72d7aea460c0de0c DIST compiler-rt-3.2.src.tar.gz 1463061 SHA256 4ac311df0eead459cbb0f0890c06b55dae529ab45827ac73fef40bec632994aa SHA512 ef4223bd2d6051ec93a0943973aa61e7aa3686ac72f9a688d58a8b71deba1a7e64dcf821e0c53937899bbd7ba49218fee4e3649f19362fe59677daee314c063b WHIRLPOOL 176643360f683ddca28e4c77dc4ceb03513cec5cea98455598c934ec3e23bd6949a74852e50e42207c7171eb8013afe366f3b8c92799af66a04739ccebe4ed4e -DIST llvm-3.0.tar.gz 10350539 SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477 SHA512 602bb5590b70cb9138bc19d8c630c62bbabdcb2132215c921fe4bce4e3f74dfc66440b9dcd458ff55a86047cc9cc0417c6563715c133e0db222e4b88f07c13bb WHIRLPOOL 6f4ece3ec747352cd78b08d25c5b1cda91140eb6957d509161e45395e47c074f8d2102bfcaeabcdef8c1f6672f2cf06d88e290667666122da029391b3528d440 DIST llvm-3.1.src.tar.gz 11077429 SHA256 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab SHA512 fb941094601043e405ccc57473414ef92437b09c200e71614f93d8e93b2a58cca8d78c385be037e064b0711cd6268802c774ce4a40fc0ea17bf576305304d2aa WHIRLPOOL c5c72e139296e1c186131f991010f52f958063a4fcfcb1f8527b53a2aaa7edcaca70ab6cf86c25d08640dcf6d720a865fda7dc7eb06cf1ce9c23fd37b5d597ef DIST llvm-3.2.src.tar.gz 12275252 SHA256 125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343 SHA512 cc66171322dbbe40bcac0e0ea5b09df8ff52df63ded304f841f32f702270d6ab1512216413ee52498c3ebee8cd39c4cd23e3855d591944bc2ac0ae76f5be62cc WHIRLPOOL c3a39b2426293d0251b7769607ade873bb6bf8d54e7c8055773a9b75742bc8e39049fb71409a258c6f3d98775b78c280d4bfe4223ba91e5ed6ecae0eddf910e5 diff --git a/sys-devel/clang/clang-3.0-r4.ebuild b/sys-devel/clang/clang-3.0-r4.ebuild deleted file mode 100644 index dfd288b9bd8e..000000000000 --- a/sys-devel/clang/clang-3.0-r4.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -RESTRICT_PYTHON_ABIS="3.*" -SUPPORT_PYTHON_ABIS="1" - -inherit eutils multilib python - -DESCRIPTION="C language family frontend for LLVM" -HOMEPAGE="http://clang.llvm.org/" -# Fetching LLVM as well: see http://llvm.org/bugs/show_bug.cgi?id=4840 -SRC_URI="http://llvm.org/releases/${PV}/llvm-${PV}.tar.gz - http://llvm.org/releases/${PV}/${P}.tar.gz" - -LICENSE="UoI-NCSA" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug kernel_FreeBSD multitarget +static-analyzer system-cxx-headers test" - -DEPEND="static-analyzer? ( dev-lang/perl )" -RDEPEND="~sys-devel/llvm-${PV}[debug=,multitarget=]" - -S=${WORKDIR}/llvm-${PV}.src - -src_prepare() { - mv "${WORKDIR}"/clang-${PV}.src "${S}"/tools/clang || die "clang source directory move failed" - - # Same as llvm doc patches - epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch - - # multilib-strict - sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \ - -i tools/clang/lib/Headers/Makefile \ - || die "clang Makefile failed" - # Fix cxx_include_root path for Gentoo - epatch "${FILESDIR}"/${P/_*}-fix_cxx_include_root.patch - # fix the static analyzer for in-tree install - sed -e 's/import ScanView/from clang \0/' \ - -i tools/clang/tools/scan-view/scan-view \ - || die "scan-view sed failed" - sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \ - -i tools/clang/tools/scan-build/scan-build \ - || die "scan-build sed failed" - # Set correct path for gold plugin - sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \ - -i tools/clang/lib/Driver/Tools.cpp \ - || die "gold plugin path sed failed" - # Properly detect Gentoo's binutils-apple version (committed in trunk) - epatch "${FILESDIR}"/${PN}-3.0-gentoo-binutils-apple.patch - # Specify python version - python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view - python_convert_shebangs -r 2 test/Scripts - - # From llvm src_prepare - einfo "Fixing install dirs" - sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ - -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ - -e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \ - -i Makefile.config.in || die "Makefile.config sed failed" - - einfo "Fixing rpath and CFLAGS" - sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \ - -e '/OmitFramePointer/s/-fomit-frame-pointer//' \ - -i Makefile.rules || die "rpath sed failed" - - # Use system llc (from llvm ebuild) for tests - sed -e "/^registered_targets =/s/os.path.join(llvm_tools_dir, 'llc')/'llc'/" \ - -i tools/clang/test/lit.cfg || die "test path sed failed" - - # AMD K10 CPUs + SSE4a support, bug #398357 - epatch "${FILESDIR}"/${P}-recognize-amd-k10-enable-sse4a.patch - - # Automatically select active system GCC's libraries, bug #406163 - epatch "${FILESDIR}"/${P}-linux-runtime-gcc-detection.patch - - # Fix search paths on FreeBSD, bug #409269 - epatch "${FILESDIR}"/${P}-freebsd-runtime-gcc-detection.patch - - # User patches - epatch_user -} - -src_configure() { - local CONF_FLAGS="--enable-shared - --with-optimize-option= - $(use_enable !debug optimized) - $(use_enable debug assertions) - $(use_enable debug expensive-checks)" - - # Setup the search path to include the Prefix includes - if use prefix ; then - CONF_FLAGS="${CONF_FLAGS} \ - --with-c-include-dirs=${EPREFIX}/usr/include:/usr/include" - fi - - if use multitarget; then - CONF_FLAGS="${CONF_FLAGS} --enable-targets=all" - else - CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only" - fi - - if use amd64; then - CONF_FLAGS="${CONF_FLAGS} --enable-pic" - fi - - if use system-cxx-headers; then - # Try to get current gcc headers path - local CXX_PATH=$(gcc-config -L| cut -d: -f1) - CONF_FLAGS="${CONF_FLAGS} --with-c-include-dirs=/usr/include:${CXX_PATH}/include" - CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=${CXX_PATH}/include/g++-v4" - CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-arch=$CHOST" - if has_multilib_profile; then - CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-32bit-dir=/32" - fi - fi - - econf ${CONF_FLAGS} || die "econf failed" -} - -src_compile() { - emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only || die "emake failed" -} - -src_test() { - cd "${S}"/test || die "cd failed" - emake site.exp || die "updating llvm site.exp failed" - - cd "${S}"/tools/clang || die "cd clang failed" - - # Broken test always assuming i386 host with multilib gcc 4.6.0 - # http://llvm.org/bugs/show_bug.cgi?id=11094 - rm -f test/Driver/linux-ld.c - - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - - testing() { - if ! emake -j1 VERBOSE=1 test; then - has test $FEATURES && die "Make test failed. See above for details." - has test $FEATURES || eerror "Make test failed. See above for details." - fi - } - python_execute_function testing -} - -src_install() { - cd "${S}"/tools/clang || die "cd clang failed" - emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed" - - if use static-analyzer ; then - dobin tools/scan-build/ccc-analyzer - dosym ccc-analyzer /usr/bin/c++-analyzer - dobin tools/scan-build/scan-build - - insinto /usr/share/${PN} - doins tools/scan-build/scanview.css - doins tools/scan-build/sorttable.js - - cd tools/scan-view || die "cd scan-view failed" - dobin scan-view - install-scan-view() { - insinto "$(python_get_sitedir)"/clang - doins Reporter.py Resources ScanView.py startfile.py - touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py - } - python_execute_function install-scan-view - fi - - # Fix install_names on Darwin. The build system is too complicated - # to just fix this, so we correct it post-install - if [[ ${CHOST} == *-darwin* ]] ; then - for lib in libclang.dylib ; do - ebegin "fixing install_name of $lib" - install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \ - "${ED}"/usr/lib/llvm/${lib} - eend $? - done - for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do - ebegin "fixing references in ${f##*/}" - install_name_tool \ - -change "@rpath/libclang.dylib" \ - "${EPREFIX}"/usr/lib/llvm/libclang.dylib \ - -change "@executable_path/../lib/libLLVM-${PV}.dylib" \ - "${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \ - -change "${S}"/Release/lib/libclang.dylib \ - "${EPREFIX}"/usr/lib/llvm/libclang.dylib \ - "${ED}"/$f - eend $? - done - fi - - # Remove unnecessary headers on FreeBSD, bug #417171 - use kernel_FreeBSD && rm "${ED}/usr/lib/clang/3.1/include/"{arm_neon,std,float,iso,limits,tgmath,varargs}*.h -} - -pkg_postinst() { - python_mod_optimize clang - if use system-cxx-headers; then - elog "C++ headers search path is hardcoded to the active gcc profile one" - elog "If you change the active gcc profile, or update gcc to a new version," - elog "you will have to remerge this package to update the search path" - else - elog "If clang++ fails to find C++ headers on your system," - elog "you can remerge clang with USE=system-cxx-headers to use C++ headers" - elog "from the active gcc profile" - fi -} - -pkg_postrm() { - python_mod_cleanup clang -} diff --git a/sys-devel/clang/files/clang-3.0-fix_cxx_include_root.patch b/sys-devel/clang/files/clang-3.0-fix_cxx_include_root.patch deleted file mode 100644 index e1beff3f1615..000000000000 --- a/sys-devel/clang/files/clang-3.0-fix_cxx_include_root.patch +++ /dev/null @@ -1,21 +0,0 @@ -Bug #387309 - ---- llvm/tools/clang/lib/Driver/ToolChains.cpp.orig 2011-11-09 23:10:04.000000000 +0100 -+++ llvm/tools/clang/lib/Driver/ToolChains.cpp 2011-11-09 23:11:04.000000000 +0100 -@@ -1586,12 +1586,13 @@ - // This is of the form /foo/bar/include/c++/4.5.2/ - if (CxxIncludeRoot.back() == '/') - llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the / -+ llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the g++-v4 -+ llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the include - StringRef Version = llvm::sys::path::filename(CxxIncludeRoot); - llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the version -- llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the c++ -- llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the include -+ llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the ARCH - GccInstallPath = CxxIncludeRoot.str(); -- GccInstallPath.append("/lib/gcc/"); -+ GccInstallPath.append("/"); - GccInstallPath.append(CXX_INCLUDE_ARCH); - GccInstallPath.append("/"); - GccInstallPath.append(Version); diff --git a/sys-devel/clang/files/clang-3.0-freebsd-runtime-gcc-detection.patch b/sys-devel/clang/files/clang-3.0-freebsd-runtime-gcc-detection.patch deleted file mode 100644 index 5c016f551c11..000000000000 --- a/sys-devel/clang/files/clang-3.0-freebsd-runtime-gcc-detection.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -upNr a/llvm-3.0.src/tools/clang/lib/Driver/ToolChains.cpp b/llvm-3.0.src/tools/clang/lib/Driver/ToolChains.cpp ---- a/llvm-3.0.src/tools/clang/lib/Driver/ToolChains.cpp 2012-05-23 15:45:01.333127000 -0400 -+++ b/llvm-3.0.src/tools/clang/lib/Driver/ToolChains.cpp 2012-05-23 16:16:26.023642076 -0400 -@@ -1215,6 +1215,16 @@ FreeBSD::FreeBSD(const HostInfo &Host, c - } else { - getFilePaths().push_back("/usr/lib"); - } -+ -+ llvm::OwningPtr File; -+ if (!llvm::MemoryBuffer::getFile("/etc/env.d/gcc/config-" + getDriver().DefaultHostTriple, File)) -+ { -+ bool Exists; -+ StringRef Version = File.get()->getBuffer().rsplit('-').second.substr(0,5); -+ const std::string GentooPath = "/usr/lib/gcc/" + getDriver().DefaultHostTriple + "/" + Version.str(); -+ if (!llvm::sys::fs::exists(GentooPath + "/crtbegin.o", Exists) && Exists) -+ getFilePaths().push_back(GentooPath); -+ } - } - - Tool &FreeBSD::SelectTool(const Compilation &C, const JobAction &JA, diff --git a/sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch b/sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch deleted file mode 100644 index 944ccaf4fa20..000000000000 --- a/sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch +++ /dev/null @@ -1,29 +0,0 @@ -http://llvm.org/bugs/show_bug.cgi?id=8339 -https://bugs.gentoo.org/show_bug.cgi?id=395013 -http://llvm.org/viewvc/llvm-project?view=rev&revision=151612 - -Tweak version detection bit to cope with Gentoo's slightly different -output for ld -v. - ---- autoconf/m4/link_options.m4 -+++ autoconf/m4/link_options.m4 -@@ -10,7 +10,7 @@ - - # Check for ld64. - if (echo "$version_string" | grep -q "ld64"); then -- llvm_cv_link_version=$(echo "$version_string" | sed -e "s#.*ld64-\([^ ]*\)#\1#") -+ llvm_cv_link_version=$(echo "$version_string" | sed -e "s#.*ld64-\([^ ]*\)\( (.*)\)\?#\1#") - else - llvm_cv_link_version=$(echo "$version_string" | sed -e "s#[^0-9]*\([0-9.]*\).*#\1#") - fi ---- configure -+++ configure -@@ -7528,7 +7528,7 @@ - - # Check for ld64. - if (echo "$version_string" | grep -q "ld64"); then -- llvm_cv_link_version=$(echo "$version_string" | sed -e "s#.*ld64-\([^ ]*\)#\1#") -+ llvm_cv_link_version=$(echo "$version_string" | sed -e "s#.*ld64-\([^ ]*\)\( (.*)\)\?#\1#") - else - llvm_cv_link_version=$(echo "$version_string" | sed -e "s#[^0-9]*\([0-9.]*\).*#\1#") - fi diff --git a/sys-devel/clang/files/clang-3.0-linux-runtime-gcc-detection.patch b/sys-devel/clang/files/clang-3.0-linux-runtime-gcc-detection.patch deleted file mode 100644 index a1f7ce2a98fb..000000000000 --- a/sys-devel/clang/files/clang-3.0-linux-runtime-gcc-detection.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -upNr a/llvm-3.0.src/tools/clang/lib/Driver/ToolChains.cpp b/llvm-3.0.src/tools/clang/lib/Driver/ToolChains.cpp ---- a/llvm-3.0.src/tools/clang/lib/Driver/ToolChains.cpp 2012-05-23 15:39:01.070411000 -0400 -+++ b/llvm-3.0.src/tools/clang/lib/Driver/ToolChains.cpp 2012-05-23 15:39:22.371785000 -0400 -@@ -1382,6 +1382,7 @@ enum LinuxDistro { - DebianSqueeze, - DebianWheezy, - Exherbo, -+ Gentoo, - RHEL4, - RHEL5, - RHEL6, -@@ -1403,6 +1404,10 @@ enum LinuxDistro { - UnknownDistro - }; - -+static bool IsGentoo(enum LinuxDistro Distro) { -+ return Distro == Gentoo; -+} -+ - static bool IsRedhat(enum LinuxDistro Distro) { - return Distro == Fedora13 || Distro == Fedora14 || - Distro == Fedora15 || Distro == FedoraRawhide || -@@ -1433,7 +1438,9 @@ static LinuxDistro DetectLinuxDistro(llv - SmallVector Lines; - Data.split(Lines, "\n"); - for (unsigned int i = 0, s = Lines.size(); i < s; ++ i) { -- if (Lines[i] == "DISTRIB_CODENAME=hardy") -+ if (Lines[i] == "DISTRIB_ID=\"Gentoo\"") -+ return Gentoo; -+ else if (Lines[i] == "DISTRIB_CODENAME=hardy") - return UbuntuHardy; - else if (Lines[i] == "DISTRIB_CODENAME=intrepid") - return UbuntuIntrepid; -@@ -1597,6 +1604,9 @@ Linux::GCCInstallationDetector::GCCInsta - GccInstallPath.append("/"); - GccInstallPath.append(CXX_INCLUDE_ARCH); - GccInstallPath.append("/"); -+ llvm::OwningPtr File; -+ if (!llvm::MemoryBuffer::getFile("/etc/env.d/gcc/config-" + D.DefaultHostTriple, File)) -+ Version = File.get()->getBuffer().rsplit('-').second.substr(0,5); - GccInstallPath.append(Version); - GccParentLibPath = GccInstallPath + "/../../.."; - IsValid = true; diff --git a/sys-devel/clang/files/clang-3.0-recognize-amd-k10-enable-sse4a.patch b/sys-devel/clang/files/clang-3.0-recognize-amd-k10-enable-sse4a.patch deleted file mode 100644 index 90f99abc344a..000000000000 --- a/sys-devel/clang/files/clang-3.0-recognize-amd-k10-enable-sse4a.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- llvm.orig/contrib/llvm/tools/clang/lib/Basic/Targets.cpp 2011/10/22 14:08:43 226633 -+++ llvm/contrib/llvm/tools/clang/lib/Basic/Targets.cpp 2011/10/30 22:20:17 226951 -@@ -1282,6 +1282,7 @@ - CK_K8SSE3, - CK_Opteron, - CK_OpteronSSE3, -+ CK_AMDFAM10, - - /// This specification is deprecated and will be removed in the future. - /// Users should prefer \see CK_K8. -@@ -1381,6 +1382,7 @@ - .Case("k8-sse3", CK_K8SSE3) - .Case("opteron", CK_Opteron) - .Case("opteron-sse3", CK_OpteronSSE3) -+ .Case("amdfam10", CK_AMDFAM10) - .Case("x86-64", CK_x86_64) - .Case("geode", CK_Geode) - .Default(CK_Generic); -@@ -1441,6 +1443,7 @@ - case CK_K8SSE3: - case CK_Opteron: - case CK_OpteronSSE3: -+ case CK_AMDFAM10: - case CK_x86_64: - return true; - } -@@ -1459,12 +1462,10 @@ - Features["ssse3"] = false; - Features["sse41"] = false; - Features["sse42"] = false; -+ Features["sse4a"] = false; - Features["aes"] = false; - Features["avx"] = false; - -- // LLVM does not currently recognize this. -- // Features["sse4a"] = false; -- - // FIXME: This *really* should not be here. - - // X86_64 always has SSE2. -@@ -1561,6 +1562,11 @@ - setFeatureEnabled(Features, "sse3", true); - setFeatureEnabled(Features, "3dnowa", true); - break; -+ case CK_AMDFAM10: -+ setFeatureEnabled(Features, "sse3", true); -+ setFeatureEnabled(Features, "sse4a", true); -+ setFeatureEnabled(Features, "3dnowa", true); -+ break; - case CK_C3_2: - setFeatureEnabled(Features, "mmx", true); - setFeatureEnabled(Features, "sse", true); -@@ -1604,6 +1610,8 @@ - else if (Name == "avx") - Features["avx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = - Features["ssse3"] = Features["sse41"] = Features["sse42"] = true; -+ else if (Name == "sse4a") -+ Features["sse4a"] = true; - } else { - if (Name == "mmx") - Features["mmx"] = Features["3dnow"] = Features["3dnowa"] = false; -@@ -1630,6 +1638,8 @@ - Features["aes"] = false; - else if (Name == "avx") - Features["avx"] = false; -+ else if (Name == "sse4a") -+ Features["sse4a"] = false; - } - - return true; -@@ -1826,6 +1836,11 @@ - Builder.defineMacro("__k8__"); - Builder.defineMacro("__tune_k8__"); - break; -+ case CK_AMDFAM10: -+ Builder.defineMacro("__amdfam10"); -+ Builder.defineMacro("__amdfam10__"); -+ Builder.defineMacro("__tune_amdfam10__"); -+ break; - case CK_Geode: - Builder.defineMacro("__geode"); - Builder.defineMacro("__geode__"); diff --git a/sys-devel/clang/metadata.xml b/sys-devel/clang/metadata.xml index 733ab073136f..2414ef910df3 100644 --- a/sys-devel/clang/metadata.xml +++ b/sys-devel/clang/metadata.xml @@ -34,6 +34,5 @@ Conformance with C/C++/ObjC and their variants Build all host targets (default: host only) Install the Clang static analyzer - By default, clang++ searchs for C++ headers in a series of hardcoded paths. Enabling this flag will force it to use the active gcc profile ones -- cgit v1.2.3-65-gdbad