[libntl] 06/12: merge patched into master
Julien Puydt
julien.puydt at laposte.net
Wed Jun 1 15:19:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository libntl.
commit 50e7c495467210681b0302d2241e308e81352e8e
Merge: 82611c3 8bda5c1
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Wed Jun 1 16:25:23 2016 +0200
merge patched into master
README | 4 +-
debian/.git-dpm | 6 +-
debian/patches/0001-gcc-4.5-mips.patch | 8 +-
debian/patches/0002-a-callback-for-sage.patch | 36 -
.../patches/0003-replace-md5-implementation.patch | 402 --
...ace-md5-implementation-newer-upstreams-do.patch | 401 --
...llback-for-sage-newer-sage-versions-don-t.patch | 27 -
debian/patches/series | 4 -
doc/BasicThreadPool.cpp.html | 384 +
doc/BasicThreadPool.txt | 374 +
doc/GF2.cpp.html | 2 +-
doc/GF2E.cpp.html | 2 +-
doc/GF2EX.cpp.html | 2 +-
doc/GF2EXFactoring.cpp.html | 4 +-
doc/GF2EXFactoring.txt | 2 +-
doc/GF2X.cpp.html | 2 +-
doc/GF2XFactoring.cpp.html | 2 +-
doc/GF2XVec.cpp.html | 2 +-
doc/HNF.cpp.html | 2 +-
doc/LLL.cpp.html | 2 +-
doc/Lazy.cpp.html | 2 +-
doc/LazyTable.cpp.html | 2 +-
doc/RR.cpp.html | 57 +-
doc/RR.txt | 55 +
doc/SmartPtr.cpp.html | 17 +-
doc/SmartPtr.txt | 15 +
doc/ZZ.cpp.html | 104 +-
doc/ZZ.txt | 102 +-
doc/ZZVec.cpp.html | 2 +-
doc/ZZX.cpp.html | 2 +-
doc/ZZXFactoring.cpp.html | 2 +-
doc/ZZ_p.cpp.html | 4 +-
doc/ZZ_p.txt | 2 +-
doc/ZZ_pE.cpp.html | 2 +-
doc/ZZ_pEX.cpp.html | 2 +-
doc/ZZ_pEXFactoring.cpp.html | 4 +-
doc/ZZ_pEXFactoring.txt | 2 +-
doc/ZZ_pX.cpp.html | 3 +-
doc/ZZ_pX.txt | 1 +
doc/ZZ_pXFactoring.cpp.html | 4 +-
doc/ZZ_pXFactoring.txt | 2 +-
doc/config.txt | 139 +-
doc/copying.txt | 18 +-
doc/lzz_p.cpp.html | 2 +-
doc/lzz_pE.cpp.html | 2 +-
doc/lzz_pEX.cpp.html | 2 +-
doc/lzz_pEXFactoring.cpp.html | 4 +-
doc/lzz_pEXFactoring.txt | 2 +-
doc/lzz_pX.cpp.html | 41 +-
doc/lzz_pX.txt | 39 +
doc/lzz_pXFactoring.cpp.html | 2 +-
doc/mat_GF2.cpp.html | 8 +-
doc/mat_GF2.txt | 6 +-
doc/mat_GF2E.cpp.html | 13 +-
doc/mat_GF2E.txt | 11 +-
doc/mat_RR.cpp.html | 2 +-
doc/mat_ZZ.cpp.html | 2 +-
doc/mat_ZZ_p.cpp.html | 13 +-
doc/mat_ZZ_p.txt | 11 +-
doc/mat_ZZ_pE.cpp.html | 13 +-
doc/mat_ZZ_pE.txt | 11 +-
doc/mat_lzz_p.cpp.html | 76 +-
doc/mat_lzz_p.txt | 74 +-
doc/mat_lzz_pE.cpp.html | 9 +-
doc/mat_lzz_pE.txt | 7 +-
doc/mat_poly_ZZ.cpp.html | 2 +-
doc/mat_poly_ZZ_p.cpp.html | 2 +-
doc/mat_poly_lzz_p.cpp.html | 2 +-
doc/matrix.cpp.html | 2 +-
doc/pair.cpp.html | 2 +-
doc/quad_float.cpp.html | 2 +-
doc/tools.cpp.html | 15 +-
doc/tools.txt | 13 +
doc/tour-changes.html | 457 +-
doc/tour-ex5.html | 40 +-
doc/tour-ex6.html | 10 +-
doc/tour-ex7.html | 200 +
doc/tour-examples.html | 1 +
doc/tour-gmp.html | 43 +-
doc/tour-impl.html | 105 +-
doc/tour-modules.html | 11 +
doc/tour-time.html | 121 +-
doc/tour-tips.html | 40 +-
doc/tour-unix.html | 212 +-
doc/tour-win.html | 37 +-
doc/vec_GF2.cpp.html | 2 +-
doc/vec_GF2E.cpp.html | 2 +-
doc/vec_RR.cpp.html | 2 +-
doc/vec_ZZ.cpp.html | 2 +-
doc/vec_ZZ_p.cpp.html | 2 +-
doc/vec_ZZ_pE.cpp.html | 2 +-
doc/vec_lzz_p.cpp.html | 2 +-
doc/vec_lzz_pE.cpp.html | 2 +-
doc/vector.cpp.html | 24 +-
doc/vector.txt | 22 +-
doc/version.cpp.html | 2 +-
doc/xdouble.cpp.html | 2 +-
include/NTL/BasicThreadPool.h | 723 ++
include/NTL/GF2E.h | 7 +-
include/NTL/GF2EX.h | 5 +-
include/NTL/GF2EXFactoring.h | 15 +-
include/NTL/GF2X.h | 4 +-
include/NTL/HAVE_AVX.h | 1 +
include/NTL/HAVE_BUILTIN_CLZL.h | 1 +
include/NTL/HAVE_FMA.h | 1 +
include/NTL/HAVE_LL_TYPE.h | 1 +
include/NTL/LLL.h | 4 +-
include/NTL/LazyTable.h | 4 +-
include/NTL/RR.h | 4 +-
include/NTL/SPMM_ASM.h | 3 +
include/NTL/SmartPtr.h | 126 +-
include/NTL/ZZ.h | 138 +-
include/NTL/ZZXFactoring.h | 10 +-
include/NTL/ZZ_p.h | 39 +-
include/NTL/ZZ_pE.h | 7 +-
include/NTL/ZZ_pEX.h | 2 +-
include/NTL/ZZ_pEXFactoring.h | 8 +-
include/NTL/ZZ_pX.h | 8 +-
include/NTL/ZZ_pXFactoring.h | 6 +-
include/NTL/config.h | 109 +-
include/NTL/ctools.h | 86 +-
include/NTL/def_config.h | 109 +-
include/NTL/g_lip.h | 2 +-
include/NTL/have_LL.h | 0
include/NTL/have_LL_no.h | 0
include/NTL/have_LL_yes.h | 4 -
include/NTL/have_builtin_clzl.h | 0
include/NTL/have_builtin_clzl_no.h | 0
include/NTL/have_builtin_clzl_yes.h | 4 -
include/NTL/lip.h | 26 +
include/NTL/lzz_p.h | 36 +-
include/NTL/lzz_pE.h | 7 +-
include/NTL/lzz_pEX.h | 4 +-
include/NTL/lzz_pEXFactoring.h | 8 +-
include/NTL/lzz_pX.h | 45 +-
include/NTL/lzz_pXFactoring.h | 8 +-
include/NTL/mat_GF2.h | 1 +
include/NTL/mat_GF2E.h | 4 +-
include/NTL/mat_ZZ_p.h | 4 +-
include/NTL/mat_ZZ_pE.h | 4 +-
include/NTL/mat_lzz_p.h | 79 +-
include/NTL/mat_lzz_pE.h | 4 +-
include/NTL/quad_float.h | 17 +-
include/NTL/sp_arith.h | 198 +-
include/NTL/thread.h | 2 +-
include/NTL/tools.h | 359 +-
include/NTL/vector.h | 4 +
include/NTL/version.h | 4 +-
include/NTL/xdouble.h | 4 +-
src/BasicThreadPool.c | 32 +
src/BitMatTest.c | 8 +-
src/CheckAVX.c | 63 +
src/CheckCompile.c | 2 +
src/CheckFMA.c | 65 +
src/CheckLL.c | 10 +
src/CheckPCLMUL.c | 54 -
src/CopyFeatures | 5 +
src/DIRNAME | 2 +-
src/DispSettings.c | 38 +-
src/DoConfig | 269 +-
src/FFT.c | 77 +-
src/GF2E.c | 17 +-
src/GF2EX.c | 4 +-
src/GF2EXFactoring.c | 12 +-
src/GF2X.c | 12 +-
src/GF2X1.c | 77 +-
src/GF2XTimeTest.c | 8 +-
src/G_LLL_FP.c | 23 +-
src/G_LLL_QP.c | 38 +-
src/G_LLL_RR.c | 32 +-
src/G_LLL_XD.c | 32 +-
src/GetTime0.c | 126 +
src/GetTime4.c | 4 +-
src/InitSettings.c | 37 +-
src/LLL_FP.c | 18 +-
src/LLL_QP.c | 39 +-
src/LLL_RR.c | 34 +-
src/LLL_XD.c | 35 +-
src/MakeCheckCLZL | 24 -
src/MakeCheckFeature | 26 +
src/MakeCheckLL | 24 -
src/MakeDesc.c | 106 +-
src/MakeDescAux.c | 30 +
src/MakeGetPID | 4 +-
src/MakeGetTime | 28 +-
src/MulTimeTest.c | 4 +-
src/NOTES | 14 -
src/Poly1TimeTest.c | 64 +-
src/{PolyTimeTest.c => Poly2TimeTest.c} | 36 +-
src/{PolyTimeTest.c => Poly3TimeTest.c} | 52 +-
src/QuickTest.c | 83 +-
src/RR.c | 77 +-
src/ResetFeatures | 5 +
src/TestScript | 9 +
src/ThreadTest.c | 103 +-
src/VERSION_INFO | 2 +-
src/WINDIR | 2 +-
src/Wizard | 11 +-
src/WizardAux | 101 +-
src/WordVector.c | 2 +-
src/ZZ.c | 1026 +--
src/ZZX.c | 2 +-
src/ZZX1.c | 31 +-
src/ZZXFactoring.c | 14 +-
src/ZZ_p.c | 75 +-
src/ZZ_pE.c | 21 +-
src/ZZ_pEX.c | 4 +-
src/ZZ_pEXFactoring.c | 12 +-
src/ZZ_pX.c | 1308 +++-
src/ZZ_pX1.c | 118 +-
src/ZZ_pXFactoring.c | 12 +-
src/c_lip_impl.h | 105 +-
src/cfile | 109 +-
src/configure | 20 +-
src/ctools.c | 20 +-
src/def_makefile | 76 +-
src/dosify | 4 +-
src/fileio.c | 13 +-
src/g_lip_impl.h | 1187 ++-
src/lzz_p.c | 193 +-
src/lzz_pE.c | 18 +-
src/lzz_pEX.c | 4 +-
src/lzz_pEXFactoring.c | 12 +-
src/lzz_pX.c | 265 +-
src/lzz_pX1.c | 524 +-
src/lzz_pXFactoring.c | 119 +-
src/mach_desc.win | 3 +-
src/makefile | 76 +-
src/mat_GF2.c | 23 +-
src/mat_GF2E.c | 22 +-
src/mat_ZZ_p.c | 22 +-
src/mat_ZZ_pE.c | 28 +-
src/mat_lzz_p.c | 7520 ++++++++++++++++++--
src/mat_lzz_pE.c | 28 +-
src/mat_lzz_pTest.c | 269 +
src/mfile | 74 +-
src/ppscript | 2 +-
src/quad_float.c | 175 +-
src/thread.c | 4 +-
src/tools.c | 4 +-
src/unixify | 4 +-
src/vec_RR.c | 2 +-
src/vec_lzz_p.c | 20 +-
src/xdouble.c | 15 +-
244 files changed, 17733 insertions(+), 4023 deletions(-)
diff --cc debian/.git-dpm
index 0d16279,0000000..ae130e8
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- e06aa120924b28bab11023bbdc4875b339b503af
- e06aa120924b28bab11023bbdc4875b339b503af
- 0feffaef525a8bd40df7cb43ed60a16e1c92ed8e
++8bda5c157d05c8c2f355fa17cc06091b7d66c5eb
++8bda5c157d05c8c2f355fa17cc06091b7d66c5eb
++55c369b715ebaf38a7de1bdcd37041e97dde3bd6
+55c369b715ebaf38a7de1bdcd37041e97dde3bd6
+ntl_9.9.0.orig.tar.gz
+908595a2bfe966e799aeb167f317dffa4ee55d66
+954063
diff --cc debian/patches/0001-gcc-4.5-mips.patch
index dab0d81,0000000..12d881e
mode 100644,000000..100644
--- a/debian/patches/0001-gcc-4.5-mips.patch
+++ b/debian/patches/0001-gcc-4.5-mips.patch
@@@ -1,48 -1,0 +1,48 @@@
- From 74724f8da930e8a0946ce46e79874626101a4f82 Mon Sep 17 00:00:00 2001
++From 8bda5c157d05c8c2f355fa17cc06091b7d66c5eb Mon Sep 17 00:00:00 2001
+From: Aurelien Jarno <aurel32 at debian.org>
+Date: Sun, 17 Apr 2011 23:41:31 +0200
+Subject: gcc-4.5-mips
+
+Bug-Debian: 623162
+
+Since GCC 4.4 it's not possible anymore to use the 'h' constraints for
+MIPS inline assembly code when doing a multiplication. That's why sprng
+fails to build from source on mips and mipsel.
+
+That said GCC supports 32x32 => 64 multiplication on 32-bit architecture
+for a lot of time, so there is no need to use assembly code for that.
+The patch below fixes the problem by using standard multiplication
+instead of assembly code. I have also included the code for MIPS64 using
+128-bit hints for reference (the second hunk), though it is not used in
+Debian.
+---
+ include/NTL/SPMM_ASM.h | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/include/NTL/SPMM_ASM.h b/include/NTL/SPMM_ASM.h
- index dc0bfb9..9ff7942 100644
++index f38d274..17849ee 100644
+--- a/include/NTL/SPMM_ASM.h
++++ b/include/NTL/SPMM_ASM.h
- @@ -147,8 +147,8 @@ static inline unsigned long MulHiUL(unsigned long a, unsigned long b)
++@@ -150,8 +150,8 @@ static inline unsigned long MulHiUL(unsigned long a, unsigned long b)
+
+ static inline unsigned long MulHiUL(unsigned long a, unsigned long b)
+ {
+- unsigned long hi, lo;
+- __asm__ ("multu %2,%3" : "=l" (lo), "=h" (hi) : "d" (a), "d" (b));
++ unsigned long hi;
++ hi = ((unsigned long long) a * b) >> 32;
+ return hi;
+ }
+
- @@ -159,8 +159,9 @@ static inline unsigned long MulHiUL(unsigned long a, unsigned long b)
++@@ -162,8 +162,9 @@ static inline unsigned long MulHiUL(unsigned long a, unsigned long b)
+
+ static inline unsigned long MulHiUL(unsigned long a, unsigned long b)
+ {
+- unsigned long hi, lo;
+- __asm__ ("dmultu %2,%3" : "=l" (lo), "=h" (hi) : "d" (a), "d" (b));
++ typedef unsigned int uint128_t __attribute__((mode(TI)));
++ unsigned long hi;
++ hi = ((uint128_t) a * b) >> 64;
+ return hi;
+ }
+
diff --cc debian/patches/series
index 85093a0,0000000..56b92cb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,1 @@@
+0001-gcc-4.5-mips.patch
- 0002-a-callback-for-sage.patch
- 0003-replace-md5-implementation.patch
- 0004-Revert-replace-md5-implementation-newer-upstreams-do.patch
- 0005-Revert-a-callback-for-sage-newer-sage-versions-don-t.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libntl.git
More information about the debian-science-commits
mailing list