- updated to 6.1.2

- updated cpu patch

diff --git a/gmp-cpu.patch b/gmp-cpu.patch
index 29f46fd2469fe73a67c795e654cf9f90512a3af8..7c88dce1482d168e154a0c699172ab42953c9615 100644 (file)
--- a/gmp-cpu.patch
+++ b/gmp-cpu.patch
@@ -1,5 +1,5 @@
---- gmp-6.1.1/configure.ac.orig        2016-06-18 22:00:00.000000000 +0200
-+++ gmp-6.1.1/configure.ac     2016-06-22 21:09:15.483910195 +0200
+--- gmp-6.1.2/configure.ac.orig        2016-12-16 16:45:27.000000000 +0100
++++ gmp-6.1.2/configure.ac     2016-12-26 20:45:03.083263267 +0100
 @@ -276,8 +276,12 @@
    AC_MSG_ERROR([--enable-fake-cpuid requires --enable-fat])
  fi
@@ -51,16 +51,16 @@
          alpha)       cc_cflags_cpu="-arch~ev4~-tune~ev4" ;;
          alphaev5)    cc_cflags_cpu="-arch~ev5~-tune~ev5" ;;
          alphaev56)   cc_cflags_cpu="-arch~ev56~-tune~ev56" ;;
-@@ -619,7 +623,7 @@
+@@ -616,7 +620,7 @@
      # FIXME: We make mandatory compiler options optional here.  We should
      # either enforce them, or organise to strip paths as the corresponding
      # options fail.
 -    case $host_cpu in
 +    case $gmp_cpu in
-       armsa1 | arm7t* | arm9t* | armv4t*)
-       path="arm"
-       gcc_cflags_arch="-march=armv4"
-@@ -722,7 +726,7 @@
+       armxscale | arm7ej | arm9te | arm9e* | arm10* | armv5*)
+       path="arm/v5 arm"
+       gcc_cflags_arch="-march=armv5"
+@@ -782,7 +786,7 @@
      # (Can't remember why this isn't done already, have to check what .asm
      # files are available in each and how they run on a typical 2.0 cpu.)
      #
@@ -69,7 +69,7 @@
        hppa1.0*)    path="pa32" ;;
        hppa7000*)   path="pa32/hppa1_1 pa32" ;;
        hppa2.0* | hppa64)
-@@ -740,13 +744,13 @@
+@@ -800,13 +804,13 @@
      # probably be safe, but let's not take the chance.  In any case, a
      # configuration like --host=hppa2.0 ABI=1.0 is far from optimal.
      #
@@ -85,7 +85,7 @@
        hppa1.0*)    cc_cflags="+O2" ;;
        *)           # default to 7100
                     cc_cflags="+DA1.1 +O2" ;;
-@@ -808,7 +812,7 @@
+@@ -868,7 +872,7 @@
      SPEED_CYCLECOUNTER_OBJ=ia64.lo
      any_32_testlist="sizeof-long-4"
  
@@ -94,7 +94,7 @@
        itanium)   path="ia64/itanium  ia64" ;;
        itanium2)  path="ia64/itanium2 ia64" ;;
        *)         path="ia64" ;;
-@@ -818,7 +822,7 @@
+@@ -878,7 +882,7 @@
      gcc_32_cflags_optlist=$gcc_64_cflags_optlist
  
      # gcc pre-release 3.4 adds -mtune itanium and itanium2
@@ -103,7 +103,7 @@
        itanium)   gcc_cflags_tune="-mtune=itanium" ;;
        itanium2)  gcc_cflags_tune="-mtune=itanium2" ;;
      esac
-@@ -881,7 +885,7 @@
+@@ -941,7 +945,7 @@
      # gcc 2.95 adds -mcpu32, -m68060.
      # FIXME: Maybe "-m68020 -mnobitfield" would suit cpu32 on 2.7.2.
      #
@@ -112,7 +112,7 @@
      m68020)  gcc_cflags_arch="-m68020" ;;
      m68030)  gcc_cflags_arch="-m68030" ;;
      m68040)  gcc_cflags_arch="-m68040" ;;
-@@ -893,7 +897,7 @@
+@@ -953,7 +957,7 @@
      # FIXME: m68k/mc68020 looks like it's ok for cpu32, but this wants to be
      # tested.  Will need to introduce an m68k/cpu32 if m68k/mc68020 ever uses
      # the bitfield instructions.
@@ -121,7 +121,7 @@
      [m680[234]0 | m68360])  path="m68k/mc68020 m68k" ;;
      *)                      path="m68k" ;;
      esac
-@@ -998,7 +1002,7 @@
+@@ -1058,7 +1062,7 @@
      SPEED_CYCLECOUNTER_OBJ=powerpc.lo
      cyclecounter_size=0
  
@@ -130,7 +130,7 @@
        powerpc740 | powerpc750)
          path="powerpc32/750 powerpc32" ;;
        powerpc7400 | powerpc7410)
-@@ -1009,7 +1013,7 @@
+@@ -1069,7 +1073,7 @@
          path="powerpc32" ;;
      esac
  
@@ -139,8 +139,8 @@
        powerpc401)   gcc_cflags_cpu="-mcpu=401" ;;
        powerpc403)   gcc_cflags_cpu="-mcpu=403"
                    xlc_cflags_arch="-qarch=403 -qarch=ppc" ;;
