Allow to run test without rebuilding llvm, bug #397559 by mgorny. Add AMD K10 suport in 3.0, patch thanks to Fabio Scaccabarozzi <fsvm88@gmail.com> in bug #398357

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

4 files changed, 288 insertions, 4 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 0dcb5e9cc3a2..00b7f3c5b062 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/clang
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.49 2011/12/02 13:20:51 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.50 2012/01/13 22:25:18 voyageur Exp $
+
+*clang-3.0-r1 (13 Jan 2012)
+
+  13 Jan 2012; Bernard Cafarelli <voyageur@gentoo.org> +clang-3.0-r1.ebuild,
+  +files/clang-3.0-recognize-amd-k10-enable-sse4a.patch, clang-9999.ebuild:
+  Allow to run test without rebuilding llvm, bug #397559 by mgorny. Add AMD K10
+  suport in 3.0, patch thanks to Fabio Scaccabarozzi <fsvm88@gmail.com> in bug
+  #398357
 
 *clang-3.0 (02 Dec 2011)
 
diff --git a/sys-devel/clang/clang-3.0-r1.ebuild b/sys-devel/clang/clang-3.0-r1.ebuild
new file mode 100644
index 000000000000..73b1beaa5b56
--- /dev/null
+++ b/sys-devel/clang/clang-3.0-r1.ebuild
@@ -0,0 +1,190 @@
+# 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.0-r1.ebuild,v 1.1 2012/01/13 22:25:18 voyageur Exp $
+
+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 multitarget +static-analyzer +system-cxx-headers 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"
+
+	# 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"
+	# Specify python version
+	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
+
+	# 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 suppport, bug #398357
+	epatch "${FILESDIR}"/${P}-recognize-amd-k10-enable-sse4a.patch
+}
+
+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}"
+	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
+}
+
+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 "${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
+}
+
+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/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index b5fc4a8aaddd..32c95d035461 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-9999.ebuild,v 1.20 2011/11/14 15:02:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.21 2012/01/13 22:25:18 voyageur Exp $
 
 EAPI=3
 
@@ -61,6 +61,10 @@ src_prepare() {
 	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"
 }
 
 src_configure() {
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
new file mode 100644
index 000000000000..90f99abc344a
--- /dev/null
+++ b/sys-devel/clang/files/clang-3.0-recognize-amd-k10-enable-sse4a.patch
@@ -0,0 +1,82 @@
+--- 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__");