2003-06-13 Benjamin Kosnik * config/abi/i686-pc-linux-gnu: To.. * config/abi/i486-linux-gnu: ...this. * config/abi/alphaev67-unknown-linux-gnu: To.. * config/abi/alpha-linux-gnu: ...this. * config/abi/ia64-unknown-linux-gnu: To... * config/abi/ia64-linux-gnu: ...this. * config/abi/x86_64-unknown-linux-gnu: To... * config/abi/x86_64-linux-gnu: ...this. * config/abi/i386-unknown-freebsd4: To... * config/abi/i386-freebsd4: ...this. * configure.host: abi_baseline_triplet to abi_baseline_pair. Simplify cpu bits so that abi_baseline_pair can use the same cpu configuration. * acinclude.m4: Same. * aclocal.m4: Regenerate. * configure.in: Can't get enable_abi_check to yes unless native. * configure: Regenerate. Index: acinclude.m4 =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v retrieving revision 1.242 diff -c -p -r1.242 acinclude.m4 *** acinclude.m4 12 Jun 2003 03:24:08 -0000 1.242 --- acinclude.m4 14 Jun 2003 05:23:38 -0000 *************** AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [ *** 2055,2061 **** GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv) # Export file names for ABI checking. ! baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_triplet}/baseline_symbols.txt" AC_SUBST(baseline_file) dnl XXX move to configure.host? --- 2055,2061 ---- GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv) # Export file names for ABI checking. ! baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}/baseline_symbols.txt" AC_SUBST(baseline_file) dnl XXX move to configure.host? Index: configure.host =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.host,v retrieving revision 1.5 diff -c -p -r1.5 configure.host *** configure.host 23 May 2003 02:31:07 -0000 1.5 --- configure.host 14 Jun 2003 05:23:38 -0000 *************** *** 17,43 **** # It sets the following shell variables: # # cpu_include_dir CPU-specific directory, defaults to cpu/generic ! # if cpu/host_cpu doesn't exist. This is ! # used to set ATOMICITYH. # # os_include_dir OS-specific directory, defaults to os/generic. # ! # c_model the model to use for "C" headers, defaults to c_std. # # c_compatibility if "C" compatibility headers are necessary, ! # defaults to no. # ! # abi_baseline_triplet directory name for ABI compat testing, ! # defaults to host (as per config.guess) # # ATOMICITYH location of atomicity.h, ! # defaults to cpu_include_dir # # It possibly modifies the following variables: # # OPT_LDFLAGS extra flags to pass when linking the library, of ! # the form '-Wl,blah' ! # (defaults to empty in acinclude.m4) # # # If the defaults will not work for your platform, you need only change the --- 17,43 ---- # It sets the following shell variables: # # cpu_include_dir CPU-specific directory, defaults to cpu/generic ! # if cpu/host_cpu doesn't exist. This is ! # used to set ATOMICITYH. # # os_include_dir OS-specific directory, defaults to os/generic. # ! # c_model the "C" header model, defaults to c_std. # # c_compatibility if "C" compatibility headers are necessary, ! # defaults to no. # ! # abi_baseline_pair directory name for ABI compat testing, ! # defaults to host_cpu-host_os (as per config.guess) # # ATOMICITYH location of atomicity.h, ! # defaults to cpu_include_dir # # It possibly modifies the following variables: # # OPT_LDFLAGS extra flags to pass when linking the library, of ! # the form '-Wl,blah' ! # (defaults to empty in acinclude.m4) # # # If the defaults will not work for your platform, you need only change the *************** *** 50,111 **** # Try to guess a default cpu_include_dir based on the name of the CPU. We # cannot do this for os_include_dir; there are too many portable operating # systems out there. :-) - abi_baseline_triplet=${host} c_model=c_std c_compatibility=no - if test -d ${glibcpp_srcdir}/config/cpu/${host_cpu}; then - cpu_include_dir="cpu/${host_cpu}" - else - cpu_include_dir="cpu/generic" - fi # HOST-SPECIFIC OVERRIDES # Set any CPU-dependent bits. # Here we override defaults and catch more general cases due to naming # conventions (e.g., chip_name* to catch all variants). # THIS TABLE IS SORTED. KEEP IT THAT WAY. case "${host_cpu}" in alpha*) ! cpu_include_dir="cpu/alpha" ;; athlon* | i586 | i686 | i786 | x86_64) ! cpu_include_dir="cpu/i486" ;; hppa*) ! cpu_include_dir="cpu/hppa" ;; mips*) ! # cpu/mips/atomicity.h needs MIPS II or above. Only use it ! # where it is known to be safe. ! ATOMICITYH="cpu/generic" ;; m680[246]0) ! cpu_include_dir="cpu/m68k" ;; powerpc* | rs6000) ! cpu_include_dir="cpu/powerpc" ;; s390x) ! cpu_include_dir="cpu/s390" ;; sparc* | ultrasparc) ! cpu_include_dir="cpu/sparc" ;; esac # Now look for the file(s) usually tied to a CPU model, and make default # choices for those if they haven't been explicitly set already. ! _cpu_incdir_fullpath=${glibcpp_srcdir}/config/${cpu_include_dir} ! if test x${ATOMICITYH+set} != xset; then ! if test -f ${_cpu_incdir_fullpath}/atomicity.h; then ! ATOMICITYH=$cpu_include_dir ! else ! ATOMICITYH="cpu/generic" ! fi fi - unset _cpu_incdir_fullpath # Set any OS-dependent bits. --- 50,119 ---- # Try to guess a default cpu_include_dir based on the name of the CPU. We # cannot do this for os_include_dir; there are too many portable operating # systems out there. :-) c_model=c_std c_compatibility=no # HOST-SPECIFIC OVERRIDES # Set any CPU-dependent bits. # Here we override defaults and catch more general cases due to naming # conventions (e.g., chip_name* to catch all variants). + if test -d ${glibcpp_srcdir}/config/cpu/${host_cpu}; then + try_cpu=${host_cpu} + fi + # THIS TABLE IS SORTED. KEEP IT THAT WAY. case "${host_cpu}" in alpha*) ! try_cpu=alpha ;; athlon* | i586 | i686 | i786 | x86_64) ! try_cpu=i486 ;; hppa*) ! try_cpu=hppa ;; mips*) ! # NB: cpu/mips/atomicity.h needs MIPS II or above. ! # Of course, there is no sane way to test for this, no ABI macro, ! # and no consistent host_cpu name differentiation. Therefore, only ! # use it where it is known to be safe, ie it runs linux (see below). ! try_cpu=generic ;; m680[246]0) ! try_cpu=m68k ;; powerpc* | rs6000) ! try_cpu=powerpc ;; s390x) ! try_cpu=s390 ;; sparc* | ultrasparc) ! try_cpu=sparc ! ;; ! *) ! try_cpu=generic ;; esac # Now look for the file(s) usually tied to a CPU model, and make default # choices for those if they haven't been explicitly set already. ! cpu_include_dir="cpu/${try_cpu}" ! ATOMICITYH=$cpu_include_dir ! ! ! # Check whether ABI baseline file exists, if not try to guess name. ! abi_baseline_pair=${try_cpu}-${host_os} ! try_baseline_file=config/abi/${abi_baseline_pair}/baseline_symbols.txt ! if test ! -e ${glibcpp_srcdir}/${try_baseline_file} ; then ! case "${host}" in ! i*86-*-freebsd4*) ! abi_baseline_pair="i386-freebsd4" ! ;; ! esac fi # Set any OS-dependent bits. *************** case "${host_os}" in *** 141,148 **** ;; freebsd*) os_include_dir="os/bsd/freebsd" - # The FreeBSD ABI is expressed in the major version number only. - abi_baseline_triplet=`echo ${host} | sed 's,\(\.[0-9]*\)*$,,'` ;; gnu* | linux*) os_include_dir="os/gnu-linux" --- 149,154 ---- Index: configure.in =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.in,v retrieving revision 1.128 diff -c -p -r1.128 configure.in *** configure.in 12 Jun 2003 03:24:10 -0000 1.128 --- configure.in 14 Jun 2003 05:23:38 -0000 *************** AM_CONDITIONAL(GLIBCPP_BUILD_LIBMATH, t *** 455,463 **** dnl from GLIBCPP_CHECK_WCHAR_T_SUPPORT: AM_CONDITIONAL(GLIBCPP_TEST_WCHAR_T, test "$enable_wchar_t" = yes) dnl from GLIBCPP_CONFIGURE_TESTSUITE: ! # Don't do ABI checking unless native. ! AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK, ! ${GLIBCPP_IS_CROSS_COMPILING} && test "$enable_abi_check" = yes ) AC_CACHE_SAVE --- 455,461 ---- dnl from GLIBCPP_CHECK_WCHAR_T_SUPPORT: AM_CONDITIONAL(GLIBCPP_TEST_WCHAR_T, test "$enable_wchar_t" = yes) dnl from GLIBCPP_CONFIGURE_TESTSUITE: ! AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK, test "$enable_abi_check" = yes) AC_CACHE_SAVE