This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[libstdc++] little cosmetics in configury
- From: Phil Edwards <phil at codesourcery dot com>
- To: gcc-patches at gcc dot gnu dot org, libstdc++ at gcc dot gnu dot org
- Date: Sun, 11 Jul 2004 03:45:40 -0400
- Subject: [libstdc++] little cosmetics in configury
While looking over the ARM changes, I noticed that many of the comments
were getting out of date and incorrect, so this fixes them up.
A while back I said I'd fix up some of the unneeded defensive shell
programming next time I was editing those files, so I did.
Tested and committed.
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.
Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.291
diff -u -p -r1.291 acinclude.m4
--- acinclude.m4 26 Jun 2004 08:42:36 -0000 1.291
+++ acinclude.m4 11 Jul 2004 07:35:20 -0000
@@ -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
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.ac,v
retrieving revision 1.22
diff -u -p -r1.22 configure.ac
--- configure.ac 8 Jul 2004 05:24:32 -0000 1.22
+++ configure.ac 11 Jul 2004 07:35:26 -0000
@@ -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}
Index: configure.host
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.host,v
retrieving revision 1.26
diff -u -p -r1.26 configure.host
--- configure.host 2 Jul 2004 23:40:14 -0000 1.26
+++ configure.host 11 Jul 2004 07:35:26 -0000
@@ -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"