Skip to content
Snippets Groups Projects
Commit 9ef13430 authored by Guillaume Roguez's avatar Guillaume Roguez Committed by gerrit2
Browse files

contrib: remove unused gmp patches


Change-Id: Ibc9ffdbc0c3c7ec7648627338495ac1181a6ab8b
Reviewed-by: default avatarNicolas Jager <nicolas.jager@savoirfairelinux.com>
parent 73fb4ba7
No related branches found
No related tags found
No related merge requests found
# HG changeset patch
# User Torbjorn Granlund <tege@gmplib.org>
# Date 1396470504 -7200
# Node ID 1fab0adc5ff7d9ecddcbda96f407da58347bb49c
# Parent db645603dcdb41afcf78b19b551ecd5a01c3841c
Workaround for Darwin assembler quirk.
diff -r db645603dcdb -r 1fab0adc5ff7 mpn/x86_64/k8/redc_1.asm
--- a/mpn/x86_64/k8/redc_1.asm Mon Mar 31 23:04:32 2014 +0200
+++ b/mpn/x86_64/k8/redc_1.asm Wed Apr 02 22:28:24 2014 +0200
@@ -114,7 +114,7 @@
JUMPTABSECT
ALIGN(8)
-L(tab): JMPENT( L(0m4), L(tab))
+L(tab): JMPENT( L(0), L(tab))
JMPENT( L(1), L(tab))
JMPENT( L(2), L(tab))
JMPENT( L(3), L(tab))
@@ -397,6 +397,7 @@
ALIGN(16)
+L(0):
L(0m4):
L(lo0): mov (mp,nneg,8), %rax
mov nneg, i
diff -r 53d1f20e8169 configure.ac
--- a/configure.ac Wed Jun 19 17:25:56 2013 +0200
+++ b/configure.ac Tue Jun 25 22:20:56 2013 +0200
@@ -2753,6 +2753,15 @@
and contains `psp_iticksperclktick'.])],,
[#include <sys/pstat.h>])
+# Reasons for checking:
+# lconv decimal_point - not in android
+#
+AC_CHECK_MEMBER(struct lconv.decimal_point,
+ [AC_DEFINE(HAVE_LCONV_DECIMAL_POINT, 1,
+[Define to 1 if <locale.h> `struct lconv' exists
+and contains `decimal_point'.])],,
+ [#include <locale.h>])
+
# C++ tests, when required
#
if test $enable_cxx = yes; then
diff -r 53d1f20e8169 gmp-impl.h
--- a/gmp-impl.h Wed Jun 19 17:25:56 2013 +0200
+++ b/gmp-impl.h Tue Jun 25 22:20:56 2013 +0200
@@ -4368,7 +4368,8 @@
#define GMP_DECIMAL_POINT (nl_langinfo (RADIXCHAR))
#endif
/* localeconv is slower since it returns all locale stuff */
-#if HAVE_LOCALECONV && ! defined (GMP_DECIMAL_POINT)
+/* A placeholder localeconv is useless. */
+#if HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT && ! defined (GMP_DECIMAL_POINT)
#define GMP_DECIMAL_POINT (localeconv()->decimal_point)
#endif
#if ! defined (GMP_DECIMAL_POINT)
--- gmp/mpn/generic/div_qr_1n_pi1.c.orig 2014-03-28 16:11:23.648263232 +0100
+++ gmp/mpn/generic/div_qr_1n_pi1.c 2014-03-28 16:22:29.376932722 +0100
@@ -131,10 +131,19 @@
#endif
#if defined (__arm__) && W_TYPE_SIZE == 32
+#ifdef __thumb2__
+#define itcc "it cc\n\t"
+#define itcs "it cs\n\t"
+#else
+#define itcc
+#define itcs
+#endif
#define add_mssaaaa(m, sh, sl, ah, al, bh, bl) \
__asm__ ( "adds %2, %5, %6\n\t" \
"adcs %1, %3, %4\n\t" \
+ itcc \
"movcc %0, #0\n\t" \
+ itcs \
"movcs %0, #-1" \
: "=r" (m), "=r" (sh), "=&r" (sl) \
: "r" (ah), "rI" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment