Fix compilatin on x86-32 with -fPIC (for hardened), bug 375967.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 58 insertions, 9 deletions

diff --git a/sys-power/cpufrequtils/ChangeLog b/sys-power/cpufrequtils/ChangeLog
index 5a615a912401..eb6cb9f48a1b 100644
--- a/sys-power/cpufrequtils/ChangeLog
+++ b/sys-power/cpufrequtils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/cpufrequtils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.59 2011/07/26 16:47:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.60 2011/07/26 23:30:07 mattst88 Exp $
+
+  26 Jul 2011; Matt Turner <mattst88@gentoo.org> cpufrequtils-008-r1.ebuild,
+  +files/cpufrequtils-008-fix-compilation-on-x86-32-with-fPIC.patch:
+  Fix compilatin on x86-32 with -fPIC (for hardened), bug 375967.
 
   26 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
   cpufrequtils-008-r1.ebuild:
diff --git a/sys-power/cpufrequtils/Manifest b/sys-power/cpufrequtils/Manifest
index a24be37d8f53..598af8c29482 100644
--- a/sys-power/cpufrequtils/Manifest
+++ b/sys-power/cpufrequtils/Manifest
@@ -6,6 +6,7 @@ AUX cpufrequtils-005-nls.patch 1581 RMD160 614aee44a46cb01033c7c577711e9f07b70f8
 AUX cpufrequtils-007-build.patch 369 RMD160 317ebc43c5cb8ea40a3dc20deab8b03ba22d958c SHA1 30f2702c94aac2e644a5aae87e2395ab7ba905eb SHA256 2cfafb56502441c06485b38e3e900e354310f252ae47e23134fc63488aeb8ec0
 AUX cpufrequtils-007-nls.patch 1684 RMD160 fe28612cb1e69d75aba33803be6b6e9c9a7a450f SHA1 cdc9f110b12f6574fd06dec80461da6caa9a0bdf SHA256 e4a6a2cdd47da2bd54cf0cb18e5b601c2630af64d747b2e14e524bfd9761a397
 AUX cpufrequtils-008-cpuid.patch 777 RMD160 50cc3f01ef7f0f3a6df2bae23e3a51b8d5df71ca SHA1 2fbe78c14ee12f6e81f9a4544f43d63d9c5ef78b SHA256 a0eb486b7d173706294fe70bb76e1215e98ac8da3b6b6f48c65db61dbba13cfd
+AUX cpufrequtils-008-fix-compilation-on-x86-32-with-fPIC.patch 1182 RMD160 3f6a8a95b0f8f6f88ae28c2296437affacb38777 SHA1 d4894441f2e47e5ed822a82d132f4f3717e45baf SHA256 2b4c3904c0d695ea629bad4428e41ac9f83b4a942cf4c8aba4d0ea11112885ec
 AUX cpufrequtils-008-fix-msr-read.patch 1286 RMD160 c2e8864ba448ec0e465262a6be00a33d2f58c829 SHA1 8dd7f4b64c9c67f6f72b35b69382ae90d76996a8 SHA256 55e6d5e4999c8125265331bd7b4953107618e3c6f324996a065bbd3f907e9245
 AUX cpufrequtils-008-increase-MAX_LINE_LEN.patch 834 RMD160 c780d95545086e953552e4e1dacd69dd53a026e8 SHA1 04426dfe04619c52500027bc17b8caf79550ca08 SHA256 58190c9f785aae0a2a4617544c3896382cfd23e7256aab98255f11173b01efda
 AUX cpufrequtils-008-remove-pipe-from-CFLAGS.patch 276 RMD160 c1545bcc3bc369dd4d358974319ad4175dd04342 SHA1 dc8be39dff3da044c3cbee69240f517604a61ecb SHA256 3b5ca8ecfb128644d31bbcbb988667d0662dbb95a32f104c572499f1cc5f7b0e
@@ -18,16 +19,14 @@ DIST cpufrequtils-007.tar.bz2 51959 RMD160 f5ba085ad186456099c312d67d67351d5fd45
 DIST cpufrequtils-008.tar.bz2 52186 RMD160 21c1318bd31e2df8b5b6718860e55bf345ad71d4 SHA1 3b6d64dcde86bb6a53842ffb0483465113aac6af SHA256 1b9daa591d977679fb09ffb9b4d58afa94b9387f3c0be92ec077080e328130f1
 EBUILD cpufrequtils-005-r1.ebuild 1261 RMD160 c05e2849758aa5cd0a5a1560b1bde4c0efdba27d SHA1 7b421ada7beb267804814db9d0dd5b37d88b64f3 SHA256 bc2b10bbc66eb745ebc02e61c8d7e946905d02381cee30f6b063a4e631d2ee80
 EBUILD cpufrequtils-007.ebuild 1465 RMD160 02982e05ef67c400cc825541f789880141100de4 SHA1 1b7e2650600310e7dde592503070092bfb5515ad SHA256 e701f2dbf3903a009beb949e1665df505f02bd9788c6784bb1022c4726f34f75
