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
+
