cheng/mpir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add a missing export declaration

Browse Source 
correct a function definition
correct bug in msbuild.bat
This commit is contained in:
Brian Gladman 2020-03-15 16:51:04 +00:00
parent 10a09871f6
commit 11bac5f240
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gmp-impl.h
View File

@ -3840,7 +3840,7 @@ struct gcdext_ctx
}; };
#define mpn_gcdext_hook __MPN (gcdext_hook) #define mpn_gcdext_hook __MPN (gcdext_hook)
gcd_subdiv_step_hook mpn_gcdext_hook; __GMP_DECLSPEC gcd_subdiv_step_hook mpn_gcdext_hook;
#define MPN_GCDEXT_LEHMER_N_ITCH(n) (4*(n) + 3) #define MPN_GCDEXT_LEHMER_N_ITCH(n) (4*(n) + 3)

43
msvc/vs19/msbuild.bat
View File

@ -7,25 +7,28 @@ rem %5 = Windows SDK Version
rem %6 = build tests (|+tests) rem %6 = build tests (|+tests)
rem Visual Studio version (2013, 2015, 2017 or 2019) rem Visual Studio version (2013, 2015, 2017 or 2019)
@echo off
setlocal enabledelayedexpansion
set vs_version=2019 set vs_version=2019
rem find the MSBUILD installation directory set vsw_exe="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
if "%vs_version%" EQU "2013" (
set msbdir="C:\Program Files (x86)\MSBuild\12.0\Bin" for /f "usebackq tokens=*" %%i in (`%vsw_exe% -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
) else if "%vs_version%" EQU "2015" ( set InstallDir="%%i"
set msbdir="C:\Program Files (x86)\MSBuild\14.0\Bin" )
) else if "%vs_version%" GEQ "2017" (
set vsw_exe="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" if %vs_version% EQU "2017" (
for /f "usebackq tokens=*" %%i in (`%vsw_exe% -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do ( set msbdir=%InstallDir%\MSBuild\15.0\Bin
set InstallDir=%%i ) else (
) set msbdir=%InstallDir%\MSBuild\Current\Bin
if "%vs_version%" EQU "2017" (set msbuild_subdir=15.0) else (set msbuild_subdir=Current) )
if exist "%InstallDir%\MSBuild\%msbuild_subdir%\Bin\MSBuild.exe" ( set msbdir=%msbdir:"=%
set msbdir="%InstallDir%\MSBuild\%msbuild_subdir%\Bin" set msb_exe="%msbdir%\MSBuild.exe"
)
) else ( if not exist %msb_exe% (
echo "Visual Studio %vs_version% is not supported" & exit /b %errorlevel% echo "Visual Studio %vs_version% is not supported" & exit /b %errorlevel%
) )
if "%4" NEQ "" if "%3" NEQ "" if "%2" NEQ "" if "%1" NEQ "" goto cont if "%4" NEQ "" if "%3" NEQ "" if "%2" NEQ "" if "%1" NEQ "" goto cont
call :get_architectures - call :get_architectures -
@ -46,17 +49,17 @@ set src=%libp%_mpir_%1
rem This is the Visual Studio build directory (within the MPIR directory) rem This is the Visual Studio build directory (within the MPIR directory)
set srcdir=. set srcdir=.
echo %msbdir%\msbuild.exe /p:Platform=%plat% /p:Configuration=%conf% /p:"Windows%20SDK%20Version=%win_sdk%" %srcdir%\%src%\%src%.vcxproj echo %msb_exe% /p:Platform=%plat% /p:Configuration=%conf% /p:"Windows%20SDK%20Version=%win_sdk%" %srcdir%\%src%\%src%.vcxproj
%msbdir%\msbuild.exe /p:Platform=%plat% /p:Configuration=%conf% /p:"Windows%20SDK%20Version=%win_sdk%" %srcdir%\%src%\%src%.vcxproj %msb_exe% /p:Platform=%plat% /p:Configuration=%conf% /p:"Windows%20SDK%20Version=%win_sdk%" %srcdir%\%src%\%src%.vcxproj
if /i "%libp%" == "LIB" ( if /i "%libp%" == "LIB" (
%msbdir%\msbuild.exe /p:Platform=%plat% /p:Configuration=%conf% /p:"Windows%20SDK%20Version=%win_sdk%" %srcdir%\lib_mpir_cxx\lib_mpir_cxx.vcxproj %msb_exe% /p:Platform=%plat% /p:Configuration=%conf% /p:"Windows%20SDK%20Version=%win_sdk%" %srcdir%\lib_mpir_cxx\lib_mpir_cxx.vcxproj
) )
if /i "%run_tests%" NEQ "" ( if /i "%run_tests%" NEQ "" (
for /d %%d in (.\mpir-tests\*) do ( for /d %%d in (.\mpir-tests\*) do (
for %%f in (%%d\*.vcxproj) do ( for %%f in (%%d\*.vcxproj) do (
%msbdir%\msbuild.exe /property:SolutionDir=..\..\ /property:OutDir=..\..\%plat%\%conf%\ /p:Platform=%plat% /p:Configuration=%conf% /p:"Windows%20SDK%20Version=%win_sdk%" %%f %msb_exe% /property:SolutionDir=..\..\ /property:OutDir=..\..\%plat%\%conf%\ /p:Platform=%plat% /p:Configuration=%conf% /p:"Windows%20SDK%20Version=%win_sdk%" %%f
) )
) )
) )

2
tune/speed.h
View File

@ -402,7 +402,7 @@ void mftb_function(unsigned p[2]);
#elif defined( _MSC_VER ) #elif defined( _MSC_VER )
#include <intrin.h> #include <intrin.h>
#pragma intrinsic(__rdtsc) #pragma intrinsic(__rdtsc)
__inline void speed_cyclecounter(unsigned long p[2]) { *(unsigned long long*)p = __rdtsc(); } __inline void speed_cyclecounter(unsigned p[2]) { *(unsigned long long*)p = __rdtsc(); }
#endif #endif
double speed_cyclecounter_diff(const unsigned end[2], const unsigned start[2]); double speed_cyclecounter_diff(const unsigned end[2], const unsigned start[2]);