Skip to content

Commit

Permalink
Upgrade to patched gmp-6.2.1 (#56)
Browse files Browse the repository at this point in the history
* Test ivybridge failure

* patch gmp 6.2.1

* put longlong.h in the right dir

* runtimecpuid

* ARM64 to gmp-6.1.2 too

Co-authored-by: Gene Hoffman <[email protected]>
  • Loading branch information
wjblanke and hoffmang9 authored Jan 6, 2021
1 parent ae25614 commit 697e514
Show file tree
Hide file tree
Showing 4 changed files with 2,429 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ jobs:
&& yum -y install boost-devel lzip cmake3
&& rm -rf /usr/local/bin/cmake
&& ln -s /usr/bin/cmake3 /usr/local/bin/cmake
&& curl -L https://gmplib.org/download/gmp/gmp-6.1.2.tar.lz | lzip -dc | tar x
&& cd gmp-6.1.2 && ./configure --enable-fat --enable-cxx
&& make && make install && cd .. && rm -rf gmp-6.1.2
&& curl -L https://gmplib.org/download/gmp/gmp-6.2.1.tar.lz | lzip -dc | tar x
&& cd gmp-6.2.1 && ./configure --enable-fat --enable-cxx
&& make && make install && cd .. && rm -rf gmp-6.2.1
&& cmake --version
&& uname -a
CIBW_BEFORE_BUILD_LINUX: >
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Install cibuildwheel
run: |
python -m pip install --upgrade pip
pip install cibuildwheel==1.7.2
pip install cibuildwheel==1.7.3
- name: Lint source with flake8
run: |
Expand Down Expand Up @@ -77,9 +77,11 @@ jobs:
&& rm -f /usr/bin/cmake
&& yum -y install epel-release
&& yum -y install boost-devel lzip
&& curl -L https://gmplib.org/download/gmp/gmp-6.1.2.tar.lz | tar x --lzip
&& cd gmp-6.1.2 && ./configure --enable-fat --enable-cxx
&& make && make install && cd .. && rm -rf gmp-6.1.2
&& curl -L https://gmplib.org/download/gmp/gmp-6.2.1.tar.lz | tar x --lzip
&& cp src/lib/gmp-patch-6.2.1/longlong.h gmp-6.2.1/
&& cp src/lib/gmp-patch-6.2.1/compat.c gmp-6.2.1/
&& cd gmp-6.2.1 && ./configure --enable-fat --enable-cxx
&& make && make install && cd .. && rm -rf gmp-6.2.1
CIBW_BEFORE_BUILD_LINUX: >
python -m pip install --upgrade pip
CIBW_BEFORE_ALL_MACOS: >
Expand Down
65 changes: 65 additions & 0 deletions src/lib/gmp-patch-6.2.1/compat.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/* Old function entrypoints retained for binary compatibility.
Copyright 2000, 2001 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 either:
* the GNU Lesser General Public License as published by the Free
Software Foundation; either version 3 of the License, or (at your
option) any later version.
or
* the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any
later version.
or both in parallel, as here.
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 General Public License
for more details.
You should have received copies of the GNU General Public License and the
GNU Lesser General Public License along with the GNU MP Library. If not,
see https://www.gnu.org/licenses/. */

#include <stdio.h>
#include "gmp-impl.h"

/* RUNTIMECPUID */
int bCheckedBMI = 0;
int bBMI1 = 0;
int bBMI2 = 0;
int bCheckedLZCNT = 0;
int bLZCNT = 0;

/* mpn_divexact_by3 was a function in gmp 3.0.1, but as of gmp 3.1 it's a
macro calling mpn_divexact_by3c. */
mp_limb_t
__MPN (divexact_by3) (mp_ptr dst, mp_srcptr src, mp_size_t size)
{
return mpn_divexact_by3 (dst, src, size);
}


/* mpn_divmod_1 was a function in gmp 3.0.1 and earlier, but marked obsolete
in both gmp 2 and 3. As of gmp 3.1 it's a macro calling mpn_divrem_1. */
mp_limb_t
__MPN (divmod_1) (mp_ptr dst, mp_srcptr src, mp_size_t size, mp_limb_t divisor)
{
return mpn_divmod_1 (dst, src, size, divisor);
}


/* mpz_legendre was a separate function in gmp 3.1.1 and earlier, but as of
4.0 it's a #define alias for mpz_jacobi. */
int
__gmpz_legendre (mpz_srcptr a, mpz_srcptr b)
{
return mpz_jacobi (a, b);
}
Loading

0 comments on commit 697e514

Please sign in to comment.