From c7ddc07009343ae6d84a4941eefcd52aca9e014f Mon Sep 17 00:00:00 2001 From: "Ben.Lippmeier@anu.edu.au" <unknown> Date: Tue, 24 Nov 2009 03:12:54 +0000 Subject: [PATCH] Undo previous patch, caused linker problems on x86_64/linux rolling back: Sat Nov 21 16:43:13 EST 2009 Ben.Lippmeier@anu.edu.au * Windows DLLs: Tag imported gmp symbols with the package they're from. M ./cbits/gmp-wrappers.cmm -20 +20 --- cbits/gmp-wrappers.cmm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/cbits/gmp-wrappers.cmm b/cbits/gmp-wrappers.cmm index e5d24ad..40a3c6b 100644 --- a/cbits/gmp-wrappers.cmm +++ b/cbits/gmp-wrappers.cmm @@ -28,26 +28,26 @@ #include "Cmm.h" #include "GmpDerivedConstants.h" -import "integer-gmp" __gmpz_init; -import "integer-gmp" __gmpz_add; -import "integer-gmp" __gmpz_sub; -import "integer-gmp" __gmpz_mul; -import "integer-gmp" __gmpz_mul_2exp; -import "integer-gmp" __gmpz_fdiv_q_2exp; -import "integer-gmp" __gmpz_gcd; -import "integer-gmp" __gmpn_gcd_1; -import "integer-gmp" __gmpn_cmp; -import "integer-gmp" __gmpz_tdiv_q; -import "integer-gmp" __gmpz_tdiv_r; -import "integer-gmp" __gmpz_tdiv_qr; -import "integer-gmp" __gmpz_fdiv_qr; -import "integer-gmp" __gmpz_divexact; -import "integer-gmp" __gmpz_and; -import "integer-gmp" __gmpz_xor; -import "integer-gmp" __gmpz_ior; -import "integer-gmp" __gmpz_com; - -import "integer-gmp" integer_cbits_decodeDouble; +#ifdef __PIC__ +#ifndef mingw32_HOST_OS +import __gmpz_init; +import __gmpz_add; +import __gmpz_sub; +import __gmpz_mul; +import __gmpz_gcd; +import __gmpn_gcd_1; +import __gmpn_cmp; +import __gmpz_tdiv_q; +import __gmpz_tdiv_r; +import __gmpz_tdiv_qr; +import __gmpz_fdiv_qr; +import __gmpz_divexact; +import __gmpz_and; +import __gmpz_xor; +import __gmpz_ior; +import __gmpz_com; +#endif +#endif /* ----------------------------------------------------------------------------- Arbitrary-precision Integer operations. -- GitLab