| 1 |
tommy 10/12/28 12:34:30 |
| 2 |
|
| 3 |
Modified: nativebiginteger-0.6.4-ldflags.patch |
| 4 |
Added: nativebiginteger-0.6.4-asmfix.patch |
| 5 |
Log: |
| 6 |
Revision bump, fix asm code for x86, fix linking order, fixes bug 349784 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha10-r1/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: nativebiginteger-0.6.4-ldflags.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- nativebiginteger-0.6.4-ldflags.patch 4 Sep 2010 19:55:18 -0000 1.1 |
| 24 |
+++ nativebiginteger-0.6.4-ldflags.patch 28 Dec 2010 12:34:30 -0000 1.2 |
| 25 |
@@ -1,11 +1,12 @@ |
| 26 |
--- Makefile 2008-11-06 21:09:54.000000000 +0100 |
| 27 |
-+++ Makefile.new 2010-09-04 21:48:57.941604821 +0200 |
| 28 |
++++ Makefile.new 2010-12-27 14:26:45.000000000 +0100 |
| 29 |
@@ -1,11 +1,11 @@ |
| 30 |
libjbigi: |
| 31 |
cd jbigi && rm -f jbigi.o libjbigi.so && $(CC) $(CFLAGS) -c -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \ |
| 32 |
- jbigi/src/jbigi.c && $(CC) -shared -Wl,-soname,libjbigi.so -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -lgmp \ |
| 33 |
-+ jbigi/src/jbigi.c && $(CC) ${LDFLAGS} -shared -Wl,-soname,libjbigi.so -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -lgmp \ |
| 34 |
- -o libjbigi.so jbigi.o |
| 35 |
+- -o libjbigi.so jbigi.o |
| 36 |
++ jbigi/src/jbigi.c && $(CC) ${LDFLAGS} -shared -Wl,-soname,libjbigi.so jbigi.o -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -lgmp \ |
| 37 |
++ -o libjbigi.so |
| 38 |
|
| 39 |
|
| 40 |
libjcpuid: |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: nativebiginteger-0.6.4-asmfix.patch |
| 50 |
=================================================================== |
| 51 |
--- jcpuid/src/jcpuid.c 2008-10-06 09:44:53.000000000 -0400 |
| 52 |
+++ jcpuid/src/jcpuid.c.new2 2010-12-27 09:41:53.000000000 -0500 |
| 53 |
@@ -19,6 +19,7 @@ |
| 54 |
mov d, edx |
| 55 |
} |
| 56 |
#else |
| 57 |
+ #ifdef _LP64 |
| 58 |
//Use GCC assembler notation |
| 59 |
asm |
| 60 |
( |
| 61 |
@@ -29,6 +30,20 @@ |
| 62 |
"=d"(d) |
| 63 |
:"a"(iFunction) |
| 64 |
); |
| 65 |
+ #elif defined(__i386__) |
| 66 |
+ asm |
| 67 |
+ ( |
| 68 |
+ "pushl %%ebx\n\t" |
| 69 |
+ "cpuid\n\t" |
| 70 |
+ "movl %%ebx, %%edi\n\t" |
| 71 |
+ "popl %%ebx" |
| 72 |
+ : "=a" (a), |
| 73 |
+ "=D" (b), |
| 74 |
+ "=c" (c), |
| 75 |
+ "=d" (d) |
| 76 |
+ :"a"(iFunction) |
| 77 |
+ ); |
| 78 |
+ #endif |
| 79 |
#endif |
| 80 |
return (*env)->NewObject(env, clsResult,constructor,a,b,c,d); |
| 81 |
} |
Archives