Add OpenCL Radeon patches wrt #425688, and enable cpp target by default wrt #418441.

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

5 files changed, 453 insertions, 2 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index e24fccbe161a..743744052a9b 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.73 2012/06/22 13:36:45 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.74 2012/07/16 09:33:59 mgorny Exp $
+
+*clang-3.1-r5 (16 Jul 2012)
+
+  16 Jul 2012; Michał Górny <mgorny@gentoo.org> +clang-3.1-r5.ebuild,
+  +files/cl-patches/0001-Add-r600-TargetInfo.patch,
+  +files/cl-patches/0002-r600-Add-some-target-builtins.patch, +files/cl-patches/
+  0003-r600-Add-read_global_size-and-read_local_size-builti.patch:
+  Add OpenCL Radeon patches wrt #425688, and enable cpp target by default wrt
+  #418441.
 
   22 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org>
   files/clang-3.1-increase-parser-recursion-limit.patch:
@@ -363,4 +372,3 @@
   +clang-2.6_pre2.ebuild, +metadata.xml:
   Initial commit, based on ebuild by Ravi Pinjala <ravi@p-static.net> in bug
   #269651
-
diff --git a/sys-devel/clang/clang-3.1-r5.ebuild b/sys-devel/clang/clang-3.1-r5.ebuild
new file mode 100644
index 000000000000..7d7464d1214e
--- /dev/null
+++ b/sys-devel/clang/clang-3.1-r5.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.1-r5.ebuild,v 1.1 2012/07/16 09:33:59 mgorny Exp $
+
+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 ~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}[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
+	pushd tools/clang &>/dev/null || die
+	epatch "${FILESDIR}"/cl-patches/*.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
+
+	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 "${ED}"/"$(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/0001-Add-r600-TargetInfo.patch b/sys-devel/clang/files/cl-patches/0001-Add-r600-TargetInfo.patch
new file mode 100644
index 000000000000..929b5d37028f
--- /dev/null
+++ b/sys-devel/clang/files/cl-patches/0001-Add-r600-TargetInfo.patch
@@ -0,0 +1,100 @@
+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/0002-r600-Add-some-target-builtins.patch b/sys-devel/clang/files/cl-patches/0002-r600-Add-some-target-builtins.patch
new file mode 100644
index 000000000000..0003a8d53560
--- /dev/null
+++ b/sys-devel/clang/files/cl-patches/0002-r600-Add-some-target-builtins.patch
@@ -0,0 +1,111 @@
+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/0003-r600-Add-read_global_size-and-read_local_size-builti.patch b/sys-devel/clang/files/cl-patches/0003-r600-Add-read_global_size-and-read_local_size-builti.patch
new file mode 100644
index 000000000000..e0c2d3bb6116
--- /dev/null
+++ b/sys-devel/clang/files/cl-patches/0003-r600-Add-read_global_size-and-read_local_size-builti.patch
@@ -0,0 +1,31 @@
+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
+