summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sachau <tommy@gentoo.org>2010-12-28 12:34:30 +0000
committerThomas Sachau <tommy@gentoo.org>2010-12-28 12:34:30 +0000
commit8cbd88c907d6d4e159453e6ae26c0ab98306910a (patch)
tree83240c690bf561d26f83a90b7445b99487e04246 /net-libs/nativebiginteger/files
parentUnmask rack 1.2.1 since bug 341941 is now resolved. (diff)
downloadgentoo-2-8cbd88c907d6d4e159453e6ae26c0ab98306910a.tar.gz
gentoo-2-8cbd88c907d6d4e159453e6ae26c0ab98306910a.tar.bz2
gentoo-2-8cbd88c907d6d4e159453e6ae26c0ab98306910a.zip
Revision bump, fix asm code for x86, fix linking order, fixes bug 349784
(Portage version: 2.2.0_alpha10-r1/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/nativebiginteger/files')
-rw-r--r--net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch31
-rw-r--r--net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch7
2 files changed, 35 insertions, 3 deletions
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch
new file mode 100644
index 000000000000..04cfa599413a
--- /dev/null
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch
@@ -0,0 +1,31 @@
+--- jcpuid/src/jcpuid.c 2008-10-06 09:44:53.000000000 -0400
++++ jcpuid/src/jcpuid.c.new2 2010-12-27 09:41:53.000000000 -0500
+@@ -19,6 +19,7 @@
+ mov d, edx
+ }
+ #else
++ #ifdef _LP64
+ //Use GCC assembler notation
+ asm
+ (
+@@ -29,6 +30,20 @@
+ "=d"(d)
+ :"a"(iFunction)
+ );
++ #elif defined(__i386__)
++ asm
++ (
++ "pushl %%ebx\n\t"
++ "cpuid\n\t"
++ "movl %%ebx, %%edi\n\t"
++ "popl %%ebx"
++ : "=a" (a),
++ "=D" (b),
++ "=c" (c),
++ "=d" (d)
++ :"a"(iFunction)
++ );
++ #endif
+ #endif
+ return (*env)->NewObject(env, clsResult,constructor,a,b,c,d);
+ }
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch
index c9638a7d0bb4..5d3c84cd641e 100644
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch
@@ -1,11 +1,12 @@
--- Makefile 2008-11-06 21:09:54.000000000 +0100
-+++ Makefile.new 2010-09-04 21:48:57.941604821 +0200
++++ Makefile.new 2010-12-27 14:26:45.000000000 +0100
@@ -1,11 +1,11 @@
libjbigi:
cd jbigi && rm -f jbigi.o libjbigi.so && $(CC) $(CFLAGS) -c -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
- jbigi/src/jbigi.c && $(CC) -shared -Wl,-soname,libjbigi.so -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -lgmp \
-+ jbigi/src/jbigi.c && $(CC) ${LDFLAGS} -shared -Wl,-soname,libjbigi.so -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -lgmp \
- -o libjbigi.so jbigi.o
+- -o libjbigi.so jbigi.o
++ 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 \
++ -o libjbigi.so
libjcpuid: