Attachment #143100 for bug #201321

View | Details | Raw Unified | Return to bug 201321 | Differences between

and this patch




++ gmp-4.2.1.p12/patches/fastgcd/configure

# include <unistd.h>
#endif"

ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS GMPABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR AR ac_ct_AR LIBGMP_DLL LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS'
ac_subst_files=''

# Initialize some variables set by options.

ac_env_target_alias_value=$target_alias
ac_cv_env_target_alias_set=${target_alias+set}
ac_cv_env_target_alias_value=$target_alias
ac_env_GMPABI_set=${GMPABI+set}
ac_env_GMPABI_value=$GMPABI
ac_cv_env_GMPABI_set=${GMPABI+set}
ac_cv_env_GMPABI_value=$GMPABI
ac_env_CC_set=${CC+set}
ac_env_CC_value=$CC
ac_cv_env_CC_set=${CC+set}

                          include additional configurations [automatic]

Some influential environment variables:
  GMPABI      desired ABI (for processors supporting more than one ABI)
  CC          C compiler command
  CFLAGS      C compiler flags
  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a

    # (64-bit), but not both, so there's no option to choose the desired
    # mode, we must instead detect which of the two it is.  This is done by
    # checking sizeof(long), either 4 or 8 bytes respectively.  Do this in
    # GMPABI=1.0 too, in case someone tries to build that with a 2.0w gcc.
    #
    gcc_cflags="-O2"
    gcc_cflags_optlist="arch"

    # gcc 2.7.2.3 knows -mpa-risc-1-0 and -mpa-risc-1-1
    # gcc 2.95 adds -mpa-risc-2-0, plus synonyms -march=1.0, 1.1 and 2.0
    #
    # We don't use -mpa-risc-2-0 in GMPABI=1.0 because 64-bit registers may not
    # be saved by the kernel on an old system.  Actually gcc (as of 3.2)
    # only adds a few float instructions with -mpa-risc-2-0, so it would
    # probably be safe, but let's not take the chance.  In any case, a
    # configuration like --host=hppa2.0 GMPABI=1.0 is far from optimal.
    #
    case $host_cpu in
      hppa1.0*)           gcc_cflags_arch="-mpa-risc-1-0" ;;

        cc_20n_cflags="+DA2.0 +e +O2 -Wl,+vnocompatwarnings"
        cc_20n_testlist="hpc-hppa-2-0"

	# GMPABI=2.0w is available for hppa2.0w and hppa2.0, but not for
	# hppa2.0n, on the assumption that that the latter indicates a
	# desire for GMPABI=2.0n.
	case $host in
        hppa2.0n-*-*) ;;
        *)

    # mode, but not set our ABI.  For some reason it's sparc where this
    # keeps coming up, presumably users there are accustomed to driving the
    # compiler mode that way.  The effect of our testlist setting is to
    # reject GMPABI=64 in favour of GMPABI=32 if the user has forced the flags to
    # 32-bit mode.
    #
    abilist="32"

    case $host_cpu in
      sparc64 | sparcv9* | ultrasparc*)
        case $host in
          # Solaris 6 and earlier cannot run GMPABI=64 since it doesn't save
          # registers properly, so GMPABI=32 is left as the only choice.
          #
          *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*) ;;

          # BSD sparc64 ports are 64-bit-only systems, so GMPABI=64 is the only
          # choice.  In fact they need no special compiler flags, gcc -m64
          # is the default, but it doesn't hurt to add it.  v9 CPUs always
          # use the sparc64 port, since the plain 32-bit sparc ports don't

  # -O, but lets assume that's no longer true.
  #
  # -m32 forces 32-bit mode on a bi-arch 32/64 amd64 build of gcc.  -m64 is
  # the default in such a build (we think), so -m32 is essential for GMPABI=32.
  # This is, of course, done for any $host_cpu, not just x86_64, so we can
  # get such a gcc into the right mode to cross-compile to say i486-*-*.
  #


cat >&5 <<EOF
User:
GMPABI=$GMPABI
CC=$CC
CFLAGS=$CFLAGS_or_unset
CPPFLAGS=$CPPFLAGS_or_unset

