[gentoo-commits] proj/sci:master commit in: sci-libs/openblas/files/

[gentoo-commits] proj/sci:master commit in: sci-libs/openblas/files/

[Justin Lecher]

commit:     4ba5eb5dcc7a2c6ba462725349b35932f0d9fc42
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  6 17:02:52 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:39:25 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4ba5eb5d

openblas-0.2.11 requires the cpuid_x86 patch

---
 .../openblas/files/openblas-9999-cpuid_x86.patch   | 27 ----------------------
 1 file changed, 27 deletions(-)

diff --git a/sci-libs/openblas/files/openblas-9999-cpuid_x86.patch b/sci-libs/openblas/files/openblas-9999-cpuid_x86.patch
deleted file mode 100644
index c6f2991..0000000
--- a/sci-libs/openblas/files/openblas-9999-cpuid_x86.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- openblas-9999-orig/cpuid_x86.c	2014-02-23 15:25:22.199394761 +1100
-+++ openblas-9999/cpuid_x86.c	2014-02-23 16:41:02.727372869 +1100
-@@ -57,9 +57,23 @@
- void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx);
- #else
- static inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx){
-+#if __x86_64
-   __asm__ __volatile__
-     ("cpuid": "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (op) : "cc");
--
-+#else
-+  __asm volatile(
-+    "push %%ebx\n\t"
-+    "cpuid\n\t"
-+    "mov %%ebx, (%4)\n\t"
-+    "pop %%ebx"
-+    :"=a" (*eax),
-+    "=c" (*ecx),
-+    "=d" (*edx)
-+    :"a" (op),
-+    "cc"
-+    "S" (ebx)
-+    :"memory");
-+#endif
- }
- #endif
- 

[gentoo-commits] proj/sci:master commit in: sci-libs/openblas/files/

[Justin Lecher]

commit:     0f32e37a4a8a8594a9b708bea50630ef711b172b
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 11:30:28 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:30:28 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0f32e37a

Fix rebase lapack-multibuild to master conflict 6 on sci-libs/openblas

---
 .../openblas/files/openblas-9999-cpuid_x86.patch   | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/sci-libs/openblas/files/openblas-9999-cpuid_x86.patch b/sci-libs/openblas/files/openblas-9999-cpuid_x86.patch
new file mode 100644
index 0000000..c6f2991
--- /dev/null
+++ b/sci-libs/openblas/files/openblas-9999-cpuid_x86.patch
@@ -0,0 +1,27 @@
+--- openblas-9999-orig/cpuid_x86.c	2014-02-23 15:25:22.199394761 +1100
++++ openblas-9999/cpuid_x86.c	2014-02-23 16:41:02.727372869 +1100
+@@ -57,9 +57,23 @@
+ void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx);
+ #else
+ static inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx){
++#if __x86_64
+   __asm__ __volatile__
+     ("cpuid": "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (op) : "cc");
+-
++#else
++  __asm volatile(
++    "push %%ebx\n\t"
++    "cpuid\n\t"
++    "mov %%ebx, (%4)\n\t"
++    "pop %%ebx"
++    :"=a" (*eax),
++    "=c" (*ecx),
++    "=d" (*edx)
++    :"a" (op),
++    "cc"
++    "S" (ebx)
++    :"memory");
++#endif
+ }
+ #endif
+