From 31231effb488243954814b2e34c2b7c846fb3cac Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Fri, 9 Dec 2011 23:15:44 -0800
Subject: Build and pass test suite on Cygwin.

* configure (longlong, ulonglong, superlong, usuperlong): Initialize
these variables so that if the detection tests fail, the script
does not access unbound variables.
Avoid adding junk like .bss.* into config.h.

* mpi-patches/config-types: Fixed wrong use of nonexistent
SIZEOF_LONG_T.
---
 ChangeLog                | 12 ++++++++++++
 configure                | 11 +++++++++--
 mpi-patches/config-types | 22 +++++++++++-----------
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d17c7887..6c20cb69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-12-09  Kaz Kylheku  <kaz@kylheku.com>
+
+	Build and pass test suite on Cygwin.
+
+	* configure (longlong, ulonglong, superlong, usuperlong): Initialize
+	these variables so that if the detection tests fail, the script
+	does not access unbound variables.
+	Avoid adding junk like .bss.* into config.h.
+
+	* mpi-patches/config-types: Fixed wrong use of nonexistent
+	SIZEOF_LONG_T.
+
 2011-12-09  Kaz Kylheku  <kaz@kylheku.com>
 
 	(Applies to previous commit.)
diff --git a/configure b/configure
index d961b59f..b6c91967 100755
--- a/configure
+++ b/configure
@@ -603,6 +603,8 @@ printf "okay\n"
 #
 printf "Checking what C type we have for integers wider than \"long\" ... "
 
+longlong=
+
 for try_type in int64 __int64 "long long" ; do
   cat > conftest.c <<!
 $try_type value;
@@ -624,6 +626,8 @@ fi
 
 printf "Checking what C type we have for unsigned integers wider than \"long\" ... "
 
+ulonglong=
+
 for try_type in uint64 __uint64 "unsigned long long" ; do
   cat > conftest.c <<!
 $try_type value;
@@ -645,6 +649,8 @@ fi
 
 printf "Checking what C type we have for integers wider than \"long long\" ... "
 
+superlong=
+
 for try_type in int128 int128_t __int128 __int128_t ; do
   cat > conftest.c <<!
 $try_type value;
@@ -666,6 +672,8 @@ fi
 
 printf "Checking what C type we have for u. integers wider than \"long long\" ... "
 
+usuperlong=
+
 for try_type in uint128 uint128_t __uint128 __uint128_t ; do
   cat > conftest.c <<!
 $try_type value;
@@ -727,10 +735,9 @@ char SIZEOF_SUPERLONG_T[sizeof (superlong_t)];
     case "$symbol" in
     SIZEOF* )
       eval $(printf "%s=%d\n" "$symbol" "$size")
+      printf "#define %s %s\n" "$symbol" "$size" >> config.h
       ;;
     esac
-    # retain all useful information!
-    printf "#define %s %s\n" "$symbol" "$size" >> config.h
   done < conftest.syms
 
   rm -f conftest.syms conftest.o
diff --git a/mpi-patches/config-types b/mpi-patches/config-types
index 2c8e4a6d..a99e94c4 100644
--- a/mpi-patches/config-types
+++ b/mpi-patches/config-types
@@ -1,7 +1,7 @@
 Index: mpi-1.8.6/mpi-types.h
 ===================================================================
---- mpi-1.8.6.orig/mpi-types.h	2011-12-09 14:10:39.000000000 -0800
-+++ mpi-1.8.6/mpi-types.h	2011-12-09 22:38:15.000000000 -0800
+--- mpi-1.8.6.orig/mpi-types.h
++++ mpi-1.8.6/mpi-types.h
 @@ -1,17 +1,56 @@
 -/* Type definitions generated by 'types.pl' */
 +/*
@@ -36,7 +36,7 @@ Index: mpi-1.8.6/mpi-types.h
 +      SIZEOF_PTR >= SIZEOF_LONG
 +  typedef unsigned long mp_digit;
 +  typedef ulonglong_t mp_word;
-+  #define MP_DIGIT_SIZE SIZEOF_LONG_T
++  #define MP_DIGIT_SIZE SIZEOF_LONG
 +  #define DIGIT_FMT "%" #SIZEOF_LONGLONG_T "lx"
 +#elif HAVE_ULONGLONG_T && SIZEOF_LONGLONG_T / 2 == SIZEOF_INT && \
 +      SIZEOF_PTR >= SIZEOF_INT
@@ -74,8 +74,8 @@ Index: mpi-1.8.6/mpi-types.h
 +#define RADIX              (((mp_word) MP_DIGIT_MAX) + 1)
 Index: mpi-1.8.6/mpi.c
 ===================================================================
---- mpi-1.8.6.orig/mpi.c	2011-12-09 14:10:39.000000000 -0800
-+++ mpi-1.8.6/mpi.c	2011-12-09 22:37:31.000000000 -0800
+--- mpi-1.8.6.orig/mpi.c
++++ mpi-1.8.6/mpi.c
 @@ -9,6 +9,7 @@
      $Id: mpi.c,v 1.1 2004/02/08 04:29:29 sting Exp $
   */
@@ -86,8 +86,8 @@ Index: mpi-1.8.6/mpi.c
  #include <string.h>
 Index: mpi-1.8.6/mplogic.c
 ===================================================================
---- mpi-1.8.6.orig/mplogic.c	2011-12-09 14:10:39.000000000 -0800
-+++ mpi-1.8.6/mplogic.c	2011-12-09 22:37:31.000000000 -0800
+--- mpi-1.8.6.orig/mplogic.c
++++ mpi-1.8.6/mplogic.c
 @@ -9,6 +9,7 @@
      $Id: mplogic.c,v 1.1 2004/02/08 04:29:29 sting Exp $
   */
@@ -98,8 +98,8 @@ Index: mpi-1.8.6/mplogic.c
  
 Index: mpi-1.8.6/mpprime.c
 ===================================================================
---- mpi-1.8.6.orig/mpprime.c	2011-12-09 14:10:39.000000000 -0800
-+++ mpi-1.8.6/mpprime.c	2011-12-09 14:10:41.000000000 -0800
+--- mpi-1.8.6.orig/mpprime.c
++++ mpi-1.8.6/mpprime.c
 @@ -10,6 +10,7 @@
      $Id: mpprime.c,v 1.1 2004/02/08 04:29:29 sting Exp $
   */
@@ -110,8 +110,8 @@ Index: mpi-1.8.6/mpprime.c
  
 Index: mpi-1.8.6/mprsa.c
 ===================================================================
---- mpi-1.8.6.orig/mprsa.c	2011-12-09 14:10:39.000000000 -0800
-+++ mpi-1.8.6/mprsa.c	2011-12-09 14:10:41.000000000 -0800
+--- mpi-1.8.6.orig/mprsa.c
++++ mpi-1.8.6/mprsa.c
 @@ -11,6 +11,7 @@
    $Id: mprsa.c,v 1.1 2004/02/08 04:29:29 sting Exp $
   */
-- 
cgit v1.2.3