summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-07 15:05:42 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-07 23:09:41 +0100
commitf75ad7b8a7305f27f7b5f533194d86336250dbf1 (patch)
tree851d5f13e9921bb0978dd7d47e6812645fbc4164 /sys-devel
parentsys-devel/llvm: Remove ancient 3.0 version (diff)
downloadgentoo-f75ad7b8a7305f27f7b5f533194d86336250dbf1.tar.gz
gentoo-f75ad7b8a7305f27f7b5f533194d86336250dbf1.tar.bz2
gentoo-f75ad7b8a7305f27f7b5f533194d86336250dbf1.zip
sys-devel/clang: Remove ancient 3.1 version
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/clang/Manifest3
-rw-r--r--sys-devel/clang/clang-3.1-r5.ebuild204
-rw-r--r--sys-devel/clang/files/cl-patches/clang-0001-Add-r600-TargetInfo.patch100
-rw-r--r--sys-devel/clang/files/cl-patches/clang-0002-r600-Add-some-target-builtins.patch111
-rw-r--r--sys-devel/clang/files/cl-patches/clang-0003-r600-Add-read_global_size-and-read_local_size-builti.patch31
-rw-r--r--sys-devel/clang/files/cl-patches/llvm-0001-r600-Add-some-intrinsic-definitions.patch64
-rw-r--r--sys-devel/clang/files/cl-patches/llvm-0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch27
-rw-r--r--sys-devel/clang/files/clang-3.1-increase-parser-recursion-limit.patch15
8 files changed, 0 insertions, 555 deletions
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index aead620ae0ed..f77149fc13c7 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,6 +1,3 @@
-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.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.1-r5.ebuild b/sys-devel/clang/clang-3.1-r5.ebuild
deleted file mode 100644
index 34f3243e11bd..000000000000
--- a/sys-devel/clang/clang-3.1-r5.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-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}.src.tar.gz
- http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.gz
- http://llvm.org/releases/${PV}/${P}.src.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug kernel_FreeBSD multitarget +static-analyzer 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"
- mv "${WORKDIR}"/compiler-rt-${PV}.src "${S}"/projects/compiler-rt \
- || die "compiler-rt 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"
- sed -e "/PROJ_resources/s#lib/clang#$(get_libdir)/clang#" \
- -i tools/clang/runtime/compiler-rt/Makefile \
- || die "compiler-rt Makefile failed"
- # 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"
- # Specify python version
- python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
- python_convert_shebangs -r 2 test/Scripts
- python_convert_shebangs 2 projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-
- # 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 "/^llc_props =/s/os.path.join(llvm_tools_dir, 'llc')/'llc'/" \
- -i tools/clang/test/lit.cfg || die "test path sed failed"
-
- # Automatically select active system GCC's libraries, bugs #406163 and #417913
- epatch "${FILESDIR}"/${P}-gentoo-runtime-gcc-detection-v3.patch
-
- # Fix search paths on FreeBSD, bug #409269
- epatch "${FILESDIR}"/${P}-gentoo-freebsd-fix-lib-path.patch
-
- # Fix regression caused by removal of USE=system-cxx-headers, bug #417541
- epatch "${FILESDIR}"/${P}-gentoo-freebsd-fix-cxx-paths-v2.patch
-
- # Increase recursion limit, bug #417545, upstream r155737
- epatch "${FILESDIR}"/${P}-increase-parser-recursion-limit.patch
-
- # Apply r600 OpenCL-related patches, bug #425688
- epatch "${FILESDIR}"/cl-patches/llvm-*.patch
- pushd tools/clang &>/dev/null || die
- epatch "${FILESDIR}"/cl-patches/clang-*.patch
- popd &>/dev/null || die
-
- # 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,cpp"
- fi
-
- if use amd64; then
- CONF_FLAGS="${CONF_FLAGS} --enable-pic"
- fi
-
- # clang prefers clang over gcc, so we may need to force that
- tc-export CC CXX
- econf ${CONF_FLAGS}
-}
-
-src_compile() {
- emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only
-}
-
-src_test() {
- cd "${S}"/test || die "cd failed"
- emake site.exp
-
- cd "${S}"/tools/clang || die "cd clang failed"
-
- 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
-
- 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/$(get_libdir)/clang/${PV}/include/{arm_neon,std,float,iso,limits,tgmath,varargs}*.h
-}
-
-pkg_postinst() {
- python_mod_optimize clang
-}
-
-pkg_postrm() {
- python_mod_cleanup clang
-}
diff --git a/sys-devel/clang/files/cl-patches/clang-0001-Add-r600-TargetInfo.patch b/sys-devel/clang/files/cl-patches/clang-0001-Add-r600-TargetInfo.patch
deleted file mode 100644
index 929b5d37028f..000000000000
--- a/sys-devel/clang/files/cl-patches/clang-0001-Add-r600-TargetInfo.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 70cae83ffd093f183dec07c464db3c0bb6b92c10 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Fri, 2 Mar 2012 10:54:52 -0500
-Subject: [PATCH 1/3] Add r600 TargetInfo
-
----
- lib/Basic/Targets.cpp | 70 +++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 70 insertions(+), 0 deletions(-)
-
-diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
-index 85dfd78..64dc01c 100644
---- a/lib/Basic/Targets.cpp
-+++ b/lib/Basic/Targets.cpp
-@@ -1068,6 +1068,73 @@ namespace {
- }
-
- namespace {
-+
-+class AMDGPUTargetInfo : public TargetInfo {
-+public:
-+
-+ AMDGPUTargetInfo(const std::string& triple) : TargetInfo(triple) { }
-+
-+ virtual const char * getClobbers() const {
-+ return "";
-+ }
-+
-+ virtual void getGCCRegNames(const char * const *&Names,
-+ unsigned &numNames) const {
-+ Names = NULL;
-+ numNames = 0;
-+ }
-+
-+ virtual void getGCCRegAliases(const GCCRegAlias *&Aliases,
-+ unsigned &NumAliases) const {
-+ Aliases = NULL;
-+ NumAliases = 0;
-+ }
-+
-+ virtual bool validateAsmConstraint(const char *&Name,
-+ TargetInfo::ConstraintInfo &info) const {
-+ return true;
-+ }
-+
-+ virtual void getTargetBuiltins(const Builtin::Info *&Records,
-+ unsigned &NumRecords) const {
-+ Records = NULL;
-+ NumRecords = 0;
-+ }
-+};
-+
-+
-+static const unsigned R600AddrSpaceMap[] = {
-+ 1, // opencl_global
-+ 3, // opencl_local
-+ 2 // opencl_constant
-+};
-+
-+class R600TargetInfo : public AMDGPUTargetInfo {
-+public:
-+ R600TargetInfo(const std::string& triple) : AMDGPUTargetInfo(triple) {
-+ DescriptionString =
-+ "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16"
-+ "-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f80:32:32"
-+ "-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v64:64:64"
-+ "-v96:128:128-v128:128:128-v192:256:256-v256:256:256"
-+ "-v512:512:512-v1024:1024:1024-v2048:2048:2048"
-+ "-n8:16:32:64";
-+ AddrSpaceMap = &R600AddrSpaceMap;
-+ }
-+
-+ virtual void getTargetDefines(const LangOptions &Opts,
-+ MacroBuilder &Builder) const {
-+ Builder.defineMacro("__R600__");
-+ }
-+
-+ virtual const char * getVAListDeclaration() const {
-+ return "";
-+ }
-+};
-+
-+} // end anonymous namespace
-+
-+namespace {
- // MBlaze abstract base class
- class MBlazeTargetInfo : public TargetInfo {
- static const char * const GCCRegNames[];
-@@ -3963,6 +4030,9 @@ static TargetInfo *AllocateTarget(const std::string &T) {
- case llvm::Triple::mblaze:
- return new MBlazeTargetInfo(T);
-
-+ case llvm::Triple::r600:
-+ return new R600TargetInfo(T);
-+
- case llvm::Triple::sparc:
- switch (os) {
- case llvm::Triple::Linux:
---
-1.7.7.6
-
diff --git a/sys-devel/clang/files/cl-patches/clang-0002-r600-Add-some-target-builtins.patch b/sys-devel/clang/files/cl-patches/clang-0002-r600-Add-some-target-builtins.patch
deleted file mode 100644
index 0003a8d53560..000000000000
--- a/sys-devel/clang/files/cl-patches/clang-0002-r600-Add-some-target-builtins.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From a014573ad193775b2301e39275a1ca0ac3bb5847 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Tue, 13 Mar 2012 13:54:51 -0400
-Subject: [PATCH 2/3] r600: Add some target builtins
-
----
- include/clang/Basic/BuiltinsR600.def | 32 ++++++++++++++++++++++++++++++++
- include/clang/Basic/TargetBuiltins.h | 10 ++++++++++
- lib/Basic/Targets.cpp | 12 ++++++++++--
- 3 files changed, 52 insertions(+), 2 deletions(-)
- create mode 100644 include/clang/Basic/BuiltinsR600.def
-
-diff --git a/include/clang/Basic/BuiltinsR600.def b/include/clang/Basic/BuiltinsR600.def
-new file mode 100644
-index 0000000..ce1f30e
---- /dev/null
-+++ b/include/clang/Basic/BuiltinsR600.def
-@@ -0,0 +1,32 @@
-+//===--- BuiltinsR600.def - R600 Builtin function database -- --*- C++ -*-===//
-+//
-+// The LLVM Compiler Infrastructure
-+//
-+// This file is distributed under the University of Illinois Open Source
-+// License. See LICENSE.TXT for details.
-+//
-+//===----------------------------------------------------------------------===//
-+//
-+// This file defines the R600-specific builtin function database. Users of
-+// this file must define the BUILTIN macro to make use of this information.
-+//
-+//===----------------------------------------------------------------------===//
-+//
-+// Authors: Tom Stellard <thomas.stellard@amd.com>
-+//
-+
-+// The format of this database matches clang/Basic/Builtins.def.
-+
-+BUILTIN(__builtin_r600_read_ngroups_x, "z", "nc")
-+BUILTIN(__builtin_r600_read_ngroups_y, "z", "nc")
-+BUILTIN(__builtin_r600_read_ngroups_z, "z", "nc")
-+
-+BUILTIN(__builtin_r600_read_tidig_x, "z", "nc")
-+BUILTIN(__builtin_r600_read_tidig_y, "z", "nc")
-+BUILTIN(__builtin_r600_read_tidig_z, "z", "nc")
-+
-+BUILTIN(__builtin_r600_read_tgid_x, "z", "nc")
-+BUILTIN(__builtin_r600_read_tgid_y, "z", "nc")
-+BUILTIN(__builtin_r600_read_tgid_z, "z", "nc")
-+
-+#undef BUILTIN
-diff --git a/include/clang/Basic/TargetBuiltins.h b/include/clang/Basic/TargetBuiltins.h
-index 7c04bf7..3460cd5 100644
---- a/include/clang/Basic/TargetBuiltins.h
-+++ b/include/clang/Basic/TargetBuiltins.h
-@@ -45,6 +45,16 @@ namespace clang {
- };
- }
-
-+ /// R600 builtins
-+ namespace R600 {
-+ enum {
-+ LastTIBuiltin = clang::Builtin::FirstTSBuiltin-1,
-+#define BUILTIN(ID, TYPE, ATTRS) BI##ID,
-+#include "clang/Basic/BuiltinsR600.def"
-+ LastTSBuiltin
-+ };
-+ }
-+
-
- /// X86 builtins
- namespace X86 {
-diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
-index 64dc01c..03f1a18 100644
---- a/lib/Basic/Targets.cpp
-+++ b/lib/Basic/Targets.cpp
-@@ -1070,6 +1070,7 @@ namespace {
- namespace {
-
- class AMDGPUTargetInfo : public TargetInfo {
-+ static const Builtin::Info BuiltinInfo[];
- public:
-
- AMDGPUTargetInfo(const std::string& triple) : TargetInfo(triple) { }
-@@ -1097,8 +1098,8 @@ public:
-
- virtual void getTargetBuiltins(const Builtin::Info *&Records,
- unsigned &NumRecords) const {
-- Records = NULL;
-- NumRecords = 0;
-+ Records = BuiltinInfo;
-+ NumRecords = clang::R600::LastTSBuiltin-Builtin::FirstTSBuiltin;
- }
- };
-
-@@ -1132,6 +1133,13 @@ public:
- }
- };
-
-+const Builtin::Info AMDGPUTargetInfo::BuiltinInfo[] = {
-+#define BUILTIN(ID, TYPE, ATTRS) { #ID, TYPE, ATTRS, 0, ALL_LANGUAGES },
-+#define LIBBUILTIN(ID, TYPE, ATTRS, HEADER) { #ID, TYPE, ATTRS, HEADER,\
-+ ALL_LANGUAGES },
-+#include "clang/Basic/BuiltinsR600.def"
-+};
-+
- } // end anonymous namespace
-
- namespace {
---
-1.7.7.6
-
diff --git a/sys-devel/clang/files/cl-patches/clang-0003-r600-Add-read_global_size-and-read_local_size-builti.patch b/sys-devel/clang/files/cl-patches/clang-0003-r600-Add-read_global_size-and-read_local_size-builti.patch
deleted file mode 100644
index e0c2d3bb6116..000000000000
--- a/sys-devel/clang/files/cl-patches/clang-0003-r600-Add-read_global_size-and-read_local_size-builti.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2881b8189dcacc8ab6a336f0e107d72752c8c47e Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Wed, 14 Mar 2012 11:20:08 -0400
-Subject: [PATCH 3/3] r600: Add read_global_size and read_local_size builtins
-
----
- include/clang/Basic/BuiltinsR600.def | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/include/clang/Basic/BuiltinsR600.def b/include/clang/Basic/BuiltinsR600.def
-index ce1f30e..c81758e 100644
---- a/include/clang/Basic/BuiltinsR600.def
-+++ b/include/clang/Basic/BuiltinsR600.def
-@@ -17,6 +17,14 @@
-
- // The format of this database matches clang/Basic/Builtins.def.
-
-+BUILTIN(__builtin_r600_read_global_size_x, "z", "nc")
-+BUILTIN(__builtin_r600_read_global_size_y, "z", "nc")
-+BUILTIN(__builtin_r600_read_global_size_z, "z", "nc")
-+
-+BUILTIN(__builtin_r600_read_local_size_x, "z", "nc")
-+BUILTIN(__builtin_r600_read_local_size_y, "z", "nc")
-+BUILTIN(__builtin_r600_read_local_size_z, "z", "nc")
-+
- BUILTIN(__builtin_r600_read_ngroups_x, "z", "nc")
- BUILTIN(__builtin_r600_read_ngroups_y, "z", "nc")
- BUILTIN(__builtin_r600_read_ngroups_z, "z", "nc")
---
-1.7.7.6
-
diff --git a/sys-devel/clang/files/cl-patches/llvm-0001-r600-Add-some-intrinsic-definitions.patch b/sys-devel/clang/files/cl-patches/llvm-0001-r600-Add-some-intrinsic-definitions.patch
deleted file mode 100644
index 9d99c9cff350..000000000000
--- a/sys-devel/clang/files/cl-patches/llvm-0001-r600-Add-some-intrinsic-definitions.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e25389b66b5ced3a2b5461077dcc9a505d334e3d Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Tue, 13 Mar 2012 14:12:21 -0400
-Subject: [PATCH 1/2] r600: Add some intrinsic definitions
-
----
- include/llvm/Intrinsics.td | 1 +
- include/llvm/IntrinsicsR600.td | 35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 36 insertions(+), 0 deletions(-)
- create mode 100644 include/llvm/IntrinsicsR600.td
-
-diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td
-index 069f907..e90dd85 100644
---- a/include/llvm/Intrinsics.td
-+++ b/include/llvm/Intrinsics.td
-@@ -441,3 +441,4 @@ include "llvm/IntrinsicsCellSPU.td"
- include "llvm/IntrinsicsXCore.td"
- include "llvm/IntrinsicsPTX.td"
- include "llvm/IntrinsicsHexagon.td"
-+include "llvm/IntrinsicsR600.td"
-diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td
-new file mode 100644
-index 0000000..789fecb
---- /dev/null
-+++ b/include/llvm/IntrinsicsR600.td
-@@ -0,0 +1,35 @@
-+//===- IntrinsicsR600.td - Defines R600 intrinsics ---------*- tablegen -*-===//
-+//
-+// The LLVM Compiler Infrastructure
-+//
-+// This file is distributed under the University of Illinois Open Source
-+// License. See LICENSE.TXT for details.
-+//
-+//===----------------------------------------------------------------------===//
-+//
-+// This file defines all of the R600-specific intrinsics.
-+//
-+//===----------------------------------------------------------------------===//
-+//
-+// Authors: Tom Stellard <thomas.stellard@amd.com>
-+//
-+
-+let TargetPrefix = "r600" in {
-+
-+class R600ReadPreloadRegisterIntrinsic<string name>
-+ : Intrinsic<[llvm_i32_ty], [], [IntrNoMem]>,
-+ GCCBuiltin<name>;
-+
-+multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> {
-+ def _x : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_x")>;
-+ def _y : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_y")>;
-+ def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>;
-+}
-+
-+defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz <
-+ "__builtin_r600_read_ngroups">;
-+defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz <
-+ "__builtin_r600_read_tgid">;
-+defm int_r600_read_tidig : R600ReadPreloadRegisterIntrinsic_xyz <
-+ "__builtin_r600_read_tidig">;
-+} // End TargetPrefix = "r600"
---
-1.7.7.6
-
diff --git a/sys-devel/clang/files/cl-patches/llvm-0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch b/sys-devel/clang/files/cl-patches/llvm-0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch
deleted file mode 100644
index db176dd56a1b..000000000000
--- a/sys-devel/clang/files/cl-patches/llvm-0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 17667fa3450470f7c89fc2ba4631d908cf510749 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Wed, 14 Mar 2012 11:19:35 -0400
-Subject: [PATCH 2/2] r600: Add get_global_size and get_local_size intrinsics
-
----
- include/llvm/IntrinsicsR600.td | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td
-index 789fecb..0473acb 100644
---- a/include/llvm/IntrinsicsR600.td
-+++ b/include/llvm/IntrinsicsR600.td
-@@ -26,6 +26,10 @@ multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> {
- def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>;
- }
-
-+defm int_r600_read_global_size : R600ReadPreloadRegisterIntrinsic_xyz <
-+ "__builtin_r600_read_global_size">;
-+defm int_r600_read_local_size : R600ReadPreloadRegisterIntrinsic_xyz <
-+ "__builtin_r600_read_local_size">;
- defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz <
- "__builtin_r600_read_ngroups">;
- defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz <
---
-1.7.7.6
-
diff --git a/sys-devel/clang/files/clang-3.1-increase-parser-recursion-limit.patch b/sys-devel/clang/files/clang-3.1-increase-parser-recursion-limit.patch
deleted file mode 100644
index 79f4f9f07871..000000000000
--- a/sys-devel/clang/files/clang-3.1-increase-parser-recursion-limit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from r155737.
-
-diff --git a/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h b/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h
-index 0ae5dc8..2a7464f 100644
---- a/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h
-+++ b/llvm-3.1.src/tools/clang/include/clang/Parse/Parser.h
-@@ -451,7 +451,7 @@ private:
- }
- }
-
-- enum { MaxDepth = 256 };
-+ enum { MaxDepth = 512 };
-
- bool diagnoseOverflow();
- bool diagnoseMissingClose();