[oe-commits] org.oe.dev disapproval of revision 'b8e46b797b32111526a2116d020fdd9e1c079965'
koen commit
oe at amethyst.openembedded.net
Thu May 8 06:57:23 UTC 2008
disapproval of revision 'b8e46b797b32111526a2116d020fdd9e1c079965'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: b0f78dcf5bc551b7f2052b36b0918b4fb1d1af09
ViewMTN: http://monotone.openembedded.org/revision/info/b0f78dcf5bc551b7f2052b36b0918b4fb1d1af09
Files:
1
packages/gmp/files
packages/gmp/files/amd64.patch
packages/gmp/gmp-4.1.2/amd64.patch
packages/gmp/files/sh4-asmfix.patch
packages/gmp/gmp-4.1.4/sh4-asmfix.patch
packages/gmp/files/x86-fat.diff
packages/gmp/gmp-4.2.1/x86-fat.diff
packages/gmp/gmp-4.1.4/amd64.patch
packages/gmp/gmp-4.2.1/amd64.patch
packages/gmp/gmp-4.2.1/sh4-asmfix.patch
packages/gmp/gmp-4.2.2/amd64.patch
packages/gmp/gmp-4.2.2/sh4-asmfix.patch
packages/gmp/gmp-4.2.2/x86-fat.diff
Diffs:
#
# mt diff -rb8e46b797b32111526a2116d020fdd9e1c079965 -rb0f78dcf5bc551b7f2052b36b0918b4fb1d1af09
#
#
#
# delete "packages/gmp/files"
#
# rename "packages/gmp/files/amd64.patch"
# to "packages/gmp/gmp-4.1.2/amd64.patch"
#
# rename "packages/gmp/files/sh4-asmfix.patch"
# to "packages/gmp/gmp-4.1.4/sh4-asmfix.patch"
#
# rename "packages/gmp/files/x86-fat.diff"
# to "packages/gmp/gmp-4.2.1/x86-fat.diff"
#
# add_file "packages/gmp/gmp-4.1.4/amd64.patch"
# content [4b96585a33e8ffe95bc3b84929d67e4bed23a36f]
#
# add_file "packages/gmp/gmp-4.2.1/amd64.patch"
# content [4b96585a33e8ffe95bc3b84929d67e4bed23a36f]
#
# add_file "packages/gmp/gmp-4.2.1/sh4-asmfix.patch"
# content [003be366979f58783858834dc3c70e12f61d89a2]
#
# add_file "packages/gmp/gmp-4.2.2/amd64.patch"
# content [4b96585a33e8ffe95bc3b84929d67e4bed23a36f]
#
# add_file "packages/gmp/gmp-4.2.2/sh4-asmfix.patch"
# content [003be366979f58783858834dc3c70e12f61d89a2]
#
# add_file "packages/gmp/gmp-4.2.2/x86-fat.diff"
# content [827d248fb5ab34abed2e5fd78b1bcb4b6ba286d5]
#
============================================================
--- packages/gmp/gmp-4.1.4/amd64.patch 4b96585a33e8ffe95bc3b84929d67e4bed23a36f
+++ packages/gmp/gmp-4.1.4/amd64.patch 4b96585a33e8ffe95bc3b84929d67e4bed23a36f
@@ -0,0 +1,14 @@
+--- gmp-4.1.4/longlong.h.orig 2004-04-22 00:34:28.000000000 +0200
++++ gmp-4.1.4/longlong.h 2005-07-18 01:13:06.000000000 +0200
+@@ -738,8 +738,10 @@
+ count is only an int. */
+ #define count_trailing_zeros(count, x) \
+ do { \
++ UDItype __cbtmp; \
+ ASSERT ((x) != 0); \
+- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \
++ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \
++ (count) = __cbtmp; \
+ } while (0)
+ #endif /* x86_64 */
+
============================================================
--- packages/gmp/gmp-4.2.1/amd64.patch 4b96585a33e8ffe95bc3b84929d67e4bed23a36f
+++ packages/gmp/gmp-4.2.1/amd64.patch 4b96585a33e8ffe95bc3b84929d67e4bed23a36f
@@ -0,0 +1,14 @@
+--- gmp-4.1.4/longlong.h.orig 2004-04-22 00:34:28.000000000 +0200
++++ gmp-4.1.4/longlong.h 2005-07-18 01:13:06.000000000 +0200
+@@ -738,8 +738,10 @@
+ count is only an int. */
+ #define count_trailing_zeros(count, x) \
+ do { \
++ UDItype __cbtmp; \
+ ASSERT ((x) != 0); \
+- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \
++ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \
++ (count) = __cbtmp; \
+ } while (0)
+ #endif /* x86_64 */
+
============================================================
--- packages/gmp/gmp-4.2.1/sh4-asmfix.patch 003be366979f58783858834dc3c70e12f61d89a2
+++ packages/gmp/gmp-4.2.1/sh4-asmfix.patch 003be366979f58783858834dc3c70e12f61d89a2
@@ -0,0 +1,26 @@
+--- gmp-4.1.4/mpn/sh/add_n.s 2005/11/17 08:44:00 1.1
++++ gmp-4.1.4/mpn/sh/add_n.s 2005/11/17 08:18:57
+@@ -29,8 +29,8 @@
+
+ .text
+ .align 2
+- .global ___gmpn_add_n
+-___gmpn_add_n:
++ .global __gmpn_add_n
++__gmpn_add_n:
+ mov #0,r3 ! clear cy save reg
+
+ Loop: mov.l @r5+,r1
+--- gmp-4.1.4/mpn/sh/sub_n.s 2005/11/17 08:44:04 1.1
++++ gmp-4.1.4/mpn/sh/sub_n.s 2005/11/17 08:18:59
+@@ -29,8 +29,8 @@
+
+ .text
+ .align 2
+- .global ___gmpn_sub_n
+-___gmpn_sub_n:
++ .global __gmpn_sub_n
++__gmpn_sub_n:
+ mov #0,r3 ! clear cy save reg
+
+ Loop: mov.l @r5+,r1
============================================================
--- packages/gmp/gmp-4.2.2/amd64.patch 4b96585a33e8ffe95bc3b84929d67e4bed23a36f
+++ packages/gmp/gmp-4.2.2/amd64.patch 4b96585a33e8ffe95bc3b84929d67e4bed23a36f
@@ -0,0 +1,14 @@
+--- gmp-4.1.4/longlong.h.orig 2004-04-22 00:34:28.000000000 +0200
++++ gmp-4.1.4/longlong.h 2005-07-18 01:13:06.000000000 +0200
+@@ -738,8 +738,10 @@
+ count is only an int. */
+ #define count_trailing_zeros(count, x) \
+ do { \
++ UDItype __cbtmp; \
+ ASSERT ((x) != 0); \
+- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \
++ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \
++ (count) = __cbtmp; \
+ } while (0)
+ #endif /* x86_64 */
+
============================================================
--- packages/gmp/gmp-4.2.2/sh4-asmfix.patch 003be366979f58783858834dc3c70e12f61d89a2
+++ packages/gmp/gmp-4.2.2/sh4-asmfix.patch 003be366979f58783858834dc3c70e12f61d89a2
@@ -0,0 +1,26 @@
+--- gmp-4.1.4/mpn/sh/add_n.s 2005/11/17 08:44:00 1.1
++++ gmp-4.1.4/mpn/sh/add_n.s 2005/11/17 08:18:57
+@@ -29,8 +29,8 @@
+
+ .text
+ .align 2
+- .global ___gmpn_add_n
+-___gmpn_add_n:
++ .global __gmpn_add_n
++__gmpn_add_n:
+ mov #0,r3 ! clear cy save reg
+
+ Loop: mov.l @r5+,r1
+--- gmp-4.1.4/mpn/sh/sub_n.s 2005/11/17 08:44:04 1.1
++++ gmp-4.1.4/mpn/sh/sub_n.s 2005/11/17 08:18:59
+@@ -29,8 +29,8 @@
+
+ .text
+ .align 2
+- .global ___gmpn_sub_n
+-___gmpn_sub_n:
++ .global __gmpn_sub_n
++__gmpn_sub_n:
+ mov #0,r3 ! clear cy save reg
+
+ Loop: mov.l @r5+,r1
============================================================
--- packages/gmp/gmp-4.2.2/x86-fat.diff 827d248fb5ab34abed2e5fd78b1bcb4b6ba286d5
+++ packages/gmp/gmp-4.2.2/x86-fat.diff 827d248fb5ab34abed2e5fd78b1bcb4b6ba286d5
@@ -0,0 +1,122 @@
+See:
+
+ http://gmplib.org/patches/x86-fat.diff
+ http://gmplib.org/list-archives/gmp-bugs/2006-October/000579.html
+ http://gmplib.org/#BUGREPORTS
+
+Removed the configure part of the patch since we patch configure.in. It was
+only needed for FAT binaries anyway and this is being included to fix
+linking errors.
+
+Index: mpn/generic/addsub_n.c
+===================================================================
+RCS file: /home/cvsfiles/gmp42/mpn/generic/addsub_n.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -p -2 -r1.1 -r1.2
+*** mpn/generic/addsub_n.c 14 Mar 2006 15:57:54 -0000 1.1
+--- mpn/generic/addsub_n.c 15 May 2006 22:38:42 -0000 1.2
+***************
+*** 1,5 ****
+ /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length.
+
+! Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is part of the GNU MP Library.
+--- 1,5 ----
+ /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length.
+
+! Copyright 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
+
+ This file is part of the GNU MP Library.
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 59,63 ****
+ {
+ this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
+ acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+ #else
+--- 59,63 ----
+ {
+ this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc
+ acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+ #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 65,69 ****
+ acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
+ #endif
+! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
+ scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+ #else
+--- 65,69 ----
+ acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
+ #endif
+! #if HAVE_NATIVE_mpn_sub_nc
+ scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+ #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 82,86 ****
+ {
+ this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
+ scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+ #else
+--- 82,86 ----
+ {
+ this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_sub_nc
+ scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+ #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 88,92 ****
+ scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
+ #endif
+! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
+ acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+ #else
+--- 88,92 ----
+ scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
+ #endif
+! #if HAVE_NATIVE_mpn_add_nc
+ acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+ #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 98,102 ****
+ else
+ {
+! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2=s2 or vice versa)
+ Need temporary storage. */
+ mp_limb_t tp[PART_SIZE];
+--- 98,102 ----
+ else
+ {
+! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2==s2 or vice versa)
+ Need temporary storage. */
+ mp_limb_t tp[PART_SIZE];
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 106,110 ****
+ {
+ this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
+ acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
+ #else
+--- 106,110 ----
+ {
+ this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc
+ acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
+ #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 112,116 ****
+ acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
+ #endif
+! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
+ scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+ #else
+--- 112,116 ----
+ acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
+ #endif
+! #if HAVE_NATIVE_mpn_sub_nc
+ scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+ #else
More information about the Openembedded-commits
mailing list