Fix Ivy bridge processors detection with -march=native

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 28 insertions, 9 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 3b8f14ef11b0..d415c14ff5d4 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.83 2012/06/12 17:48:20 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.84 2012/06/14 16:22:07 voyageur Exp $
+
+  14 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.1.ebuild,
+  +files/llvm-3.1-ivybridge_support.patch:
+  Fix Ivy bridge processors detection with -march=native
 
   12 Jun 2012; Fabian Groffen <grobian@gentoo.org> llvm-3.1.ebuild:
   Marked ~x64-macos
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 60c8af7d4553..8c9f5cdeb288 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX llvm-2.6-commandguide-nops.patch 975 RMD160 1178c27a8845c2c86d6d381ba3d95b4b9b627f1e SHA1 41b9d8c3ae0ed1023ec72bf629c53fa8981e0264 SHA256 0e36fb43e020fa380230a8c6f2a79b9a19e12e857e833ef856e2b41aaa283649
 AUX llvm-2.7-nodoctargz.patch 1878 RMD160 a6134fd292a1a2c6a594e787ce73b15012be04bb SHA1 9d32a0e15791789d8bf58dfecf9580a00d150319 SHA256 983657329ebede731b397ba0256d729b3958f39faea64c9f7d065ab8d2a3e7fd
@@ -12,6 +12,7 @@ AUX llvm-3.0-PPC_macro.patch 1825 RMD160 d991c5c8c05cdc6e4ce6bf4b43059f54822d69b
 AUX llvm-3.0-gold_LTO_link.patch 442 RMD160 f480458cc7ef79bbfb948c2f6d2e4122eb55c564 SHA1 a92ac6454a751daf6643c1b402d102ce3c304b73 SHA256 62dc70a1d1f581b7f768ca728dcca688a741e03e64566d5f38e02e33c6372ab8
 AUX llvm-3.0-ocaml_install.patch 664 RMD160 c439931f952e7e053b726435ae0a8e502ebe5080 SHA1 15c8a81baa0e6e78d734f5451b319bf6d896eb2a SHA256 6f451130ed8fcced98691361d33d4d44d8866e703673c293cf7f88af8362e694
 AUX llvm-3.0-set_soname.patch 522 RMD160 84f8b4fe1f1f52a9503e4d5a2192b58c493f9047 SHA1 52ec640907aaca7c37ec0b96dba261529d8aded2 SHA256 0f4fe63baa74a963929dc39359cccb6eb4fba73176d72d4a354ebf50e51318a5
+AUX llvm-3.1-ivybridge_support.patch 405 RMD160 514663856b0788ccd7976d58d65abf268c637d74 SHA1 532bdef7c855f7a843cf9f66a935df61937caad2 SHA256 cc91a69be3d0f7f216a4d0484284fd054d4b0273f1c4dda7afcc005564867725
 AUX llvm-3.2-nodoctargz.patch 1761 RMD160 334a821b1b367e593407b918ec9df2f7585e29db SHA1 b68c794a34dadd9b5c3a5e4607da34ff50812f41 SHA256 e17494aef638d2fe3fb0b669516ffcc9e560161903e1e165de0eecba684c8c1b
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
@@ -20,14 +21,14 @@ DIST llvm-3.1.src.tar.gz 11077429 RMD160 ceb0ef36ab6109da7a8568b04de759752dbee5a
 EBUILD llvm-2.8-r2.ebuild 6222 RMD160 34c51d4deb8ba605df908542a581099af7043a7f SHA1 c86b4cfe710b65ffedd934096df8394da9a8798f SHA256 4e9fc704a4aa3b1a8e07bf9807f1f3fbdc429d1ab075edf025dd6b96e003d852
 EBUILD llvm-2.9-r2.ebuild 6179 RMD160 f74c12b1ac78b90ed37883de43ade7191e80b59e SHA1 f029d00eb70dcc36b0c0059978dd3be7428ed406 SHA256 1ef42910022038d95ba6964a310955098b8aa50041567be185a528ddb44af19d
 EBUILD llvm-3.0-r2.ebuild 5683 RMD160 9f8c8c82bc97604893c1e0569cc79c9352e343c5 SHA1 32e6a266cf43c2d83a2522337c0e5010b6397483 SHA256 6d12b1ba54999e711d1ef999ec5b0f4689635bd134f5e23ce712749cdf652c68