-@@ -1242,7 +1246,7 @@
-     extra_functions="udiv_w_sdiv"
+@@ -1306,7 +1310,7 @@
+     fi
      gcc_32_cflags_maybe="-m31"
  
 -    case $host_cpu in
@@ -148,7 +148,7 @@
        s390)
        ;;
        z900 | z900esa)
-@@ -1298,7 +1302,7 @@
+@@ -1362,7 +1366,7 @@
        cclist_64="gcc"
        gcc_64_cflags_optlist="arch"
        gcc_64_cflags="$gcc_cflags -m64"
@@ -157,7 +157,7 @@
        extra_functions=""
        ;;
        esac
-@@ -1323,7 +1327,7 @@
+@@ -1387,7 +1391,7 @@
      any_testlist="sizeof-long-4"
      GMP_INCLUDE_MPN(sparc32/sparc-defs.m4)
  
@@ -166,7 +166,7 @@
        sparcv8 | microsparc | turbosparc)
          path="sparc32/v8 sparc32" ;;
        supersparc)
-@@ -1359,7 +1363,7 @@
+@@ -1423,7 +1427,7 @@
      #   plain -m forms will disappear.
      # gcc 3.3 adds ultrasparc3.
      #
@@ -175,7 +175,7 @@
        supersparc*)
                        gcc_cflags_cpu="-mcpu=supersparc -msupersparc"
                        gcc_cflags_asm="-Wa,-Av8 -Wa,-xarch=v8";;
-@@ -1407,7 +1411,7 @@
+@@ -1471,7 +1475,7 @@
  
          # SunOS cc doesn't know -xarch, apparently always generating v7
          # code, so make this optional
@@ -184,7 +184,7 @@
          sparcv8 | microsparc* | supersparc* | turbosparc | hypersparc*)
                        cc_cflags_arch="-xarch=v8";;
            [ultrasparct[345]])
-@@ -1423,7 +1427,7 @@
+@@ -1487,7 +1491,7 @@
        #   micro2, hyper, hyper2, powerup, ultra, ultra2, ultra2i.
        # SunPRO cc 6 adds -xchip=ultra2e, ultra3cu.
          #
@@ -193,7 +193,7 @@
          supersparc*)  cc_cflags_cpu="-xchip=super" ;;
          microsparc*)  cc_cflags_cpu="-xchip=micro" ;;
          turbosparc)   cc_cflags_cpu="-xchip=micro2" ;;
-@@ -1442,7 +1446,7 @@
+@@ -1506,7 +1510,7 @@
        esac
      esac
  
@@ -202,7 +202,7 @@
        sparc64 | sparcv9* | ultrasparc*)
          case $host in
            # Solaris 6 and earlier cannot run ABI=64 since it doesn't save
-@@ -1469,7 +1473,7 @@
+@@ -1533,7 +1537,7 @@
            *) abilist="64 32" ;;
          esac
  
@@ -211,7 +211,7 @@
          ultrasparc | ultrasparc2 | ultrasparc2i)
            path_64="sparc64/ultrasparc1234 sparc64" ;;
          [ultrasparc[34]])
-@@ -1510,7 +1514,7 @@
+@@ -1574,7 +1578,7 @@
              #
              cclist_64="$cclist_64 cc"
              cc_64_cflags_optlist="cpu"
@@ -220,7 +220,7 @@
                [ultrasparct[345]])
                  cc_64_cflags="$cc_64_cflags -xO3 -xarch=v9d" ;;
                *)
-@@ -1554,7 +1558,7 @@
+@@ -1622,7 +1626,7 @@
    #
    # -m32 forces 32-bit mode on a bi-arch 32/64 amd64 build of gcc.  -m64 is
    # the default in such a build (we think), so -m32 is essential for ABI=32.
@@ -229,7 +229,7 @@
    # get such a gcc into the right mode to cross-compile to say i486-*-*.
    #
    # -m32 is not available in gcc 2.95 and earlier, hence cflags_maybe to use
-@@ -1612,7 +1616,7 @@
+@@ -1680,7 +1684,7 @@
      # like k8 for x86_64, then it can be the -mtune at the start, no need to
      # duplicate anything.
      #

diff --git a/gmp.spec b/gmp.spec
index 89c0bb0ecea71142ceabed3877be4b9db0b51c72..ff7bef1d608f828dae60425534158105d03b27e7 100644 (file)
--- a/gmp.spec
+++ b/gmp.spec
@@ -12,12 +12,12 @@ Summary(pt_BR.UTF-8):       Biblioteca de precisão arbitrária da GNU
 Summary(uk.UTF-8):     Бібліотека GNU довільної точності
 Summary(ru.UTF-8):     Библиотека GNU произвольной точности
 Name:          gmp
-Version:       6.1.1
+Version:       6.1.2
 Release:       1
 License:       LGPL v3+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/gmp/%{name}-%{version}.tar.lz
-# Source0-md5: 31cea5e383ebd3b520a9eaeb6638a530
+# Source0-md5: 205e230117debf3754944509350627a1
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-multilib.patch
 Patch2:                %{name}-cpu.patch