# If the user specifies an ABI then it must be in $abilist, after that
# $abilist is restricted to just that choice.
#
if test -n "$GMPABI"; then
  found=no
  for abi in $abilist; do
    if test $abi = "$GMPABI"; then found=yes; break; fi
  done
  if test $found = no; then
    { { echo "$as_me:$LINENO: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&5
echo "$as_me: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&2;}
   { (exit 1); exit 1; }; }
  fi
  abilist="$GMPABI"
fi

found_compiler=no

for abi in $abilist; do

  echo "checking GMPABI=$abi"

  # Suppose abilist="64 32", then for abi=64, will have abi1="_64" and
  # abi2="_64".  For abi=32, will have abi1="_32" and abi2="".  This is how

            # For -march settings which enable SSE2 we exclude certain bad
            # gcc versions and we need an OS knowing how to save xmm regs.
            #
            # This is only for GMPABI=32, any 64-bit gcc is good and any OS
            # knowing x86_64 will know xmm.
            #
            # -march=k8 was only introduced in gcc 3.3, so we shouldn't need

    done
  fi

  GMPABI="$abi"
  CC="$cc"
  CFLAGS="$cflags"
  CPPFLAGS="$cppflags"


  # Could easily have this in config.h too, if desired.
  GMPABI_nodots=`echo $GMPABI | sed 's/\./_/'`

echo "define_not_for_expansion(\`HAVE_ABI_$GMPABI_nodots')" >> $gmp_tmpconfigm4p




# If there's any sse2 or mmx in the path, check whether the assembler
# supports it, and remove if not.
#
# We only need this in GMPABI=32, for GMPABI=64 on x86_64 we can assume a new
# enough assembler.
#
case $host in
  i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | x86_64-*-*)
    if test "$GMPABI" = 32; then
      case "$path $fat_path" in
        *mmx*)   echo "$as_me:$LINENO: checking if the assembler knows about MMX instructions" >&5
echo $ECHO_N "checking if the assembler knows about MMX instructions... $ECHO_C" >&6


cat >&5 <<EOF
Decided:
GMPABI=$GMPABI
CC=$CC
CFLAGS=$CFLAGS
CPPFLAGS=$CPPFLAGS

CXXFLAGS=$CXXFLAGS
path=$path
EOF
echo "using GMPABI=\"$GMPABI\""
echo "      CC=\"$CC\""
echo "      CFLAGS=\"$CFLAGS\""
echo "      CPPFLAGS=\"$CPPFLAGS\""


      case $host in
        *-*-aix*)
	  case $GMPABI in
	    64 | aix64)
echo "include_mpn(\`powerpc64/aix.m4')" >> $gmp_tmpconfigm4i
 ;;

          esac
          ;;
        *-*-linux* | *-*-*bsd*)
	  case $GMPABI in
	    mode64)
echo "include_mpn(\`powerpc64/elf.m4')" >> $gmp_tmpconfigm4i
 ;;

          esac
          ;;
        *-*-darwin*)
	  case $GMPABI in
	    mode64)
echo "include_mpn(\`powerpc64/darwin.m4')" >> $gmp_tmpconfigm4i
 ;;


      ;;
    sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*)
      case $GMPABI in
        64)

echo "$as_me:$LINENO: checking if the assembler accepts \".register\"" >&5

echo "define(<ALIGN_FILL_0x90>,<$gmp_cv_asm_align_fill_0x90>)" >> $gmp_tmpconfigm4


      case $GMPABI in
        32)

echo "include_mpn(\`x86/x86-defs.m4')" >> $gmp_tmpconfigm4i

s,@WANT_MPBSD_TRUE@,$WANT_MPBSD_TRUE,;t t
s,@WANT_MPBSD_FALSE@,$WANT_MPBSD_FALSE,;t t
s,@GMP_NAIL_BITS@,$GMP_NAIL_BITS,;t t
s,@GMPABI@,$GMPABI,;t t
s,@HAVE_HOST_CPU_FAMILY_power@,$HAVE_HOST_CPU_FAMILY_power,;t t
s,@HAVE_HOST_CPU_FAMILY_powerpc@,$HAVE_HOST_CPU_FAMILY_powerpc,;t t
s,@GMP_LDFLAGS@,$GMP_LDFLAGS,;t t

