mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-11 06:54:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

acinclude.m4: Cosmetic shell syntax fixes.

Browse Source 
2004-07-11  Phil Edwards  <phil@codesourcery.com>

	* acinclude.m4:  Cosmetic shell syntax fixes.
	* configure.ac:  Bring comment inline with reality.
	* configure.host:  Both of the above.  Move 'arm' case to right
	place in host_cpu switch.
	* aclocal.m4, configure:  Regenerate.

From-SVN: r84497
This commit is contained in:
Phil Edwards 2004-07-11 07:46:21 +00:00 committed by Phil Edwards
parent d2640b9193
commit 7d3998a445
6 changed files with 3276 additions and 2259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2004-07-11 Phil Edwards <phil@codesourcery.com>
* acinclude.m4: Cosmetic shell syntax fixes.
* configure.ac: Bring comment inline with reality.
* configure.host: Both of the above. Move 'arm' case to right
place in host_cpu switch.
* aclocal.m4, configure: Regenerate.
2004-07-09 Paolo Carlini <pcarlini@suse.de>
Add wchar_t counterparts of the basic_stringbuf<char> tests.

11
libstdc++-v3/acinclude.m4
View File

@ -982,8 +982,8 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
# Probe for locale support if no specific model is specified.
# Default to "generic".
if test $enable_clocale_flag = auto; then
case x${target_os} in
xlinux* | xgnu* | xkfreebsd*-gnu | xknetbsd*-gnu)
case ${target_os} in
linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
AC_EGREP_CPP([_GLIBCXX_ok], [
#include <features.h>
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
@ -992,7 +992,7 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
], enable_clocale_flag=gnu, enable_clocale_flag=generic)
# Test for bugs early in glibc-2.2.x series
if test x$enable_clocale_flag = xgnu; then
if test $enable_clocale_flag = gnu; then
AC_TRY_RUN([
#define _GNU_SOURCE 1
#include <locale.h>
@ -1153,10 +1153,13 @@ AC_DEFUN([GLIBCXX_ENABLE_ALLOCATOR], [
GLIBCXX_ENABLE(libstdcxx-allocator,auto,[=KIND],
[use KIND for target std::allocator base],
[permit new|malloc|mt|bitmap|pool|yes|no|auto])
# If they didn't use this option switch, or if they specified --enable
# with no specific model, we'll have to look for one. If they
# specified --disable (???), do likewise.
if test $enable_libstdcxx_allocator = no || test $enable_libstdcxx_allocator = yes; then
if test $enable_libstdcxx_allocator = no ||
test $enable_libstdcxx_allocator = yes;
then
enable_libstdcxx_allocator=auto
fi

2685
libstdc++-v3/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

2811
libstdc++-v3/configure vendored
View File

File diff suppressed because it is too large Load Diff

2
libstdc++-v3/configure.ac
View File

@ -267,8 +267,6 @@ GLIBCXX_ENABLE_SYMVERS([yes])
GLIBCXX_CONFIGURE_TESTSUITE
# Propagate the target-specific source directories through the build chain.
# (Nothing currently uses cpu_include_dir directly; only atomicity_include_dir
# uses it, and it only gets used in this file.)
ATOMICITY_SRCDIR=config/${atomicity_dir}
ATOMIC_WORD_SRCDIR=config/${atomic_word_dir}
OS_INC_SRCDIR=config/${os_include_dir}

18
libstdc++-v3/configure.host
View File

@ -17,8 +17,8 @@
# 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 atomicity_include_dir.
# if cpu/host_cpu doesn't exist. This is not used
# directly, but sets the default for others.
#
# os_include_dir OS-specific directory, defaults to os/generic.
#
@ -30,6 +30,9 @@
# abi_baseline_pair directory name for ABI compat testing,
# defaults to host_cpu-host_os (as per config.guess)
#
# abi_tweaks_dir location of cxxabi_tweaks.h,
# defaults to cpu_include_dir
#
# atomicity_dir location of atomicity.h,
# defaults to cpu_include_dir
#
@ -72,6 +75,9 @@ case "${host_cpu}" in
alpha*)
try_cpu=alpha
;;
arm* | xscale | ep9312)
try_cpu=arm
;;
i[567]86 | x86_64)
try_cpu=i486
;;
@ -97,9 +103,6 @@ case "${host_cpu}" in
sparc* | ultrasparc)
try_cpu=sparc
;;
arm* | xscale | ep9312)
try_cpu=arm
;;
*)
if test -d ${glibcxx_srcdir}/config/cpu/${host_cpu}; then
try_cpu=${host_cpu}
@ -123,8 +126,9 @@ 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}"
cpu_include_dir=cpu/${try_cpu}
abi_baseline_pair=${try_cpu}-${host_os}
unset try_cpu
if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/atomicity.h ; then
atomicity_dir=$cpu_include_dir
@ -205,7 +209,7 @@ case "${host_os}" in
# This too-vague configuration does not provide enough information
# to select a ctype include, and thus os_include_dir is a crap shoot.
echo "Please specify the full version of Solaris, ie. solaris2.9 " 1>&2
exit 1;
exit 1
;;
solaris2.5 | solaris2.5.[0-9])
os_include_dir="os/solaris/solaris2.5"