-EBUILD cpufrequtils-008-r1.ebuild 1806 RMD160 59f837f8a7ceac8ca6674c1d1f689a3948be533c SHA1 57e426f1915dd3e2a442253ad3b5ec5eabe97ff4 SHA256 525e79643ddc806a0e52154d65a428cee5a47e54ecef232db1d1e9828ac501ee
+EBUILD cpufrequtils-008-r1.ebuild 1886 RMD160 b6c5ffba9c8ff5105468d8e27079eb875bf0a5f7 SHA1 95dad60feeaf1f0c278e2cb5ea1e593340fa65d1 SHA256 3cb1454192a6d8e69096743b0062193090c10dfd1d7e6a86538e34d474e745aa
 EBUILD cpufrequtils-008.ebuild 1540 RMD160 ef1f51578338009422512ab2a83c39ad93e7d9ab SHA1 c645ac4be5bf28880f56cf47dce1a367a5e0d30d SHA256 df9490e2115373f00b57653e426cbbcd18dabe589ff7d53105953bef459b4586
-MISC ChangeLog 10343 RMD160 f9089c1064e45fc25b8cffe1cd919bee5449636b SHA1 080b34c77270571128045a924f52c37f64c9dfa4 SHA256 d9717cd8a74b49a9cec79d7b03fbd9fa277636bb37aca848c125baacb7b14def
+MISC ChangeLog 10554 RMD160 5f68a604eb36bae5265d4ec221e33980dc0383d5 SHA1 8576c5df1168719d1cd384be7719d3a17ede8cd0 SHA256 14d55f81be526941b2750af80f9d6720a4af2d9bafd61b15a0e2fd56e0b0a1dc
 MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4u778ACgkQIiMqcbOVdxQ7HQP7B27SVLCxXFKxeNUduBQek/Y5
-371em/IYb+NMjAV4FhKcVGgDXRk/zKriTmlxlI56jxqSn/7s8Bht0mEVtbaiZd7j
-r88V8EEV/lLI2d1qdzktqV35yzmYE/XW9JIfauycVi7sn80rbT4T5xhCJVKccP/S
-Jx3rHuLgXvh2vXf1Vag=
-=UHLZ
+iEYEARECAAYFAk4vTg0ACgkQTVUdg23rv53jHwCfTJkeF6XcoOEjuLdUdR/gqCjl
+7/QAnRwkQquxnoUyPHMJTLOci0v2pYw9
+=BLnM
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpufrequtils/cpufrequtils-008-r1.ebuild b/sys-power/cpufrequtils/cpufrequtils-008-r1.ebuild
index bc413f81c799..fd43fe8fc2e7 100644
--- a/sys-power/cpufrequtils/cpufrequtils-008-r1.ebuild
+++ b/sys-power/cpufrequtils/cpufrequtils-008-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-008-r1.ebuild,v 1.4 2011/07/26 16:47:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-008-r1.ebuild,v 1.5 2011/07/26 23:30:07 mattst88 Exp $
 
 EAPI="3"
 
@@ -27,6 +27,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-008-cpuid.patch
 	epatch "${FILESDIR}"/${PN}-008-fix-msr-read.patch
 	epatch "${FILESDIR}"/${PN}-008-increase-MAX_LINE_LEN.patch
+	epatch "${FILESDIR}"/${PN}-008-fix-compilation-on-x86-32-with-fPIC.patch #375967
 }
 
 src_configure() {
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-008-fix-compilation-on-x86-32-with-fPIC.patch b/sys-power/cpufrequtils/files/cpufrequtils-008-fix-compilation-on-x86-32-with-fPIC.patch
new file mode 100644
index 000000000000..cc1d81413b0c
--- /dev/null
+++ b/sys-power/cpufrequtils/files/cpufrequtils-008-fix-compilation-on-x86-32-with-fPIC.patch
@@ -0,0 +1,45 @@
+From 28b7205609252b365b5fbcb140de22858cd631da Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 25 Jul 2011 15:11:46 -0400
+Subject: [PATCH] aperf: fix compilation on x86-32 with -fPIC
+
+ebx is used to store the GOT pointer when compiled with -fPIC, so it's
+not usable by inline assembly.
+
+https://bugs.gentoo.org/375967
+
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+---
+ utils/cpuid.h |   14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/utils/cpuid.h b/utils/cpuid.h
+index 2bac69a..53da789 100644
+--- a/utils/cpuid.h
++++ b/utils/cpuid.h
+@@ -5,9 +5,21 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx,
+ 				unsigned int *ecx, unsigned int *edx)
+ {
+ 	/* ecx is often an input as well as an output. */
+-	asm volatile("cpuid"
++	asm volatile(
++#if defined(__i386__) && defined(__PIC__)
++	    "push %%ebx\n"
++	    "cpuid\n"
++	    "movl %%ebx, %1\n"
++	    "pop %%ebx\n"
++#else
++	    "cpuid\n"
++#endif
+ 	    : "=a" (*eax),
++#if defined(__i386__) && defined(__PIC__)
++	      "=r" (*ebx),
++#else
+ 	      "=b" (*ebx),
++#endif
+ 	      "=c" (*ecx),
+ 	      "=d" (*edx)
+ 	    : "0" (*eax), "2" (*ecx));
+-- 
+1.7.3.4
+