Better interoperability between MSVC and mingw-w64, 2

Author: nijtmans

generate_def.sh

@@ -0,0 +1,9 @@
+echo "; libtommath" >tommath.def
+echo ";" >>tommath.def
+echo "; Use this command to produce a 32-bit .lib file, for use in any MSVC version" >>tommath.def
+echo ";   lib -machine:X86 -name:libtommath.dll -def:tommath.def -out:tommath.lib" >>tommath.def
+echo "; Use this command to produce a 64-bit .lib file, for use in any MSVC version" >>tommath.def
+echo ";   lib -machine:X64 -name:libtommath.dll -def:tommath.def -out:tommath.lib" >>tommath.def
+echo ";" >>tommath.def
+echo "EXPORTS" >>tommath.def
+git ls-files|grep bn_mp_|grep \\.c|grep -v 'mp_toom'|grep -v 'mp_kara'|grep -v '_fast'|grep -v '_slow'|grep -v '_smap'|sed -e 's/bn_mp_rand/bn_mp_rand\nbn_mp_rand_digit/'|sort|sed -e 's/bn_/    /g'|sed -e 's/\.c//g'>>tommath.def

makefile.mingw

@@ -21,7 +21,7 @@ LDFLAGS   =
 
 #Compilation flags
 LTM_CFLAGS  = -I. $(CFLAGS)
-LTM_LDFLAGS = $(LDFLAGS)
+LTM_LDFLAGS = $(LDFLAGS) -static-libgcc
 
 #Libraries to be created
 LIBMAIN_S =libtommath.a

tommath.def

@@ -0,0 +1,133 @@
+; libtommath
+;
+; Use this command to produce a 32-bit .lib file, for use in any MSVC version
+;   lib -machine:X86 -name:libtommath.dll -def:tommath.def -out:tommath.lib
+; Use this command to produce a 64-bit .lib file, for use in any MSVC version
+;   lib -machine:X64 -name:libtommath.dll -def:tommath.def -out:tommath.lib
+;
+EXPORTS
+    mp_2expt
+    mp_abs
+    mp_add
+    mp_add_d
+    mp_addmod
+    mp_and
+    mp_balance_mul
+    mp_clamp
+    mp_clear
+    mp_clear_multi
+    mp_cmp
+    mp_cmp_d
+    mp_cmp_mag
+    mp_cnt_lsb
+    mp_complement
+    mp_copy
+    mp_count_bits
+    mp_decr
+    mp_div
+    mp_div_2
+    mp_div_2d
+    mp_div_3
+    mp_div_d
+    mp_dr_is_modulus
+    mp_dr_reduce
+    mp_dr_setup
+    mp_error_to_string
+    mp_exch
+    mp_export
+    mp_expt_d
+    mp_expt_d_ex
+    mp_exptmod
+    mp_exteuclid
+    mp_fread
+    mp_fwrite
+    mp_gcd
+    mp_get_bit
+    mp_get_double
+    mp_get_int
+    mp_get_long
+    mp_get_long_long
+    mp_grow
+    mp_ilogb
+    mp_import
+    mp_incr
+    mp_init
+    mp_init_copy
+    mp_init_multi
+    mp_init_set
+    mp_init_set_int
+    mp_init_size
+    mp_invmod
+    mp_is_square
+    mp_iseven
+    mp_isodd
+    mp_jacobi
+    mp_kronecker
+    mp_lcm
+    mp_lshd
+    mp_mod
+    mp_mod_2d
+    mp_mod_d
+    mp_montgomery_calc_normalization
+    mp_montgomery_reduce
+    mp_montgomery_setup
+    mp_mul
+    mp_mul_2
+    mp_mul_2d
+    mp_mul_d
+    mp_mulmod
+    mp_n_root
+    mp_n_root_ex
+    mp_neg
+    mp_or
+    mp_prime_fermat
+    mp_prime_frobenius_underwood
+    mp_prime_is_divisible
+    mp_prime_is_prime
+    mp_prime_miller_rabin
+    mp_prime_next_prime
+    mp_prime_rabin_miller_trials
+    mp_prime_random_ex
+    mp_prime_strong_lucas_selfridge
+    mp_radix_size
+    mp_rand
+    mp_rand_digit
+    mp_read_radix
+    mp_read_signed_bin
+    mp_read_unsigned_bin
+    mp_reduce
+    mp_reduce_2k
+    mp_reduce_2k_l
+    mp_reduce_2k_setup
+    mp_reduce_2k_setup_l
+    mp_reduce_is_2k
+    mp_reduce_is_2k_l
+    mp_reduce_setup
+    mp_rshd
+    mp_set
+    mp_set_double
+    mp_set_int
+    mp_set_long
+    mp_set_long_long
+    mp_shrink
+    mp_signed_bin_size
+    mp_sqr
+    mp_sqrmod
+    mp_sqrt
+    mp_sqrtmod_prime
+    mp_sub
+    mp_sub_d
+    mp_submod
+    mp_tc_and
+    mp_tc_div_2d
+    mp_tc_or
+    mp_tc_xor
+    mp_to_signed_bin
+    mp_to_signed_bin_n
+    mp_to_unsigned_bin
+    mp_to_unsigned_bin_n
+    mp_toradix
+    mp_toradix_n
+    mp_unsigned_bin_size
+    mp_xor
+    mp_zero

tommath.h

@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 /* MS Visual C++ doesn't have a 128bit type for words, so fall back to 32bit MPI's (where words are 64bit) */
-#if defined(_MSC_VER) || defined(__LLP64__) || defined(__e2k__) || defined(__LCC__)
+#if (defined(_MSC_VER) || defined(__LLP64__) || defined(__e2k__) || defined(__LCC__)) && !defined(MP_64BIT)
 #   define MP_32BIT
 #endif
 
@@ -30,7 +30,7 @@ extern "C" {
     defined(__sparcv9) || defined(__sparc_v9__) || defined(__sparc64__) || \
     defined(__ia64) || defined(__ia64__) || defined(__itanium__) || defined(_M_IA64) || \
     defined(__LP64__) || defined(_LP64) || defined(__64BIT__)
-#   if !(defined(MP_32BIT) || defined(MP_16BIT) || defined(MP_8BIT))
+#   if !(defined(MP_64BIT) || defined(MP_32BIT) || defined(MP_16BIT) || defined(MP_8BIT))
 #      if defined(__GNUC__)
 /* we support 128bit integers only via: __attribute__((mode(TI))) */
 #         define MP_64BIT
@@ -66,7 +66,9 @@ typedef uint32_t             mp_word;
 #elif defined(MP_64BIT)
 /* for GCC only on supported platforms */
 typedef uint64_t mp_digit;
+#if defined(__GNUC__)
 typedef unsigned long        mp_word __attribute__((mode(TI)));
+#endif
 #   define DIGIT_BIT 60
 #else
 /* this is the default case, 28-bit digits */