[gmp-ecm] 41/77: Unapply patches in the master branch.
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Jun 6 12:33:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository gmp-ecm.
commit 7ebcff1b07e5e323bbaf744b9e2f8f9f2b113e76
Author: Laurent Fousse <laurent at komite.net>
Date: Mon Sep 26 22:54:52 2011 +0200
Unapply patches in the master branch.
---
Makefile.am | 2 +-
Makefile.in | 3 +--
config.guess | 9 ++++-----
config.sub | 19 +++++--------------
ecm-params.h | 13 ++++++++++++-
sp.h | 4 ----
6 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index dd033bd..5e1924f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ libecm_la_SOURCES = ecm.c ecm2.c pm1.c pp1.c getprime.c listz.c lucas.c \
# Link the asm redc code (if we use it) into libecm.la
libecm_la_CPPFLAGS = $(MULREDCINCPATH)
libecm_la_CFLAGS = $(OPENMP_CFLAGS)
-libecm_la_LDFLAGS = '-version-info 0:0:0' $(MULREDCLIBPATH) $(GMPLIB)
+libecm_la_LDFLAGS = '-version-info 0:0:0' $(MULREDCLIBPATH)
libecm_la_LIBADD = $(MULREDCLIBRARY)
bin_PROGRAMS = ecm
diff --git a/Makefile.in b/Makefile.in
index b53e4bb..f507913 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -312,7 +312,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POW_LIB = @POW_LIB@
@@ -402,7 +401,7 @@ libecm_la_SOURCES = ecm.c ecm2.c pm1.c pp1.c getprime.c listz.c \
# Link the asm redc code (if we use it) into libecm.la
libecm_la_CPPFLAGS = $(MULREDCINCPATH)
libecm_la_CFLAGS = $(OPENMP_CFLAGS)
-libecm_la_LDFLAGS = '-version-info 0:0:0' $(MULREDCLIBPATH) $(GMPLIB)
+libecm_la_LDFLAGS = '-version-info 0:0:0' $(MULREDCLIBPATH)
libecm_la_LIBADD = $(MULREDCLIBRARY)
# Most binaries want to link libecm.la, and the ones which don't will
# have their own _LDADD which overrides the default LDADD here
diff --git a/config.guess b/config.guess
index c2246a4..dc84c68 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2009-12-30'
+timestamp='2009-11-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,9 +56,8 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/config.sub b/config.sub
index c2d1257..2a55a50 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2010-01-22'
+timestamp='2009-11-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -75,9 +75,8 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -381,8 +380,7 @@ case $basic_machine in
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
@@ -1087,11 +1085,6 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*)
basic_machine=tile-unknown
os=-linux-gnu
@@ -1442,8 +1435,6 @@ case $os in
-dicos*)
os=-dicos
;;
- -nacl*)
- ;;
-none)
;;
*)
diff --git a/ecm-params.h b/ecm-params.h
deleted file mode 120000
index 05942d4..0000000
--- a/ecm-params.h
+++ /dev/null
@@ -1 +0,0 @@
-ecm-params.h.athlon64
\ No newline at end of file
diff --git a/ecm-params.h b/ecm-params.h
new file mode 100644
index 0000000..b358901
--- /dev/null
+++ b/ecm-params.h
@@ -0,0 +1,12 @@
+#define TUNE_MULREDC_THRESH 16
+#define TUNE_SQRREDC_THRESH 11
+#define MPZMOD_THRESHOLD 128
+#define REDC_THRESHOLD 512
+#define MPN_MUL_LO_THRESHOLD_TABLE {0, 0, 0, 2, 1, 0, 4, 5, 0, 7, 9, 1, 1, 7, 11, 11, 1, 16, 1, 15, 16, 17, 16, 0, 17, 20, 22, 17, 16, 20, 15, 24}
+#define NTT_GFP_TWIDDLE_DIF_BREAKOVER 11
+#define NTT_GFP_TWIDDLE_DIT_BREAKOVER 11
+#define MUL_NTT_THRESHOLD 256
+#define PREREVERTDIVISION_NTT_THRESHOLD 16
+#define POLYINVERT_NTT_THRESHOLD 256
+#define POLYEVALT_NTT_THRESHOLD 128
+#define MPZSPV_NORMALISE_STRIDE 128
diff --git a/sp.h b/sp.h
index 265f060..941b339 100644
--- a/sp.h
+++ b/sp.h
@@ -78,10 +78,6 @@ typedef mp_limb_t UDItype;
#define ULONG_MAX __GMP_ULONG_MAX
#endif
-#if defined (__s390__) || defined (__hppa__) || defined (__mips__)
-#define NO_ASM
-#endif
-
#define LONGLONG_STANDALONE
#include "longlong.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmp-ecm.git
More information about the debian-science-commits
mailing list