[mpir] add s390x support from GMP

[Dan Horák]

commit 4f4364a8c0b5665f74eada7f62401863b1475582
Author: Dan Horák <dan at danny.cz>
Date:   Thu Jun 16 10:50:06 2011 +0200

    add s390x support from GMP

 mpir-1.3.1-s390x.patch |   74 ++++++++++++++++++++++++++++++++++++++++++++++++
 mpir.spec              |    8 ++++-
 2 files changed, 81 insertions(+), 1 deletions(-)
---
diff --git a/mpir-1.3.1-s390x.patch b/mpir-1.3.1-s390x.patch
new file mode 100644
index 0000000..1271e89
--- /dev/null
+++ b/mpir-1.3.1-s390x.patch
@@ -0,0 +1,74 @@
+diff -up mpir-1.3.1/configure.in.s390x mpir-1.3.1/configure.in
+--- mpir-1.3.1/configure.in.s390x	2010-01-30 23:13:19.000000000 +0100
++++ mpir-1.3.1/configure.in	2011-06-16 10:24:58.000000000 +0200
+@@ -1059,6 +1059,11 @@ case $host in
+     ;;
+ 
+ 
++  s390x-*-*)
++    gcc_cflags="-O2 $fomit_frame_pointer"
++    path="s390x"
++    #extra_functions="udiv_w_sdiv"
++    ;;
+   # IBM s/370 and similar
+   [s3[6-9]0*-*-*])
+     gcc_cflags="-O2 $fomit_frame_pointer"
+diff -up mpir-1.3.1/configure.s390x mpir-1.3.1/configure
+--- mpir-1.3.1/configure.s390x	2011-06-16 10:22:58.000000000 +0200
++++ mpir-1.3.1/configure	2011-06-16 10:24:38.000000000 +0200
+@@ -3749,6 +3749,11 @@ _ACEOF
+     ;;
+ 
+ 
++  s390x-*-*)
++    gcc_cflags="-O2 $fomit_frame_pointer"
++    path="s390x"
++    #extra_functions="udiv_w_sdiv"
++    ;;
+   # IBM s/370 and similar
+   s3[6-9]0*-*-*)
+     gcc_cflags="-O2 $fomit_frame_pointer"
+diff -up mpir-1.3.1/mpn/s390/gmp-mparam.h.s390x mpir-1.3.1/mpn/s390/gmp-mparam.h
+--- mpir-1.3.1/mpn/s390/gmp-mparam.h.s390x	2010-01-30 23:12:42.000000000 +0100
++++ mpir-1.3.1/mpn/s390/gmp-mparam.h	2011-06-16 10:22:21.000000000 +0200
+@@ -20,7 +20,8 @@ the Free Software Foundation, Inc., 51 F
+ MA 02110-1301, USA. */
+ 
+ 
+-/* BITS_PER_MP_LIMB etc generated by configure */
++#define BITS_PER_MP_LIMB 32
++#define BYTES_PER_MP_LIMB 4
+ 
+ 
+ /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */
+diff -up mpir-1.3.1/mpn/s390x/gmp-mparam.h.s390x mpir-1.3.1/mpn/s390x/gmp-mparam.h
+--- mpir-1.3.1/mpn/s390x/gmp-mparam.h.s390x	2011-06-16 10:22:21.000000000 +0200
++++ mpir-1.3.1/mpn/s390x/gmp-mparam.h	2011-06-16 10:22:21.000000000 +0200
+@@ -0,0 +1,27 @@
++/* gmp-mparam.h -- Compiler/machine parameter header file.
++
++Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc.
++
++This file is part of the GNU MP Library.
++
++The GNU MP Library is free software; you can redistribute it and/or modify
++it under the terms of the GNU Library General Public License as published by
++the Free Software Foundation; either version 2 of the License, or (at your
++option) any later version.
++
++The GNU MP Library is distributed in the hope that it will be useful, but
++WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
++License for more details.
++
++You should have received a copy of the GNU Library General Public License
++along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
++the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
++MA 02111-1307, USA. */
++
++#define BITS_PER_MP_LIMB 64
++#define BYTES_PER_MP_LIMB 8
++#define BITS_PER_LONGINT 64
++#define BITS_PER_INT 32
++#define BITS_PER_SHORTINT 16
++#define BITS_PER_CHAR 8
diff --git a/mpir.spec b/mpir.spec
index d97d1ae..c3adaa2 100644
--- a/mpir.spec
+++ b/mpir.spec
@@ -1,12 +1,14 @@
 Name:			mpir
 Version:		1.3.1
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		A library for arbitrary precision arithmetic
 
 Group:			System Environment/Libraries
 License:		LGPLv2+
 URL:			http://www.mpir.org/
 Source0:		http://www.mpir.org/%{name}-%{version}.tar.gz
+# add s390x support from GMP
+Patch0:			%{name}-1.3.1-s390x.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	autoconf automake libtool
@@ -27,6 +29,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .s390x
 
 %build
 
@@ -122,6 +125,9 @@ fi
 %{_infodir}/mpir.info*
 
 %changelog
+* Thu Jun 16 2011 Dan Horák <dan[at]danny.cz> - 1.3.1-6
+- add s390x support from GMP
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild