[gf2x] 01/02: Prepared -2, fixing all bugs reported to the BTS, and another one
Julien Puydt
julien.puydt at laposte.net
Wed Nov 19 15:19:50 UTC 2014
This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository gf2x.
commit 10786ab1035893b1b3264fb34fbaf6183a84c962
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Wed Nov 19 13:42:40 2014 +0100
Prepared -2, fixing all bugs reported to the BTS, and another one
---
debian/changelog | 8 +++
debian/patches/fix_memset.patch | 23 +++++++
...-instead-of-believing-it-s-unnecessary-if.patch | 74 ++++++++++++++++++++++
debian/patches/series | 2 +
debian/rules | 2 +
5 files changed, 109 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 4cdea04..6f0fd7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gf2x (1.1-2) UNRELEASED; urgency=medium
+
+ * Don't compile with pclmul by default (Closes: #725253)
+ * Handle msse2 better (Closes: #769249)
+ * Fix a memset issue.
+
+ -- Julien Puydt <julien.puydt at laposte.net> Wed, 19 Nov 2014 13:38:48 +0100
+
gf2x (1.1-1) unstable; urgency=low
* Initial release (Closes: #720725).
diff --git a/debian/patches/fix_memset.patch b/debian/patches/fix_memset.patch
new file mode 100644
index 0000000..041d379
--- /dev/null
+++ b/debian/patches/fix_memset.patch
@@ -0,0 +1,23 @@
+commit ef7118ae91edc089cb5249d3c487a491e629a1f1
+Author: zimmerma <zimmerma at e5c1114b-a573-4582-9dac-f72f410959ce>
+Date: Thu Jun 6 06:44:36 2013 +0000
+
+ feedback from Sage developers, see
+ http://trac.sagemath.org/sage_trac/ticket/2114#comment:32
+
+
+ git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/gf2x@151 e5c1114b-a573-4582-9dac-f72f410959ce
+
+diff --git a/gf2x.c b/gf2x.c
+index d5cae61..a35cf7b 100644
+--- a/gf2x.c
++++ b/gf2x.c
+@@ -79,7 +79,7 @@ static gf2x_mul_pool_t global_pool;
+
+ void gf2x_mul_pool_init(gf2x_mul_pool_t p)
+ {
+- memset(p, 0, sizeof(p));
++ memset(p, 0, sizeof(gf2x_mul_pool_t));
+ }
+
+ void gf2x_mul_pool_clear(gf2x_mul_pool_t p)
diff --git a/debian/patches/force-msse2-instead-of-believing-it-s-unnecessary-if.patch b/debian/patches/force-msse2-instead-of-believing-it-s-unnecessary-if.patch
new file mode 100644
index 0000000..e09014d
--- /dev/null
+++ b/debian/patches/force-msse2-instead-of-believing-it-s-unnecessary-if.patch
@@ -0,0 +1,74 @@
+From 4a27f83bd7c4ed11bea0e195c5dbc7903621d121 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emmanuel=20Thom=C3=A9?= <Emmanuel.Thome at inria.fr>
+Date: Tue, 18 Nov 2014 22:57:33 +0100
+Subject: [PATCH] Force -msse2 instead of believing it's unnecessary if gcc
+ seems to grok.
+
+Under some circumstances, it seems that on i386 we get:
+
+./gf2x/gf2x_mul3.h:69:19: warning: SSE vector return without SSE enabled
+changes the ABI [-Wpsabi]
+---
+ config/acinclude.m4 | 22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/config/acinclude.m4 b/config/acinclude.m4
+index eddd4cf..bee3706 100644
+--- a/config/acinclude.m4
++++ b/config/acinclude.m4
+@@ -105,12 +105,13 @@ AC_DEFUN([CHECK_SSE2_SUPPORT],[
+ if test "x${enable_sse2}" = xno ; then
+ echo $ECHO_N "explicitly disabled, "
+ else
++ CFLAGS="$ac_save_CFLAGS -msse2"
+ AC_RUN_IFELSE([SSE2_EXAMPLE()],[
+ gf2x_cv_cc_supports_sse2=yes
+ ],[
+- CFLAGS="$ac_save_CFLAGS -msse2"
++ CFLAGS="$ac_save_CFLAGS"
+ AC_RUN_IFELSE([SSE2_EXAMPLE()],[
+- gf2x_cv_cc_supports_sse2="requires -msse2"
++ gf2x_cv_cc_supports_sse2="yes, but without -msse2"
+ ],[
+ gf2x_cv_cc_supports_sse2=no
+ ])
+@@ -118,16 +119,17 @@ AC_DEFUN([CHECK_SSE2_SUPPORT],[
+ fi
+ ])
+ ac_save_CPPFLAGS=$CPPFLAGS
+- if test "$gf2x_cv_cc_supports_sse2" = "requires -msse2" ;then
++ if test "$gf2x_cv_cc_supports_sse2" = "yes" ;then
+ # Tweaking CFLAGS is often not enough.
+- AC_CACHE_CHECK([whether -msse2 is also needed by the preprocessor],
+- [gf2x_cv_cpp_requires_msse2_flag],[
++ AC_CACHE_CHECK([whether -msse2 is also understood by the preprocessor],
++ [gf2x_cv_cpp_understands_msse2_flag],[
++ CPPFLAGS="$ac_save_CPPFLAGS -msse2"
+ AC_PREPROC_IFELSE([SSE2_EXAMPLE()],[
+- gf2x_cv_cpp_requires_msse2_flag=no
++ gf2x_cv_cpp_understands_msse2_flag=yes
+ ],[
+- CPPFLAGS="$ac_save_CPPFLAGS -msse2"
++ CPPFLAGS="$ac_save_CPPFLAGS"
+ AC_PREPROC_IFELSE([SSE2_EXAMPLE()],[
+- gf2x_cv_cpp_requires_msse2_flag=yes
++ gf2x_cv_cpp_understands_msse2_flag=no
+ ],[
+ AC_MSG_ERROR([Sorry, the preprocessor can't parse sse-2!])
+ ])
+@@ -136,10 +138,10 @@ AC_DEFUN([CHECK_SSE2_SUPPORT],[
+ fi
+ CFLAGS=$ac_save_CFLAGS
+ CPPFLAGS=$ac_save_CPPFLAGS
+- if test "$gf2x_cv_cc_supports_sse2" = "requires -msse2" ;then
++ if test "$gf2x_cv_cc_supports_sse2" = "yes" ;then
+ CFLAGS="$CFLAGS -msse2"
+ fi
+- if test "$gf2x_cv_cpp_requires_msse2_flag" = "yes" ; then
++ if test "$gf2x_cv_cpp_understands_msse2_flag" = "yes" ; then
+ CPPFLAGS="$CPPFLAGS -msse2"
+ fi
+ if test "$gf2x_cv_cc_supports_sse2" != "no" ;then
+--
+2.1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 2d2d176..1ae8f96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+fix_memset.patch
+force-msse2-instead-of-believing-it-s-unnecessary-if.patch
test.diff
diff --git a/debian/rules b/debian/rules
index dd9063b..801dc94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,6 @@
#!/usr/bin/make -f
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-pclmul
+
%:
dh $@ --with autoreconf
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gf2x.git
More information about the debian-science-commits
mailing list