summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Hildebrand <zypher@gentoo.org>2004-10-19 20:36:27 +0000
committerMarc Hildebrand <zypher@gentoo.org>2004-10-19 20:36:27 +0000
commitc91d9ad4d2f900325262837bf9ef807450262b51 (patch)
tree3bd4290eb369f53467d0f470304371f102100568 /media-video/avidemux/files
parentStable on PowerPC. (diff)
downloadhistorical-c91d9ad4d2f900325262837bf9ef807450262b51.tar.gz
historical-c91d9ad4d2f900325262837bf9ef807450262b51.tar.bz2
historical-c91d9ad4d2f900325262837bf9ef807450262b51.zip
Added amd64 patch, closing bug #68052
Diffstat (limited to 'media-video/avidemux/files')
-rw-r--r--media-video/avidemux/files/avidemux-2.0.30_amd64_cpuutil.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/media-video/avidemux/files/avidemux-2.0.30_amd64_cpuutil.patch b/media-video/avidemux/files/avidemux-2.0.30_amd64_cpuutil.patch
new file mode 100644
index 000000000000..f204d0104398
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.0.30_amd64_cpuutil.patch
@@ -0,0 +1,42 @@
+Index: cputest.c
+===================================================================
+RCS file: adm_lavcodec/i386/cputest.c,v
+retrieving revision 1.4
+diff -u -r1.4 cputest.c
+--- cputest.c 12 Oct 2004 18:28:41 -0000 1.4
++++ cputest.c 19 Oct 2004 17:48:07 -0000
+@@ -27,29 +27,30 @@
+ {
+ int rval;
+ int eax, ebx, ecx, edx;
++ long a,c;
+
+ __asm__ __volatile__ (
+ /* See if CPUID instruction is supported ... */
+ /* ... Get copies of EFLAGS into eax and ecx */
+ "pushf\n\t"
+ "pop %0\n\t"
+- "movl %0, %1\n\t"
++ "mov %0, %1\n\t"
+
+ /* ... Toggle the ID bit in one copy and store */
+ /* to the EFLAGS reg */
+- "xorl $0x200000, %0\n\t"
++ "xor $0x200000, %0\n\t"
+ "push %0\n\t"
+ "popf\n\t"
+
+ /* ... Get the (hopefully modified) EFLAGS */
+ "pushf\n\t"
+ "pop %0\n\t"
+- : "=a" (eax), "=c" (ecx)
++ : "=a" (a), "=c" (c)
+ :
+ : "cc"
+ );
+
+- if (eax == ecx)
++ if (a == c)
+ return 0; /* CPUID not supported */
+
+ cpuid(0, eax, ebx, ecx, edx);