Backport gcc-4.9 and Athlon fixes from 1.0.0

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

5 files changed, 190 insertions, 15 deletions

diff --git a/dev-util/oprofile/ChangeLog b/dev-util/oprofile/ChangeLog
index 8d1fe9f42545..c16031abf655 100644
--- a/dev-util/oprofile/ChangeLog
+++ b/dev-util/oprofile/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/oprofile
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.98 2014/12/01 07:31:09 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.99 2014/12/01 08:02:49 bircoph Exp $
+
+*oprofile-0.9.9-r1 (01 Dec 2014)
+
+  01 Dec 2014; Andrew Savchenko <bircoph@gentoo.org> +oprofile-0.9.9-r1.ebuild,
+  +files/oprofile-0.9.9-gcc-4.9-non-ppc.patch,
+  +files/oprofile-0.9.9-gcc-4.9-unused.patch:
+  Backport gcc-4.9 fixes from 1.0.0 and fix for CPU detection on
+  Athlon systems.
 
   01 Dec 2014; Andrew Savchenko <bircoph@gentoo.org> -oprofile-0.9.6-r1.ebuild,
   -oprofile-0.9.7.ebuild,
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 372e2948e1c5..b5c4fa0290bf 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,29 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX oprofile-0.9.9-gcc-4.9-non-ppc.patch 1612 SHA256 491897ec7b00e72f0b645c5b0eb6212d7edc46dc6322978d8d69b655fb2ba928 SHA512 6cd0d067a95528aa40adb76cb38fc7ba76da16357621fb9e25ad6c61662e5bab9ebc9f52ee23da078aed2f650d95d2a3dc76389d93775e328be34f65570abaa3 WHIRLPOOL 3096a872a734fdf925e15f014c0327dcf664aec29ff2195abef00416142959a7dceaebe7245cbcfa04f708d7777f5b999ea597c83fa2414a03c6c995821017bf
+AUX oprofile-0.9.9-gcc-4.9-unused.patch 1285 SHA256 123930ceb8f1a743cf8d1bd679d73505dd419807335c19616c44ba8395974c5e SHA512 79f3388bb2e3a76611ecc414618f89b27f471f464aa4be63ac54b620b4b37c4e4e39179230775f712fcf63919a85f3808e1577f6e7f4ae3319ebe28c44667952 WHIRLPOOL c96332536a0fcc6d38765b7d7e9f27b373cd3cb0c6c70d22dade13e4c15a907826ca1e390fa5b77ac580e602c594ea2aaa8a3ca0860a558f3213d8273cba3261
 AUX oprofile-1.0.0-athlon.patch 638 SHA256 96604db63a4e6b734e0ec72505ad5019b4867ab815c51db97691bf4381df3bb7 SHA512 31d4b1541402304a1c42a3e564aa8aca55f9064562c55909c024e5d6577af199ba42b8b1b1da9b6250a81e83a8183f2b9c879f894d4382d56ca61bcbbdf0ec79 WHIRLPOOL 9b57728c16bae7bc15c8ace84be901dfdfc765cf98ad172a510ca3a9d0fd21080f033f70315e19639756507b190e40494e4346c28f3b28220233a6cc73165644
 DIST oprofile-0.9.8.tar.gz 1448246 SHA256 ab45900fa1a23e5d5badf3c0a55f26c17efe6e184efcf00b371433751fa761bc SHA512 bc2bb6d3a9c7868837091ef9e2a8b19a62dabe55d08ec83e0a4a261387a7d9ac4230022d579210cdc85d5e084f75c0b3a49041849af263fd87e9157029fc6dac WHIRLPOOL 44c61324e4ff58a82dd3931bdbe88adeb05aaa52536f7dc8b2c3a79db6f94fb62921546469737be8aed9f9d464b2b7e45428bb559f4a311301f3644039bed627
 DIST oprofile-0.9.9.tar.gz 1502834 SHA256 1e523400daaba7b8d0d15269e977a08b40edfea53970774b69ae130e25117597 SHA512 98cc3d2c15744d02ed649833cf4797482aec73bd52653e916f80b490e17a8250d988c4c945e52dd8999a0d0603fec405e99c9570dfc54baa4992950fe4d8763f WHIRLPOOL 534d04449923da5008dbf044f9783a1d39ad8b749170edf04a503ca1a885455fc8aef4f5894060d14135f5e3b0a0d577897779eed30dc26deff9b0663fcbb7d1
 DIST oprofile-1.0.0.tar.gz 1397396 SHA256 847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a SHA512 35b0e9f23c1d8df0aebda3f9b550692a896424de901d529a0ad41da41000328f33d184dcbb8e6f8367008723c8b2177b621757a2282b4c881ac46a57e1b51010 WHIRLPOOL eaf7feefb6561851d2f8573ec60f2086245aa9fc034c8f4ab62679895ae80ca45e8dcb4bfdcb96ad477c5b446b7f0b11e339d9dc270e8b4b0366bc3a9e980143
 EBUILD oprofile-0.9.8.ebuild 1853 SHA256 3be3e0bd023fc118f2d062d885b7b4ebd36e744ccc61b3d56006515c5a28b03a SHA512 540dd5f419a0f0812e99e60d4a2411f566d0ea304eab53aaf6bc464717d3c700bdf0e88a152449c44f0b7cde52404d23a63d26548e6b898bed6a35f190c21ed8 WHIRLPOOL 0d0c6507e7393dff30cbd6a99161c35f7f6ef81f2d6405a83f79ee292ce0974858aea1a8ded7f3ecf42c0c84258de79b0dfd0613390816d7546d156812dc57cb