Lines 146-151 Link Here

(-)gmp-4.2.1.p12/spkg-install.orig (+8 lines)
146	{	146	{
147		147
148	SAGE_CONF_OPTS="--enable-shared --disable-static"	148	SAGE_CONF_OPTS="--enable-shared --disable-static"
		149
		150	# ABI mappings (needs all architectures supported) [lifted from Gentoo]
		151	case ${ABI} in
		152	32\|x86) export GMPABI=32;;
		153	64\|amd64\|n64) export GMPABI=64;;
		154	o32\|n32) export GMPABI=${ABI};;
		155	esac
		156
149	case $UNAME in	157	case $UNAME in
150		158
151	Darwin)	159	Darwin)

Return to bug 201321

Line Link Here

(-)file_not_specified_in_diff (-38 / +38 lines)
0	-- gmp-4.2.1.p12/patches/fastgcd/configure	0	++ gmp-4.2.1.p12/patches/fastgcd/configure
Lines 489-495 Link Here
489	# include <unistd.h>	489	# include <unistd.h>
490	#endif"	490	#endif"
491		491
492	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS ABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR AR ac_ct_AR LIBGMP_DLL LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS'	492	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS GMPABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR AR ac_ct_AR LIBGMP_DLL LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS'
493	ac_subst_files=''	493	ac_subst_files=''
494		494
495	# Initialize some variables set by options.	495	# Initialize some variables set by options.
Lines 930-939 Link Here
930	ac_env_target_alias_value=$target_alias	930	ac_env_target_alias_value=$target_alias
931	ac_cv_env_target_alias_set=${target_alias+set}	931	ac_cv_env_target_alias_set=${target_alias+set}
932	ac_cv_env_target_alias_value=$target_alias	932	ac_cv_env_target_alias_value=$target_alias
933	ac_env_ABI_set=${ABI+set}	933	ac_env_GMPABI_set=${GMPABI+set}
934	ac_env_ABI_value=$ABI	934	ac_env_GMPABI_value=$GMPABI
935	ac_cv_env_ABI_set=${ABI+set}	935	ac_cv_env_GMPABI_set=${GMPABI+set}
936	ac_cv_env_ABI_value=$ABI	936	ac_cv_env_GMPABI_value=$GMPABI
937	ac_env_CC_set=${CC+set}	937	ac_env_CC_set=${CC+set}
938	ac_env_CC_value=$CC	938	ac_env_CC_value=$CC
939	ac_cv_env_CC_set=${CC+set}	939	ac_cv_env_CC_set=${CC+set}
Lines 1091-1097 Link Here
1091	include additional configurations [automatic]	1091	include additional configurations [automatic]
1092		1092
1093	Some influential environment variables:	1093	Some influential environment variables:
1094	ABI desired ABI (for processors supporting more than one ABI)	1094	GMPABI desired ABI (for processors supporting more than one ABI)
1095	CC C compiler command	1095	CC C compiler command
1096	CFLAGS C compiler flags	1096	CFLAGS C compiler flags
1097	LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a	1097	LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
Lines 2670-2676 Link Here
2670	# (64-bit), but not both, so there's no option to choose the desired	2670	# (64-bit), but not both, so there's no option to choose the desired
2671	# mode, we must instead detect which of the two it is. This is done by	2671	# mode, we must instead detect which of the two it is. This is done by
2672	# checking sizeof(long), either 4 or 8 bytes respectively. Do this in	2672	# checking sizeof(long), either 4 or 8 bytes respectively. Do this in
2673	# ABI=1.0 too, in case someone tries to build that with a 2.0w gcc.	2673	# GMPABI=1.0 too, in case someone tries to build that with a 2.0w gcc.
2674	#	2674	#
2675	gcc_cflags="-O2"	2675	gcc_cflags="-O2"
2676	gcc_cflags_optlist="arch"	2676	gcc_cflags_optlist="arch"
Lines 2694-2704 Link Here
2694	# gcc 2.7.2.3 knows -mpa-risc-1-0 and -mpa-risc-1-1	2694	# gcc 2.7.2.3 knows -mpa-risc-1-0 and -mpa-risc-1-1
2695	# gcc 2.95 adds -mpa-risc-2-0, plus synonyms -march=1.0, 1.1 and 2.0	2695	# gcc 2.95 adds -mpa-risc-2-0, plus synonyms -march=1.0, 1.1 and 2.0
2696	#	2696	#
2697	# We don't use -mpa-risc-2-0 in ABI=1.0 because 64-bit registers may not	2697	# We don't use -mpa-risc-2-0 in GMPABI=1.0 because 64-bit registers may not
2698	# be saved by the kernel on an old system. Actually gcc (as of 3.2)	2698	# be saved by the kernel on an old system. Actually gcc (as of 3.2)
2699	# only adds a few float instructions with -mpa-risc-2-0, so it would	2699	# only adds a few float instructions with -mpa-risc-2-0, so it would
2700	# probably be safe, but let's not take the chance. In any case, a	2700	# probably be safe, but let's not take the chance. In any case, a
2701	# configuration like --host=hppa2.0 ABI=1.0 is far from optimal.	2701	# configuration like --host=hppa2.0 GMPABI=1.0 is far from optimal.
2702	#	2702	#
2703	case $host_cpu in	2703	case $host_cpu in
2704	hppa1.0*) gcc_cflags_arch="-mpa-risc-1-0" ;;	2704	hppa1.0*) gcc_cflags_arch="-mpa-risc-1-0" ;;
Lines 2733-2741 Link Here
2733	cc_20n_cflags="+DA2.0 +e +O2 -Wl,+vnocompatwarnings"	2733	cc_20n_cflags="+DA2.0 +e +O2 -Wl,+vnocompatwarnings"
2734	cc_20n_testlist="hpc-hppa-2-0"	2734	cc_20n_testlist="hpc-hppa-2-0"
2735		2735
2736	# ABI=2.0w is available for hppa2.0w and hppa2.0, but not for	2736	# GMPABI=2.0w is available for hppa2.0w and hppa2.0, but not for
2737	# hppa2.0n, on the assumption that that the latter indicates a	2737	# hppa2.0n, on the assumption that that the latter indicates a
2738	# desire for ABI=2.0n.	2738	# desire for GMPABI=2.0n.
2739	case $host in	2739	case $host in
2740	hppa2.0n--) ;;	2740	hppa2.0n--) ;;
2741	*)	2741	*)
Lines 3203-3209 Link Here
3203	# mode, but not set our ABI. For some reason it's sparc where this	3203	# mode, but not set our ABI. For some reason it's sparc where this
3204	# keeps coming up, presumably users there are accustomed to driving the	3204	# keeps coming up, presumably users there are accustomed to driving the
3205	# compiler mode that way. The effect of our testlist setting is to	3205	# compiler mode that way. The effect of our testlist setting is to
3206	# reject ABI=64 in favour of ABI=32 if the user has forced the flags to	3206	# reject GMPABI=64 in favour of GMPABI=32 if the user has forced the flags to
3207	# 32-bit mode.	3207	# 32-bit mode.
3208	#	3208	#
3209	abilist="32"	3209	abilist="32"
Lines 3308-3319 Link Here
3308	case $host_cpu in	3308	case $host_cpu in
3309	sparc64 \| sparcv9* \| ultrasparc*)	3309	sparc64 \| sparcv9* \| ultrasparc*)
3310	case $host in	3310	case $host in
3311	# Solaris 6 and earlier cannot run ABI=64 since it doesn't save	3311	# Solaris 6 and earlier cannot run GMPABI=64 since it doesn't save
3312	# registers properly, so ABI=32 is left as the only choice.	3312	# registers properly, so GMPABI=32 is left as the only choice.
3313	#	3313	#
3314	--solaris2.[0-6] \| --solaris2.[0-6].*) ;;	3314	--solaris2.[0-6] \| --solaris2.[0-6].*) ;;
3315		3315
3316	# BSD sparc64 ports are 64-bit-only systems, so ABI=64 is the only	3316	# BSD sparc64 ports are 64-bit-only systems, so GMPABI=64 is the only
3317	# choice. In fact they need no special compiler flags, gcc -m64	3317	# choice. In fact they need no special compiler flags, gcc -m64
3318	# is the default, but it doesn't hurt to add it. v9 CPUs always	3318	# is the default, but it doesn't hurt to add it. v9 CPUs always
3319	# use the sparc64 port, since the plain 32-bit sparc ports don't	3319	# use the sparc64 port, since the plain 32-bit sparc ports don't
Lines 3399-3405 Link Here
3399	# -O, but lets assume that's no longer true.	3399	# -O, but lets assume that's no longer true.
3400	#	3400	#
3401	# -m32 forces 32-bit mode on a bi-arch 32/64 amd64 build of gcc. -m64 is	3401	# -m32 forces 32-bit mode on a bi-arch 32/64 amd64 build of gcc. -m64 is
3402	# the default in such a build (we think), so -m32 is essential for ABI=32.	3402	# the default in such a build (we think), so -m32 is essential for GMPABI=32.
3403	# This is, of course, done for any $host_cpu, not just x86_64, so we can	3403	# This is, of course, done for any $host_cpu, not just x86_64, so we can
3404	# get such a gcc into the right mode to cross-compile to say i486--.	3404	# get such a gcc into the right mode to cross-compile to say i486--.
3405	#	3405	#
Lines 3639-3645 Link Here
3639		3639
3640	cat >&5 <<EOF	3640	cat >&5 <<EOF
3641	User:	3641	User:
3642	ABI=$ABI	3642	GMPABI=$GMPABI
3643	CC=$CC	3643	CC=$CC
3644	CFLAGS=$CFLAGS_or_unset	3644	CFLAGS=$CFLAGS_or_unset
3645	CPPFLAGS=$CPPFLAGS_or_unset	3645	CPPFLAGS=$CPPFLAGS_or_unset
Lines 3660-3683 Link Here
3660	# If the user specifies an ABI then it must be in $abilist, after that	3660	# If the user specifies an ABI then it must be in $abilist, after that
3661	# $abilist is restricted to just that choice.	3661	# $abilist is restricted to just that choice.
3662	#	3662	#
3663	if test -n "$ABI"; then	3663	if test -n "$GMPABI"; then
3664	found=no	3664	found=no
3665	for abi in $abilist; do	3665	for abi in $abilist; do
3666	if test $abi = "$ABI"; then found=yes; break; fi	3666	if test $abi = "$GMPABI"; then found=yes; break; fi
3667	done	3667	done
3668	if test $found = no; then	3668	if test $found = no; then
3669	{ { echo "$as_me:$LINENO: error: ABI=$ABI is not among the following valid choices: $abilist" >&5	3669	{ { echo "$as_me:$LINENO: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&5
3670	echo "$as_me: error: ABI=$ABI is not among the following valid choices: $abilist" >&2;}	3670	echo "$as_me: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&2;}
3671	{ (exit 1); exit 1; }; }	3671	{ (exit 1); exit 1; }; }
3672	fi	3672	fi
3673	abilist="$ABI"	3673	abilist="$GMPABI"
3674	fi	3674	fi
3675		3675
3676	found_compiler=no	3676	found_compiler=no
3677		3677
3678	for abi in $abilist; do	3678	for abi in $abilist; do
3679		3679
3680	echo "checking ABI=$abi"	3680	echo "checking GMPABI=$abi"
3681		3681
3682	# Suppose abilist="64 32", then for abi=64, will have abi1="_64" and	3682	# Suppose abilist="64 32", then for abi=64, will have abi1="_64" and
3683	# abi2="_64". For abi=32, will have abi1="_32" and abi2="". This is how	3683	# abi2="_64". For abi=32, will have abi1="_32" and abi2="". This is how
Lines 5128-5134 Link Here
5128	# For -march settings which enable SSE2 we exclude certain bad	5128	# For -march settings which enable SSE2 we exclude certain bad
5129	# gcc versions and we need an OS knowing how to save xmm regs.	5129	# gcc versions and we need an OS knowing how to save xmm regs.
5130	#	5130	#
5131	# This is only for ABI=32, any 64-bit gcc is good and any OS	5131	# This is only for GMPABI=32, any 64-bit gcc is good and any OS
5132	# knowing x86_64 will know xmm.	5132	# knowing x86_64 will know xmm.
5133	#	5133	#
5134	# -march=k8 was only introduced in gcc 3.3, so we shouldn't need	5134	# -march=k8 was only introduced in gcc 3.3, so we shouldn't need
Lines 6368-6383 Link Here
6368	done	6368	done
6369	fi	6369	fi
6370		6370
6371	ABI="$abi"	6371	GMPABI="$abi"
6372	CC="$cc"	6372	CC="$cc"
6373	CFLAGS="$cflags"	6373	CFLAGS="$cflags"
6374	CPPFLAGS="$cppflags"	6374	CPPFLAGS="$cppflags"
6375		6375
6376		6376
6377	# Could easily have this in config.h too, if desired.	6377	# Could easily have this in config.h too, if desired.
6378	ABI_nodots=`echo $ABI \| sed 's/\./_/'`	6378	GMPABI_nodots=`echo $GMPABI \| sed 's/\./_/'`
6379		6379
6380	echo "define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')" >> $gmp_tmpconfigm4p	6380	echo "define_not_for_expansion(\`HAVE_ABI_$GMPABI_nodots')" >> $gmp_tmpconfigm4p
6381		6381
6382		6382
6383		6383
Lines 8830-8841 Link Here
8830	# If there's any sse2 or mmx in the path, check whether the assembler	8830	# If there's any sse2 or mmx in the path, check whether the assembler
8831	# supports it, and remove if not.	8831	# supports it, and remove if not.
8832	#	8832	#
8833	# We only need this in ABI=32, for ABI=64 on x86_64 we can assume a new	8833	# We only need this in GMPABI=32, for GMPABI=64 on x86_64 we can assume a new
8834	# enough assembler.	8834	# enough assembler.
8835	#	8835	#
8836	case $host in	8836	case $host in
8837	i?86--* \| k[5-8]--* \| pentium--* \| athlon-- \| viac3--* \| x86_64--)	8837	i?86--* \| k[5-8]--* \| pentium--* \| athlon-- \| viac3--* \| x86_64--)
8838	if test "$ABI" = 32; then	8838	if test "$GMPABI" = 32; then
8839	case "$path $fat_path" in	8839	case "$path $fat_path" in
8840	mmx) echo "$as_me:$LINENO: checking if the assembler knows about MMX instructions" >&5	8840	mmx) echo "$as_me:$LINENO: checking if the assembler knows about MMX instructions" >&5
8841	echo $ECHO_N "checking if the assembler knows about MMX instructions... $ECHO_C" >&6	8841	echo $ECHO_N "checking if the assembler knows about MMX instructions... $ECHO_C" >&6
Lines 9019-9025 Link Here
9019		9019
9020	cat >&5 <<EOF	9020	cat >&5 <<EOF
9021	Decided:	9021	Decided:
9022	ABI=$ABI	9022	GMPABI=$GMPABI
9023	CC=$CC	9023	CC=$CC
9024	CFLAGS=$CFLAGS	9024	CFLAGS=$CFLAGS
9025	CPPFLAGS=$CPPFLAGS	9025	CPPFLAGS=$CPPFLAGS
Lines 9028-9034 Link Here
9028	CXXFLAGS=$CXXFLAGS	9028	CXXFLAGS=$CXXFLAGS
9029	path=$path	9029	path=$path
9030	EOF	9030	EOF
9031	echo "using ABI=\"$ABI\""	9031	echo "using GMPABI=\"$GMPABI\""
9032	echo " CC=\"$CC\""	9032	echo " CC=\"$CC\""
9033	echo " CFLAGS=\"$CFLAGS\""	9033	echo " CFLAGS=\"$CFLAGS\""
9034	echo " CPPFLAGS=\"$CPPFLAGS\""	9034	echo " CPPFLAGS=\"$CPPFLAGS\""
Lines 30005-30011 Link Here
30005		30005
30006	case $host in	30006	case $host in
30007	--aix*)	30007	--aix*)
30008	case $ABI in	30008	case $GMPABI in
30009	64 \| aix64)	30009	64 \| aix64)
30010	echo "include_mpn(\`powerpc64/aix.m4')" >> $gmp_tmpconfigm4i	30010	echo "include_mpn(\`powerpc64/aix.m4')" >> $gmp_tmpconfigm4i
30011	;;	30011	;;
Lines 30015-30021 Link Here
30015	esac	30015	esac
30016	;;	30016	;;
30017	--linux* \| --bsd)	30017	--linux* \| --bsd)
30018	case $ABI in	30018	case $GMPABI in
30019	mode64)	30019	mode64)
30020	echo "include_mpn(\`powerpc64/elf.m4')" >> $gmp_tmpconfigm4i	30020	echo "include_mpn(\`powerpc64/elf.m4')" >> $gmp_tmpconfigm4i
30021	;;	30021	;;
Lines 30025-30031 Link Here
30025	esac	30025	esac
30026	;;	30026	;;
30027	--darwin*)	30027	--darwin*)
30028	case $ABI in	30028	case $GMPABI in
30029	mode64)	30029	mode64)
30030	echo "include_mpn(\`powerpc64/darwin.m4')" >> $gmp_tmpconfigm4i	30030	echo "include_mpn(\`powerpc64/darwin.m4')" >> $gmp_tmpconfigm4i
30031	;;	30031	;;
Lines 30048-30054 Link Here
30048		30048
30049	;;	30049	;;
30050	sparcv9--* \| ultrasparc--* \| sparc64--)	30050	sparcv9--* \| ultrasparc--* \| sparc64--)
30051	case $ABI in	30051	case $GMPABI in
30052	64)	30052	64)
30053		30053
30054	echo "$as_me:$LINENO: checking if the assembler accepts \".register\"" >&5	30054	echo "$as_me:$LINENO: checking if the assembler accepts \".register\"" >&5
Lines 30130-30136 Link Here
30130	echo "define(<ALIGN_FILL_0x90>,<$gmp_cv_asm_align_fill_0x90>)" >> $gmp_tmpconfigm4	30130	echo "define(<ALIGN_FILL_0x90>,<$gmp_cv_asm_align_fill_0x90>)" >> $gmp_tmpconfigm4
30131		30131
30132		30132
30133	case $ABI in	30133	case $GMPABI in
30134	32)	30134	32)
30135		30135
30136	echo "include_mpn(\`x86/x86-defs.m4')" >> $gmp_tmpconfigm4i	30136	echo "include_mpn(\`x86/x86-defs.m4')" >> $gmp_tmpconfigm4i
Lines 34032-34038 Link Here
34032	s,@WANT_MPBSD_TRUE@,$WANT_MPBSD_TRUE,;t t	34032	s,@WANT_MPBSD_TRUE@,$WANT_MPBSD_TRUE,;t t
34033	s,@WANT_MPBSD_FALSE@,$WANT_MPBSD_FALSE,;t t	34033	s,@WANT_MPBSD_FALSE@,$WANT_MPBSD_FALSE,;t t
34034	s,@GMP_NAIL_BITS@,$GMP_NAIL_BITS,;t t	34034	s,@GMP_NAIL_BITS@,$GMP_NAIL_BITS,;t t
34035	s,@ABI@,$ABI,;t t	34035	s,@GMPABI@,$GMPABI,;t t
34036	s,@HAVE_HOST_CPU_FAMILY_power@,$HAVE_HOST_CPU_FAMILY_power,;t t	34036	s,@HAVE_HOST_CPU_FAMILY_power@,$HAVE_HOST_CPU_FAMILY_power,;t t
34037	s,@HAVE_HOST_CPU_FAMILY_powerpc@,$HAVE_HOST_CPU_FAMILY_powerpc,;t t	34037	s,@HAVE_HOST_CPU_FAMILY_powerpc@,$HAVE_HOST_CPU_FAMILY_powerpc,;t t
34038	s,@GMP_LDFLAGS@,$GMP_LDFLAGS,;t t	34038	s,@GMP_LDFLAGS@,$GMP_LDFLAGS,;t t