[fftw] 10/16: Imported Debian patch 2.1.3-19

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository fftw.

commit 656ba181ff95be4143d9998d4fce37e8d85eae56
Author: Paul Brossier <piem at debian.org>
Date:   Sat Jul 1 11:53:33 2006 +0200

    Imported Debian patch 2.1.3-19
---
 debian/changelog  | 7 +++++++
 tests/test_main.c | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a87abcd..1b6a58f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fftw (2.1.3-19) unstable; urgency=low
+
+  * Patch tests/test_main.c to workaround buggy counter when using gcc 4.1 on
+    64 bit machines (many thanks to Vincent Fourmond, closes: #373647)
+
+ -- Paul Brossier <piem at debian.org>  Sat,  1 Jul 2006 11:53:33 +0200
+
 fftw (2.1.3-18) unstable; urgency=low
 
   * Fix inclusions in generated headers (closes: #372518)
diff --git a/tests/test_main.c b/tests/test_main.c
index 5fe4f1e..c737276 100644
--- a/tests/test_main.c
+++ b/tests/test_main.c
@@ -548,7 +548,7 @@ static int hack_fib;
 void test_timer(void)
 {
      double times[32], acc, min_time = 10000.00;
-     unsigned long iters, iter;
+     unsigned long iters = 0, iter;
      fftw_time begin, end, start;
      double t, tmax, tmin;
      int last = 0, i, repeat;
@@ -559,7 +559,8 @@ void test_timer(void)
      start = fftw_get_time();
 
      for (i = 0; i < 32; i++) {
-	  iters = 1 << i;
+	  //iters = 1 << i; /* workaround gcc-4.1 bug */
+	  if (i) iters <<= 1; else iters = 1;
 	  tmin = 1.0E10;
 	  tmax = -1.0E10;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fftw.git