+EBUILD oprofile-0.9.9-r1.ebuild 2054 SHA256 1051570ec16c3df37abe6163d85c83a30e79b37c55a3e7488750567407841a87 SHA512 3e66f5d0a18134c32e5cd1afa45fc7c8cb29a6e5d21070cbb854d50b84dcc75f33f2dc85411270d857fee8c668e7ce1672f10efba67abbb4abe2a0135d6b307b WHIRLPOOL e01844b281351c33100836df0672116e85cbbd6fb5eca0c2500887ce15b74446233fcf3116f0390d4e016dd4908527c12dfb8b357072e08cfe858873924960b1
 EBUILD oprofile-0.9.9.ebuild 1863 SHA256 4040880df7ebddfe69724e3c1bdc31676c9b2ec7f126e1eea9206a36207b70a3 SHA512 5dcf06ab13fd70027a3abb6bc18dcfa2cd1735530946a9d837dbf68aea8ede9dc5a0330befc3f5f9c2c36a581c8b7f2ea4858aa0e87521a12e984df52c539633 WHIRLPOOL e590a1738ce364b9277c74017519218c9dbe03d28d57660ed7b2f70d019a9435a1cba3caf8926ffb90d38b85aa98f4f59de576d6beaf6809f0db6639262a7797
 EBUILD oprofile-1.0.0.ebuild 1775 SHA256 8caecb78692142d6de9f3b98d8c9f34cdad879662ab4c3edeeaf62308a04eadb SHA512 642b2d1b40cf47168ef2a20f0b78b40c947d4c67d55bea82a4d7a0aaee8be443951f4292cc33e78d384a88bb50d952e6d15cb2c8804ac913ce8214c9deeed6ae WHIRLPOOL 6f4996f0eecf4a82a04ea3566fc43ca58624dfd9895666897b8b6e601336ef8954dd8689e988563f507d689eada192888ce9ea522ddd1def1372832c31b04098
