Alexandros C. Couloumbis
14 years ago
parent
8f143af3ff
commit
2a3dde2cac
@ -0,0 +1,16 @@
|
||||
Index: gmp-5.0.1/longlong.h
|
||||
===================================================================
|
||||
--- gmp-5.0.1.orig/longlong.h
|
||||
+++ gmp-5.0.1/longlong.h
|
||||
@@ -849,8 +849,10 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
|
||||
count is only an int. */
|
||||
#define count_trailing_zeros(count, x) \
|
||||
do { \
|
||||
+ UDItype __cbtmp; \
|
||||
ASSERT ((x) != 0); \
|
||||
- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \
|
||||
+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \
|
||||
+ (count) = __cbtmp; \
|
||||
} while (0)
|
||||
#endif /* x86_64 */
|
||||
|
||||
@ -0,0 +1,193 @@
|
||||
diff -rdup gmp-5.0.1.oorig/acinclude.m4 gmp-5.0.1/acinclude.m4
|
||||
--- gmp-5.0.1.oorig/acinclude.m4 2010-02-06 13:43:13.000000000 +0100
|
||||
+++ gmp-5.0.1/acinclude.m4 2010-02-08 17:19:44.000000000 +0100
|
||||
@@ -30,23 +30,23 @@ dnl a_out.exe - OpenVMS DEC C called
|
||||
dnl conftest.exe - various DOS compilers
|
||||
|
||||
|
||||
-define(IA64_PATTERN,
|
||||
+define([IA64_PATTERN],
|
||||
[[ia64*-*-* | itanium-*-* | itanium2-*-*]])
|
||||
|
||||
dnl Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all
|
||||
dnl of which config.sub accepts. (Though none of which are likely to work
|
||||
dnl with GMP.)
|
||||
dnl
|
||||
-define(M68K_PATTERN,
|
||||
+define([M68K_PATTERN],
|
||||
[[m68k-*-* | m68[0-9][0-9][0-9]-*-*]])
|
||||
|
||||
-define(POWERPC64_PATTERN,
|
||||
+define([POWERPC64_PATTERN],
|
||||
[[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]])
|
||||
|
||||
-define(X86_PATTERN,
|
||||
+define([X86_PATTERN],
|
||||
[[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]])
|
||||
|
||||
-define(X86_64_PATTERN,
|
||||
+define([X86_64_PATTERN],
|
||||
[[athlon64-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei-*-* | x86_64-*-* | nano-*-*]])
|
||||
|
||||
dnl GMP_FAT_SUFFIX(DSTVAR, DIRECTORY)
|
||||
@@ -64,7 +64,7 @@ dnl x86 -> x86
|
||||
dnl x86/k6 -> k6
|
||||
dnl x86/k6/mmx -> k6_mmx
|
||||
|
||||
-define(GMP_FAT_SUFFIX,
|
||||
+define([GMP_FAT_SUFFIX],
|
||||
[[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]])
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ dnl ----------------------------------
|
||||
dnl Emit code to remove any occurrence of ITEM from $LISTVAR. ITEM can be a
|
||||
dnl shell expression like $foo if desired.
|
||||
|
||||
-define(GMP_REMOVE_FROM_LIST,
|
||||
+define([GMP_REMOVE_FROM_LIST],
|
||||
[remove_from_list_tmp=
|
||||
for remove_from_list_i in $[][$1]; do
|
||||
if test $remove_from_list_i = [$2]; then :;
|
||||
@@ -89,12 +89,12 @@ dnl GMP_STRIP_PATH(subdir)
|
||||
dnl ----------------------
|
||||
dnl Strip entries */subdir from $path and $fat_path.
|
||||
|
||||
-define(GMP_STRIP_PATH,
|
||||
+define([GMP_STRIP_PATH],
|
||||
[GMP_STRIP_PATH_VAR(path, [$1])
|
||||
GMP_STRIP_PATH_VAR(fat_path, [$1])
|
||||
])
|
||||
|
||||
-define(GMP_STRIP_PATH_VAR,
|
||||
+define([GMP_STRIP_PATH_VAR],
|
||||
[tmp_path=
|
||||
for i in $[][$1]; do
|
||||
case $i in
|
||||
@@ -115,7 +115,7 @@ dnl
|
||||
dnl Dummy value for GMP_LIMB_BITS is enough
|
||||
dnl for all current configure-time uses of gmp.h.
|
||||
|
||||
-define(GMP_INCLUDE_GMP_H,
|
||||
+define([GMP_INCLUDE_GMP_H],
|
||||
[[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */
|
||||
#define GMP_NAIL_BITS $GMP_NAIL_BITS
|
||||
#define GMP_LIMB_BITS 123
|
||||
@@ -130,7 +130,7 @@ dnl Expand at autoconf time to the valu
|
||||
dnl FILE. The regexps here aren't very rugged, but are enough for gmp.
|
||||
dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted.
|
||||
|
||||
-define(GMP_HEADER_GETVAL,
|
||||
+define([GMP_HEADER_GETVAL],
|
||||
[patsubst(patsubst(
|
||||
esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]),
|
||||
[^.*$1[ ]+],[]),
|
||||
@@ -144,7 +144,7 @@ dnl The gmp version number, extracted f
|
||||
dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits
|
||||
dnl like 3.0.1 if patchlevel > 0.
|
||||
|
||||
-define(GMP_VERSION,
|
||||
+define([GMP_VERSION],
|
||||
[GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
|
||||
.GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
|
||||
.GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)])
|
||||
@@ -1506,7 +1506,9 @@ esac
|
||||
echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
|
||||
|
||||
# All CPUs use asm-defs.m4
|
||||
-echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i
|
||||
+echo -n ["include("] >>$gmp_tmpconfigm4i
|
||||
+echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i
|
||||
+echo [")"] >>$gmp_tmpconfigm4i
|
||||
])
|
||||
|
||||
|
||||
diff -rdup gmp-5.0.1.oorig/configure.in gmp-5.0.1/configure.in
|
||||
--- gmp-5.0.1.oorig/configure.in 2010-02-06 13:43:13.000000000 +0100
|
||||
+++ gmp-5.0.1/configure.in 2010-02-08 17:18:30.000000000 +0100
|
||||
@@ -29,12 +29,6 @@ AC_REVISION($Revision$)
|
||||
AC_PREREQ(2.59)
|
||||
AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@gmplib.org, gmp)
|
||||
AC_CONFIG_SRCDIR(gmp-impl.h)
|
||||
-m4_pattern_forbid([^[ \t]*GMP_])
|
||||
-m4_pattern_allow(GMP_LDFLAGS)
|
||||
-m4_pattern_allow(GMP_LIMB_BITS)
|
||||
-m4_pattern_allow(GMP_MPARAM_H_SUGGEST)
|
||||
-m4_pattern_allow(GMP_NAIL_BITS)
|
||||
-m4_pattern_allow(GMP_NUMB_BITS)
|
||||
|
||||
# If --target is not used then $target_alias is empty, but if say
|
||||
# "./configure athlon-pc-freebsd3.5" is used, then all three of
|
||||
@@ -303,7 +297,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1],
|
||||
# After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
|
||||
# called. User selections of CC etc are respected.
|
||||
#
|
||||
-# Care is taken not to use macros like AC_TRY_COMPILE during the GMP
|
||||
+# Care is taken not to use macros like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) during the GMP
|
||||
# pre-testing, since they of course depend on AC_PROG_CC, and also some of
|
||||
# them cache their results, which is not wanted.
|
||||
#
|
||||
@@ -395,7 +389,7 @@ abilist="standard"
|
||||
# FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring
|
||||
# c89 over cc here. But note that on HP-UX c89 provides a castrated
|
||||
# environment, and would want to be excluded somehow. Maybe
|
||||
-# AC_PROG_CC_STDC already does enough to stick cc into ANSI mode and
|
||||
+# already does enough to stick cc into ANSI mode and
|
||||
# we don't need to worry.
|
||||
#
|
||||
cclist="gcc cc"
|
||||
@@ -1580,7 +1574,7 @@ esac
|
||||
CFLAGS_or_unset=${CFLAGS-'(unset)'}
|
||||
CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
|
||||
|
||||
-cat >&AC_FD_CC <<EOF
|
||||
+cat >&AS_MESSAGE_LOG_FD() <<EOF
|
||||
User:
|
||||
ABI=$ABI
|
||||
CC=$CC
|
||||
@@ -1987,7 +1981,6 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
|
||||
|
||||
# The C compiler and preprocessor, put into ANSI mode if possible.
|
||||
AC_PROG_CC
|
||||
-AC_PROG_CC_STDC
|
||||
AC_PROG_CPP
|
||||
GMP_H_ANSI
|
||||
|
||||
@@ -2010,11 +2003,11 @@ AC_SUBST(CCAS)
|
||||
|
||||
# The C++ compiler, if desired.
|
||||
want_cxx=no
|
||||
+AC_PROG_CXX
|
||||
if test $enable_cxx != no; then
|
||||
test_CXXFLAGS=${CXXFLAGS+set}
|
||||
- AC_PROG_CXX
|
||||
|
||||
- echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC
|
||||
+ echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD()
|
||||
cxxflags_ac_prog_cxx=$CXXFLAGS
|
||||
cxxflags_list=ac_prog_cxx
|
||||
|
||||
@@ -2120,7 +2113,7 @@ case $host in
|
||||
esac
|
||||
|
||||
|
||||
-cat >&AC_FD_CC <<EOF
|
||||
+cat >&AS_MESSAGE_LOG_FD() <<EOF
|
||||
Decided:
|
||||
ABI=$ABI
|
||||
CC=$CC
|
||||
@@ -3376,7 +3369,7 @@ GMP_FINISH
|
||||
# FIXME: Upcoming version of autoconf/automake may not like broken lines.
|
||||
# Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
|
||||
|
||||
-AC_OUTPUT(Makefile \
|
||||
+AC_CONFIG_FILES([Makefile \
|
||||
mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile \
|
||||
mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile \
|
||||
tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile \
|
||||
@@ -3385,4 +3378,5 @@ AC_OUTPUT(Makefile \
|
||||
tests/cxx/Makefile \
|
||||
doc/Makefile tune/Makefile \
|
||||
demos/Makefile demos/calc/Makefile demos/expr/Makefile \
|
||||
- gmp.h:gmp-h.in mp.h:mp-h.in)
|
||||
+ gmp.h:gmp-h.in mp.h:mp-h.in])
|
||||
+AC_OUTPUT
|
||||
Loading…
Reference in New Issue