OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.target: Just use os_include_dir always.

Browse Source 
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.

From-SVN: r39209
This commit is contained in:
Benjamin Kosnik 2001-01-23 20:58:23 +00:00 committed by Benjamin Kosnik
parent 80261b56ed
commit 3637cfac02
6 changed files with 729 additions and 999 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
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.
2001-01-23 Chris Demetriou <cgd@broadcom.com>
* configure.in: Place definition of MULTISUBDIR in

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

@ -787,66 +787,6 @@ AC_DEFUN(GLIBCPP_CHECK_TARGET, [
])
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
@ -1299,19 +1239,6 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
])
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)
])
dnl
dnl Check for template specializations for the 'long long' type extension.
dnl

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

@ -799,66 +799,6 @@ AC_DEFUN(GLIBCPP_CHECK_TARGET, [
])
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
@ -1311,19 +1251,6 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
])
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)
])
dnl
dnl Check for template specializations for the 'long long' type extension.
dnl

1547
libstdc++-v3/configure vendored
View File

File diff suppressed because it is too large Load Diff

13
libstdc++-v3/configure.in
View File

@ -39,7 +39,6 @@ GLIBCPP_ENABLE_C_MBCHAR([yes])
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
@ -144,8 +143,7 @@ if test -n "$with_cross_host"; then
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"
os_include_dir="config/os/gnu-linux"
# GLIBCPP_CHECK_STDLIB_SUPPORT
AC_DEFINE(HAVE_STRTOF)
AC_DEFINE(HAVE_STRTOLD)
@ -161,7 +159,6 @@ if test -n "$with_cross_host"; then
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)
@ -190,19 +187,19 @@ else
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, \
AC_LINK_FILES($os_include_dir/bits/ctype_base.h, \
include/bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
AC_LINK_FILES($os_include_dir/bits/ctype_inline.h, \
include/bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.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)

12
libstdc++-v3/configure.target
View File

@ -20,7 +20,6 @@
# 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.
@ -78,15 +77,12 @@ case "${target_os}" in
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"
@ -96,27 +92,21 @@ case "${target_os}" in
;;
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"
@ -141,7 +131,7 @@ case "${target}" in
ATOMICITYH=$cpu_include_dir
;;
esac
# Okay, folks, show's over. Move along, move along.