summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-10-30 21:17:22 +0000
committerMike Frysinger <vapier@gentoo.org>2005-10-30 21:17:22 +0000
commitd2ffd2087e04546d81d9f94f47fade089dd27bbc (patch)
treef4f3972f569f7586979b1d681ea3e994a8ae0178 /dev-games/ode
parentold (diff)
downloadgentoo-2-d2ffd2087e04546d81d9f94f47fade089dd27bbc.tar.gz
gentoo-2-d2ffd2087e04546d81d9f94f47fade089dd27bbc.tar.bz2
gentoo-2-d2ffd2087e04546d81d9f94f47fade089dd27bbc.zip
rename
Diffstat (limited to 'dev-games/ode')
-rw-r--r--dev-games/ode/files/0.5-PIC.patch20
-rw-r--r--dev-games/ode/files/ode-0.5-PIC.patch19
2 files changed, 19 insertions, 20 deletions
diff --git a/dev-games/ode/files/0.5-PIC.patch b/dev-games/ode/files/0.5-PIC.patch
deleted file mode 100644
index 8255d34f2cc1..000000000000
--- a/dev-games/ode/files/0.5-PIC.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Make sure we don't clobber %ebx (important with PIC).
-
-http://bugs.gentoo.org/show_bug.cgi?id=77079
-
---- ode-0.5/ode/src/timer.cpp.orig 2005-01-08 00:42:12.799324632 -0500
-+++ ode-0.5/ode/src/timer.cpp 2005-01-08 00:42:38.347440728 -0500
-@@ -118,6 +118,13 @@
- {
- asm volatile (
-+#if defined(__i386__) && defined(__PIC__)
-+ "pushl %%ebx\n"
-+ "cpuid\n"
-+ "popl %%ebx\n"
-+ : : : "%eax","%ecx","%edx","cc","memory");
-+#else
- "mov $0,%%eax\n"
- "cpuid\n"
- : : : "%eax","%ebx","%ecx","%edx","cc","memory");
-+#endif
- }
diff --git a/dev-games/ode/files/ode-0.5-PIC.patch b/dev-games/ode/files/ode-0.5-PIC.patch
new file mode 100644
index 000000000000..b3c1dcf9605c
--- /dev/null
+++ b/dev-games/ode/files/ode-0.5-PIC.patch
@@ -0,0 +1,19 @@
+Make sure we don't clobber %ebx (important with PIC).
+
+http://bugs.gentoo.org/77079
+
+--- ode-0.5/ode/src/timer.cpp
++++ ode-0.5/ode/src/timer.cpp
+@@ -117,9 +117,11 @@ static inline void getClockCount (unsign
+ static inline void serialize()
+ {
+ asm volatile (
++ "mov %%ebx,%%edi\n"
+ "mov $0,%%eax\n"
+ "cpuid\n"
+- : : : "%eax","%ebx","%ecx","%edx","cc","memory");
++ "mov %%edi,%%ebx\n"
++ : : : "%eax","%edi","%ecx","%edx","cc","memory");
+ }
+
+