This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[v3] remove ctype_include_dir, simplify atomicity/ctype setting
- To: libstdc++ at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Subject: [v3] remove ctype_include_dir, simplify atomicity/ctype setting
- From: Benjamin Kosnik <bkoz at redhat dot com>
- Date: Tue, 23 Jan 2001 12:53:25 -0800
2001-01-23 Benjamin Kosnik <bkoz@redhat.com>
* configure.target: Just use os_include_dir always.
* configure.in: Remove calls to GLIBCPP_CHECK_CTYPE_SUPPORT.
Link atomicity files and ctype files here.
* configure: Regenerate.
* acinclude.m4 (GLIBCPP_CHECK_CTYPE_SUPPORT): Remove.
(GLIBCPP_ENABLE_ATOMICITY): Remove.
* aclocal.m4: Regenerate.
Index: configure.target
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/configure.target,v
retrieving revision 1.12
diff -c -p -r1.12 configure.target
*** configure.target 2001/01/23 17:02:26 1.12
--- configure.target 2001/01/23 20:50:58
***************
*** 20,26 ****
# glibcpp_cxxflags Special CXXFLAGS to use when building
# cpu_include_dir CPU-specific include directory, relative to srcdir
# os_include_dir OS-specific include directory, relative to srcdir
- # ctype_include_dir Platform-specific (usually OS) ctype include dir
# The first two are set in configure.host and modified here.
--- 20,25 ----
*************** case "${target_os}" in
*** 78,92 ****
enable_threads='no'
;;
esac
- ctype_include_dir=${os_include_dir}
;;
aix*)
os_include_dir="config/os/aix"
- ctype_include_dir=${os_include_dir}
;;
bsd* | freebsd* )
os_include_dir="config/os/bsd/freebsd"
- ctype_include_dir=${os_include_dir}
;;
cygwin*)
os_include_dir="config/os/newlib"
--- 77,88 ----
*************** case "${target_os}" in
*** 96,122 ****
;;
linux* | gnu*)
os_include_dir="config/os/gnu-linux"
- ctype_include_dir=${os_include_dir}
;;
irix*)
os_include_dir="config/os/irix"
- ctype_include_dir=${os_include_dir}
;;
netbsd*)
os_include_dir="config/os/bsd/netbsd"
- ctype_include_dir=${os_include_dir}
;;
solaris2.5*)
os_include_dir="config/os/solaris/solaris2.5"
- ctype_include_dir=${os_include_dir}
;;
solaris2.6*)
os_include_dir="config/os/solaris/solaris2.6"
- ctype_include_dir=${os_include_dir}
;;
solaris2.7* | solaris2.8*)
os_include_dir="config/os/solaris/solaris2.7"
- ctype_include_dir=${os_include_dir}
;;
hpux)
os_include_dir="config/os/hpux"
--- 92,112 ----
*************** case "${target}" in
*** 141,147 ****
ATOMICITYH=$cpu_include_dir
;;
esac
!
# Okay, folks, show's over. Move along, move along.
--- 131,137 ----
ATOMICITYH=$cpu_include_dir
;;
esac
!
# Okay, folks, show's over. Move along, move along.
Index: configure.in
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/configure.in,v
retrieving revision 1.48
diff -c -p -r1.48 configure.in
*** configure.in 2001/01/23 19:18:29 1.48
--- configure.in 2001/01/23 20:50:59
*************** GLIBCPP_ENABLE_C_MBCHAR([yes])
*** 39,45 ****
GLIBCPP_ENABLE_LONG_LONG([no])
GLIBCPP_ENABLE_CHEADERS([c_std])
GLIBCPP_ENABLE_THREADS
- GLIBCPP_ENABLE_ATOMICITY
GLIBCPP_ENABLE_CXX_FLAGS([none])
if test -n "$with_cross_host"; then
--- 39,44 ----
*************** if test -n "$with_cross_host"; then
*** 144,151 ****
GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT
GLIBCPP_CHECK_WCHAR_T_SUPPORT
! # GLIBCPP_CHECK_CTYPE_SUPPORT
! ctype_include_dir="config/os/gnu-linux"
# GLIBCPP_CHECK_STDLIB_SUPPORT
AC_DEFINE(HAVE_STRTOF)
AC_DEFINE(HAVE_STRTOLD)
--- 143,149 ----
GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT
GLIBCPP_CHECK_WCHAR_T_SUPPORT
! os_include_dir="config/os/gnu-linux"
# GLIBCPP_CHECK_STDLIB_SUPPORT
AC_DEFINE(HAVE_STRTOF)
AC_DEFINE(HAVE_STRTOLD)
*************** if test -n "$with_cross_host"; then
*** 161,167 ****
AC_DEFINE(HAVE_ISINF)
AC_DEFINE(HAVE_ISINFF)
- ctype_include_dir="config/os/newlib"
os_include_dir="config/os/newlib"
AC_DEFINE(_GLIBCPP_BUGGY_FLOAT_COMPLEX)
--- 159,164 ----
*************** else
*** 190,208 ****
GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT
GLIBCPP_CHECK_WCHAR_T_SUPPORT
- GLIBCPP_CHECK_CTYPE_SUPPORT
GLIBCPP_CHECK_STDLIB_SUPPORT
AC_FUNC_MMAP
fi
# Now that ctype is determined for all possible targets, we can do this...
! AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, \
include/bits/ctype_base.h)
! AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
include/bits/ctype_inline.h)
! AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
include/bits/ctype_noninline.h)
AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes)
AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes)
--- 187,205 ----
GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT
GLIBCPP_CHECK_WCHAR_T_SUPPORT
GLIBCPP_CHECK_STDLIB_SUPPORT
AC_FUNC_MMAP
fi
# Now that ctype is determined for all possible targets, we can do this...
! AC_LINK_FILES($os_include_dir/bits/ctype_base.h, \
include/bits/ctype_base.h)
! AC_LINK_FILES($os_include_dir/bits/ctype_inline.h, \
include/bits/ctype_inline.h)
! AC_LINK_FILES($os_include_dir/bits/ctype_noninline.h, \
include/bits/ctype_noninline.h)
+ AC_LINK_FILES($ATOMICITYH/bits/atomicity.h, include/bits/atomicity.h)
AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes)
AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes)
Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/acinclude.m4,v
retrieving revision 1.121
diff -c -p -r1.121 acinclude.m4
*** acinclude.m4 2001/01/23 17:02:21 1.121
--- acinclude.m4 2001/01/23 20:51:03
*************** AC_DEFUN(GLIBCPP_CHECK_TARGET, [
*** 788,853 ****
dnl
- dnl Check to see what the underlying c library's interface to ctype looks
- dnl like. Bits of locale rely on things like isspace, toupper, etc. This
- dnl stuff makes sure the right bits from the clibrary get called.
- dnl
- dnl Depending on what is found, select various configure/*/bits/ctype_base.h
- dnl Depending on what is found, select various configure/*/ctype.cc
- dnl
- dnl GLIBCPP_CHECK_CTYPE_SUPPORT
- AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
- AC_CHECK_HEADER(ctype.h, [
-
- dnl If doesn't match any specified, go with defaults.
- if test x$ctype_include_dir != x; then
- ctype_default=no
- else
- ctype_default=yes
- fi
-
- dnl Test for <ctype> functionality -- newlib
- if test $ctype_default = "yes"; then
- AC_MSG_CHECKING([<ctype> for newlib])
- AC_TRY_COMPILE([#include <ctype.h>],
- [int
- foo (int a)
- { return _U + _L + _N + _S + _P + _C + _X + _B \
- + _ctype_[a];}], \
- ctype_newlib=yes, ctype_newlib=no)
- AC_MSG_RESULT($ctype_newlib)
- if test $ctype_newlib = "yes"; then
- ctype_include_dir="config/os/newlib"
- ctype_default=no
- fi
- fi
-
- dnl Test for <ctype> functionality -- DJGPP
- dnl FIXME: this test won't work if __dj_ENFORCE_FUNCTION_CALLS
- dnl is defined.
- if test $ctype_default = "yes"; then
- AC_MSG_CHECKING([<ctype> for DJGPP])
- AC_TRY_COMPILE([#include <ctype.h>],
- [int
- foo (int a)
- { return __dj_ctype_flags[0] + __dj_ctype_flags[1];}], \
- ctype_djgpp=yes, ctype_djgpp=no)
- AC_MSG_RESULT($ctype_djgpp)
- if test $ctype_djgpp = "yes"; then
- ctype_include_dir="config/os/djgpp"
- ctype_default=no
- fi
- fi
-
- if test $ctype_default = "yes"; then
- ctype_include_dir="config/os/generic"
- AC_MSG_WARN("Using default ctype headers.")
- fi
- ])
- ])
-
-
- dnl
dnl Check to see if this target can enable the wchar_t parts of libstdc++.
dnl If --disable-c-mbchar was given, no wchar_t stuff is enabled. (This
dnl must have been previously checked.)
--- 788,793 ----
*************** AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
*** 1296,1314 ****
if test $THREADH != threads-no.h; then
AC_DEFINE(_GLIBCPP_USE_THREADS)
fi
- ])
-
-
- dnl Enable atomic locking
- dnl GLIBCPP_ENABLE_ATOMICITY
- AC_DEFUN(GLIBCPP_ENABLE_ATOMICITY, [
- AC_MSG_CHECKING([for atomicity.h])
- # We have ATOMICITY already from GLIBCPP_CONFIGURE
- if test "$ATOMICITYH" = "config/cpu/generic"; then
- AC_MSG_WARN([No ATOMICITY settings found, using generic atomic ops.])
- fi
- AC_MSG_RESULT($ATOMICITYH/bits/atomicity.h)
- AC_LINK_FILES($ATOMICITYH/bits/atomicity.h, include/bits/atomicity.h)
])
--- 1236,1241 ----