-MISC ChangeLog 14850 SHA256 85232e6b9eb545d7bab43e51df62f12f6474040ff373f518281ee7846c330328 SHA512 1750e383fea8539a2c04a2b3940b362748945c31bce6380f40e31e6f9dde07fce28442516c5a853993ab99fcc169bae4c9b55032d91989008c8e7c0bbcd0b0ab WHIRLPOOL c15bed5a0167d4cb4d8ab321a7e88cd706d0c9c4a6398a1739d44e19ae04b7a64f5c8118dddb9387a229189110af7bf5c5e86638aafb3743ddc27de97907958f
+MISC ChangeLog 15141 SHA256 f39be200b0e7e65e4fda0d6bace08f97eba5a8864fb79922386be8910ccdd950 SHA512 aba35787e5b22fd0162fd35cb24c7f4f4a2be368845d3d8e8991b67c1331bf3084641f13afeb2e52e8680398405ce100b3b7660d19ae5326b3dbdd8e57230b93 WHIRLPOOL 4c8af556c5af5a51aa542d4ea4556752a9364ffa0747adb5ee52115ec856ad40466836da10c4e5ba93fd4d8bf1b9d0e5380c5bb6b6117a349caff909b9fa644f
 MISC metadata.xml 327 SHA256 b8a93c99c3a9ead6715c2d2d8b850e04416a9e69c19864d81164e4a18f0c0617 SHA512 1adc3ecbdd140e4b7ab4c24001d69c66ff635e2d5819eddcb09e149a8168d80711db65af797e6f67c8ea4a0bdbe710a18786ba18abb061f2222c07a5c819d709 WHIRLPOOL 300fc7a9239f254e966a07bb162d8e763ef0cc323366629edd9a29aae80fd0198054e56aea2b1f92b1d2828b8705690403b7a38bdce48af2f24aec55fbfa8491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUfBlAAAoJEFZZU7lTcnVsotAQAIxYL8Dv+T1U7ly872Oy06D1
-01DhB/rFv2hsDlWFPkICyaSzaGNWdy1qbSiECBeSMIqBS9rPaQNk/UGlisaL7qzx
-NevU6yoH4ux/71IErsEAubJVmOikxE+wSb4lhLMLUODdtadxkCIWaILiCiGD7TWM
-IbxM3GwsDv/nHJt1cBYPkGx2rgekVbZvOPyG57OYTZaDb+GNJSoTJzN6nmMWZRIQ
-Mkg1IsUCk9WSajhyCQSk5dmkOOE/W8Ra6dbeolkEj5M6xEaCrx7FWLqZp7OZcZUg
-PY5cRhkea1Cv2HqUjN/YT9lT+ZrebPr7LFmcWEoUMlf2Pgyo1bvRri2EEzuZ75Jd
-KnzslCudBM+fgqwn6nLyR0/7pqQfahoEZJdrNbTBG/O1SSbhUWgfQz6nDa94bvMY
-4toD7hxmT4kxw3lc1h3a7aSwkC0DTirVfqJgHB6AIh6iNpteYqlgfAlVPY0wHMoK
-/ErjTJfTok7fQXw4Vi3E+HgiuFyKyyC3+2oJZTel+JDVvg8NqiiccuOzTh9MJoKu
-/QwhdIWQfRhjY3UfmhVG03gIj7dKdyRImyTZc4RWDuXND9shZX/QN2x8NpdDutzo
-JMhZZ6NUeKgvOhDIOHsGbvYsxk8Z8aBOnMPOJrm73glO7cs741LPQGLPSenG/ump
-BgW9ndhiQBB2RfCD9irw
-=POgP
+iQIcBAEBCAAGBQJUfCCrAAoJEFZZU7lTcnVsrFEP/Rnsp9Mm2IIrs1CChIv+wSRW
+ykbetAG/sN6LLpwwpLaI6RnSGTtd8DM265+lmRTR+pNU7etj1c80LHB7HOeDy+Be
+GaJvXj+IIr7XIIDd45Lm8uQbg/MSi9rebDsgfSaYly2UMyXnxuZFXj8MVjO6c30t
+A79jVV+OgMF77d4A2+nJUUu3i7TJc0jTEogDov+lX9BfN9Kn77NUZ2TmYZ1tz6KS
+pa0/EFCnZfFPIUVN/nHDBulpAKYDXspJGNTFZZR8osmeSFkOlvv3H/zWX6d0YlL3
+N1juJ2f3dj4qwQW8t5M+IMwv59IHrVUQQx1uSwh/z4DFnO53L0dASjgI+Giqshsl
+rIQpm+DdbRLdg7urY7kfQ6VVjAtAME850LyZXhqbwODY5ZCwGFcd0NmFxop44c5W
++6QtHdzIezo+Oo4dOkpdKTgK5Nu+GdCGhKxt4SuY/TlL/NLD9utBlhWG3gQ82871
+gn5j7DrAYSuL43QFO8fBVULr3AN2zPN0i2UAmrhDDePcmgJzfKGdJv2ex7Q72HDk
+FK8C8h2Cb950L1hMeImACY26YlOfFl09ObGvjKExPF8DNJresZYXirj+N8/O2iKv
+ExX6O0cKinEmojnSCRfSMENtutzPJD/FovGyG9hLQ2RI5Ee3ejZo9fGmgoq6OUUh
+Oh49GbG0bKV7T2w8yvZi
+=urrn
 -----END PGP SIGNATURE-----