-EBUILD llvm-3.1.ebuild 5596 RMD160 f8adcc2dcf823f283bbe39d6bd06037c3fcbf5a4 SHA1 17896fd0720888d9c6200f02136d5ae4fccdfd21 SHA256 14d28c92a4d18184b6ed4851f87f7faa53cc866fb78786a02f65654436480d42
+EBUILD llvm-3.1.ebuild 5648 RMD160 e80359f00a6a09f3911e432599a9b659a5c2af20 SHA1 ab25c001bcf6e8ce4cded85844b39e27db72bb5a SHA256 673baad99d26c5288a18dd4ad428b744b8d7bfa8cdc46572079d8cafa5b412e0
 EBUILD llvm-9999.ebuild 5811 RMD160 2be2e6514718e55c2d307d169bebc53769b18a55 SHA1 b4c08d114e91c874ab91bfabbe4f1e04b5661ad5 SHA256 6830b291eb393ccc3360041adcfd53b268b86d8c53751cbb8a29c48a44f2f5e7
-MISC ChangeLog 13401 RMD160 c51e0c27081fc22c7a35b1a25ae897166d997f7f SHA1 2afab7895c59b4742a7ac966d418e3013112d235 SHA256 de3bb0a108ddb504ae31606a928356388a4b8ee1ca5cf29744d1bae69ab107db
+MISC ChangeLog 13575 RMD160 1e1f8633a57cbe0b28af552d569acd0bf3359eca SHA1 9c58a6db112a7a3986ce9c940f1ee2ec00f95e3f SHA256 516fac9ecf4b6a5c3ba9d7847407ea8efc90f161ea71353561f1f970c683e0ee
 MISC metadata.xml 2384 RMD160 a1b7ecfa8999a3bc77cc7365e3efa7bdcfbccdbe SHA1 040998e45e7adbcef69ac194253342b64192face SHA256 c0f936ccdd15b17a06d712f1d7a58ff0fec818ee618279778fbc37abd50f76d6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/XgOoACgkQX3X2B8XHTolRVACfUfyWC0YVoHsvfLU5VdoJdMb5
-79oAnRyG9kaewo9eer1EqUoq6JoHOaD4
-=I394
+iF4EAREIAAYFAk/aD7kACgkQFYEBGcdFJfLLUAD+JvrcSV+XxstfAkgvtKiUKGEJ
+zoxB8wHt9DWpcLwvC3EA/3oYxEuUIeMm9msP1KYpjRz8C0LAP0cZuLURxTO7ZOvK
+=2Vkg
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch b/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch
new file mode 100644
index 000000000000..a03ec422467c
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch
@@ -0,0 +1,13 @@
+--- llvm/trunk/lib/Support/Host.cpp	2012/04/23 22:22:46	155401
++++ llvm/trunk/lib/Support/Host.cpp	2012/04/23 22:41:39	155402
+@@ -230,6 +230,10 @@
+       case 45:
+         return "corei7-avx";
+ 
++      // Ivy Bridge:
++      case 58:
++        return "core-avx-i";
++
+       case 28: // Intel Atom processor. All processors are manufactured using
+                // the 45 nm process
+         return "atom";
diff --git a/sys-devel/llvm/llvm-3.1.ebuild b/sys-devel/llvm/llvm-3.1.ebuild
index 1c08e0a02988..bf134d783499 100644
--- a/sys-devel/llvm/llvm-3.1.ebuild
+++ b/sys-devel/llvm/llvm-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1.ebuild,v 1.5 2012/06/12 17:48:20 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1.ebuild,v 1.6 2012/06/14 16:22:07 voyageur Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -97,6 +97,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
 	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
 	epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch
+	epatch "${FILESDIR}"/${P}-ivybridge_support.patch
 
 	# User patches
 	epatch_user