diff --git a/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-non-ppc.patch b/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-non-ppc.patch
new file mode 100644
index 000000000000..423c703f7ffb
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-non-ppc.patch
@@ -0,0 +1,36 @@
+Backported from 1.0.0:
+======================================================================
+commit 008e470a9b8751de0a3745e511cbc05b68759688
+Author: Aaro Koskinen <aaro.koskinen@iki.fi>
+Date:   Mon May 12 08:28:46 2014 -0500
+
+    configure: fix test-for-synth check with GCC 4.9.0
+    
+    With GCC 4.9.0 oprofile 0.9.9 build fails on non-PPC platfroms because
+    the "test-for-synth" configure check result is incorrect: There is a NULL
+    pointer dereference in the test program, so the compiler seems to optimize
+    the rest of the code away, and the test will always succeed regardless
+    whether powerpc_elf64_vec/bfd_elf64_powerpc_vec are present or not.
+    Fix by allocating the referred struct statically.
+    
+    While at it, also include stdio.h to avoid a compiler warning.
+    
+    Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
+
+diff --git a/m4/binutils.m4 b/m4/binutils.m4
+index 25fb15a..d7948c1 100644
+--- a/m4/binutils.m4
++++ b/m4/binutils.m4
+@@ -27,8 +27,10 @@ if test "$OS" = "Linux"; then
+ 	AC_MSG_CHECKING([whether bfd_get_synthetic_symtab() exists in BFD library])
+ 	rm -f test-for-synth
+ 	AC_LANG_CONFTEST(
+-		[AC_LANG_PROGRAM([[#include <bfd.h>]],
+-			[[asymbol * synthsyms;	bfd * ibfd = 0; 
++		[AC_LANG_PROGRAM([[#include <bfd.h>]
++                        [#include <stdio.h>]
++                        [static bfd _ibfd;]],
++                        [[asymbol * synthsyms;	bfd * ibfd = &_ibfd;
+ 			long synth_count = bfd_get_synthetic_symtab(ibfd, 0, 0, 0, 0, &synthsyms);
+ 			extern const bfd_target bfd_elf64_powerpc_vec;
+ 			extern const bfd_target bfd_elf64_powerpcle_vec;
diff --git a/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-unused.patch b/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-unused.patch
new file mode 100644
index 000000000000..5c541a053a72
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-unused.patch
@@ -0,0 +1,47 @@
+commit 98f57a6c0e32bc6080a50e1cdd769b9ff78108bc
+Author: William Cohen <wcohen@redhat.com>
+Date:   Tue Jun 10 09:56:55 2014 -0500
+
+    Remove unused functions causing errors in recent gcc
+    
+    The Fedora rawhide compiler is now stricter and will treat the
+    warnings for unused functions as errors and stop the compile. This patch
+    removes two unused functions in the code.
+    
+    Signed-off-by: William Cohen <wcohen@redhat.com>
+
+diff --git a/libpp/callgraph_container.cpp b/libpp/callgraph_container.cpp
+index 1d1c95f..c5bc272 100644
+--- a/libpp/callgraph_container.cpp
++++ b/libpp/callgraph_container.cpp
+@@ -36,13 +36,6 @@ using namespace std;
+ 
+ namespace {
+ 
+-bool operator==(cg_symbol const & lhs, cg_symbol const & rhs)
+-{
+-	less_symbol cmp_symb;
+-	return !cmp_symb(lhs, rhs) && !cmp_symb(rhs, lhs);
+-}
+-
+-
+ // we store {caller,callee} inside a single u64
+ odb_key_t caller_to_key(u32 value)
+ {
+diff --git a/libpp/xml_utils.cpp b/libpp/xml_utils.cpp
+index 5f1a3a1..3de41e5 100644
+--- a/libpp/xml_utils.cpp
++++ b/libpp/xml_utils.cpp
+@@ -101,12 +101,6 @@ bool has_separated_thread_info()
+ }
+ 
+ 
+-string get_cpu_num(size_t pclass)
+-{
+-	return classes.v[pclass].ptemplate.cpu;
+-}
+-
+-
+ };  // anonymous namespace
+ 
+ xml_utils::xml_utils(format_output::xml_formatter * xo,
diff --git a/dev-util/oprofile/oprofile-0.9.9-r1.ebuild b/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
new file mode 100644
index 000000000000..005a3e616c23
--- /dev/null
+++ b/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.9-r1.ebuild,v 1.1 2014/12/01 08:02:49 bircoph Exp $
+
+EAPI="5"
+inherit autotools eutils linux-info multilib user java-pkg-opt-2
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="A transparent low-overhead system-wide profiler"
+HOMEPAGE="http://${PN}.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java pch qt4"
+
+DEPEND=">=dev-libs/popt-1.7-r1
+	>=sys-devel/binutils-2.14.90.0.6-r3
+	>=sys-libs/glibc-2.3.2-r1
+	qt4? ( dev-qt/qtgui:4[qt3support] )
+	java? ( >=virtual/jdk-1.5 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if ! linux_config_exists || ! linux_chkconfig_present OPROFILE ; then
+		echo
+		elog "In order for ${PN} to work, you need to configure your kernel"
+		elog "with CONFIG_OPROFILE set to 'm' or 'y'."
+		echo
+	fi
+
+	if ! kernel_is -ge 2 6 ; then
+		echo
+		elog "Support for kernels before 2.6 has been dropped in ${PN}-0.9.8."
+		echo
+	fi
+
+	# Required for JIT support, see README_PACKAGERS
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+
+	use java && java-pkg_init
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc-4.9-non-ppc.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.9-unused.patch"
+	epatch "${FILESDIR}/${PN}-1.0.0-athlon.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with qt4 x) \
+		$(use_enable qt4 gui qt4) \
+		$(use_enable pch) \
+		$(use_with java java ${JAVA_HOME})
+}
+
+src_install() {
+	emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install
+
+	dodoc ChangeLog* README TODO
+
+	dodir /etc/env.d
+	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${D}"/etc/env.d/10${PN} || die "env.d failed"
+}
+
+pkg_postinst() {
+	echo
+	elog "Now load the ${PN} module by running:"
+	elog "  # opcontrol --init"
+	elog "Then read manpages and this html doc:"
+	elog "  /usr/share/doc/${PF}/${PN}.html"
+	echo
+}