Skip to content

R
riscv-gcc-1
Commit e974e9cc by Benjamin Kosnik
Options

[multiple changes] 


2000-10-07  David Edelsohn  <dje@watson.ibm.com>

	* config/os/aix/bits/atomicity.h: New file.

2000-10-07  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>

	* acinclude.m4: Remove CPU_FLAGS
	* libio/Makefile.am: Here too.
	* Makefile.am: Here too.

	* src/Makefile.am (CONFIG_INCLUDES): Remove.
	(INCLUDES): Remove CONFIG_INCLUDES.
	(cpu_headers): Remove.
	(myinstallheaders): Remove cpu_headers.
	(generated_headers): Rename to build_headers.
	(build_headers): Add atomicity.h, ctype_base.h,
	ctype_specializations.h.

	* config/os: New directory.
	* config/aix: Move to...
	* config/bsd: Move to...
	* config/generic: Move to...
	* config/gnu-linux: Move to...
	* config/irix: Move to...
	* config/newlib: Move to...
	* config/solaris: Move to...
	* config/os/*: Here.

From-SVN: r36778
parent d5587eca
Showing with 278 additions and 235 deletions
libstdc++-v3/ChangeLog
2000-10-06 benjamin kosnik <bkoz@fillmore.constant.com>
2000-10-07 benjamin kosnik <bkoz@fillmore.constant.com>
* config/*/ctype.cc: Move to...
* config/os/*/bits/ctype_noninline.h: ..here.
* src/locale.cc: Change include to ctype_noninline.h.
* config/*/bits/ctype_specializations.h: Move to...
* config/os/*/bits/ctype_inline.h: ...here.
* include/bits/locale_facets.h: Change here.
* configure.in: Change config/ to config/os/
* configure: Regenerate.
* acinclude.m4 (GLIBCPP_CHECK_CTYPE): Change config/ to config/os/.
* aclocal.m4: Regenerate.
* mkcheck.in (SRC_DIR): Remove ctype_include_dir, cpu_include_dir.
2000-10-07 David Edelsohn <dje@watson.ibm.com>
* config/os/aix/bits/atomicity.h: New file.
2000-10-07 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* acinclude.m4: Remove CPU_FLAGS
* libio/Makefile.am: Here too.
* Makefile.am: Here too.
* src/Makefile.am (CONFIG_INCLUDES): Remove.
(INCLUDES): Remove CONFIG_INCLUDES.
(cpu_headers): Remove.
(myinstallheaders): Remove cpu_headers.
(generated_headers): Rename to build_headers.
(build_headers): Add atomicity.h, ctype_base.h,
ctype_specializations.h.
* config/os: New directory.
* config/aix: Move to...
* config/bsd: Move to...
* config/generic: Move to...
* config/gnu-linux: Move to...
* config/irix: Move to...
* config/newlib: Move to...
* config/solaris: Move to...
* config/os/*: Here.
2000-10-06 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* src/Makefile.am: Remove OPTIMIZE_CXXFLAGS, WARN_CXXFLAGS,
......
libstdc++-v3/Makefile.am
......@@ -48,7 +48,7 @@ WARN_CXXFLAGS = \
# or configure.in to see how they are set.
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
CONFIG_CXXFLAGS = \
@CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \
@EXTRA_CXX_FLAGS@ \
@SECTION_FLAGS@ @CSHADOWFLAGS@ @DEBUG_FLAGS@
......
libstdc++-v3/Makefile.in
......@@ -67,7 +67,6 @@ AR = @AR@
AS = @AS@
CC = @CC@
CPP = @CPP@
CPU_FLAGS = @CPU_FLAGS@
CSHADOWFLAGS = @CSHADOWFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
......@@ -94,17 +93,10 @@ RANLIB = @RANLIB@
SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@
STRIP = @STRIP@
THREADDEPS = @THREADDEPS@
THREADINCS = @THREADINCS@
THREADLIBS = @THREADLIBS@
THREADOBJS = @THREADOBJS@
THREADSPEC = @THREADSPEC@
USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
VERSION = @VERSION@
WERROR = @WERROR@
WFMT_FLAGS = @WFMT_FLAGS@
cpu_include_dir = @cpu_include_dir@
ctype_include_dir = @ctype_include_dir@
glibcpp_basedir = @glibcpp_basedir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
......@@ -133,7 +125,7 @@ WARN_CXXFLAGS = -Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) @WFMT
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set.
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
CONFIG_CXXFLAGS = @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOWFLAGS@ @DEBUG_FLAGS@
CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOWFLAGS@ @DEBUG_FLAGS@
# Multilib support.
......
libstdc++-v3/acinclude.m4
......@@ -684,18 +684,14 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
])
dnl Check to see what architecture we are compiling for. If it's
dnl supported, use special hand-crafted routines to provide thread
dnl primitives. Also, if architecture-specific flags are required for
dnl compilation, add them here.
dnl Check to see what architecture we are compiling for. Also, if
dnl architecture-specific flags are required for compilation, add them here.
dnl
dnl Depending on what is found, select configure/cpu/*/bits/atomicity.h
dnl If not found, select configure/cpu/generic/bits/atomicity.h
dnl
dnl GLIBCPP_CHECK_CPU
AC_DEFUN(GLIBCPP_CHECK_CPU, [
AC_MSG_CHECKING([for cpu primitives directory])
CPU_FLAGS=
AC_MSG_CHECKING([for cpu config directory])
# Currently unused, but could be useful.
# CPU_FLAGS=
case "${target_cpu}" in
alpha*)
cpu_include_dir="config/cpu/alpha"
......@@ -714,7 +710,6 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
;;
powerpc | rs6000)
cpu_include_dir="config/cpu/powerpc"
CPU_FLAGS='-mcpu=powerpc'
;;
sparc64 | ultrasparc)
cpu_include_dir="config/cpu/sparc/sparc64"
......@@ -727,11 +722,47 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
;;
esac
AC_MSG_RESULT($cpu_include_dir)
AC_SUBST(cpu_include_dir)
AC_SUBST(CPU_FLAGS)
])
dnl Check to see what OS we are compiling for. Also, if os-specific flags
dnl are required for compilation, add them here.
dnl
dnl GLIBCPP_CHECK_OS
AC_DEFUN(GLIBCPP_CHECK_OS, [
AC_MSG_CHECKING([for os config directory])
# Currently unused, but could be useful.
# OS_FLAGS=
case "${target_os}" in
aix*)
os_include_dir="config/os/aix"
;;
bsd* | freebsd*)
os_include_dir="config/os/bsd"
;;
linux*)
os_include_dir="config/os/gnu-linux"
;;
irix*)
os_include_dir="config/os/irix"
;;
solaris2.5*)
os_include_dir="config/os/solaris/solaris2.5"
;;
solaris2.6*)
os_include_dir="config/os/solaris/solaris2.6"
;;
solaris2.7* | solaris2.8*)
os_include_dir="config/os/solaris/solaris2.7"
;;
*)
os_include_dir="config/os/generic"
;;
esac
AC_MSG_RESULT($os_include_dir)
])
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
......@@ -758,7 +789,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_linux=yes, ctype_linux=no)
AC_MSG_RESULT($ctype_linux)
if test $ctype_linux = "yes"; then
ctype_include_dir="config/gnu-linux"
ctype_include_dir="config/os/gnu-linux"
ctype_default=no
fi
......@@ -773,7 +804,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_bsd=yes, ctype_bsd=no)
AC_MSG_RESULT($ctype_bsd)
if test $ctype_bsd = "yes"; then
ctype_include_dir="config/bsd"
ctype_include_dir="config/os/bsd"
ctype_default=no
fi
fi
......@@ -789,7 +820,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_freebsd34=yes, ctype_freebsd34=no)
AC_MSG_RESULT($ctype_freebsd34)
if test $ctype_freebsd34 = "yes"; then
ctype_include_dir="config/bsd"
ctype_include_dir="config/os/bsd"
ctype_default=no
fi
fi
......@@ -814,11 +845,11 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_solaris26=yes, ctype_solaris26=no)
AC_LANG_C
if test $ctype_solaris26 = "yes"; then
ctype_include_dir="config/solaris/solaris2.6"
ctype_include_dir="config/os/solaris/solaris2.6"
AC_MSG_RESULT([Solaris 2.6])
ctype_default=no
else
ctype_include_dir="config/solaris/solaris2.7"
ctype_include_dir="config/os/solaris/solaris2.7"
AC_MSG_RESULT([Solaris 7,8])
ctype_default=no
fi
......@@ -836,7 +867,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_solaris25=yes, ctype_solaris25=no)
AC_MSG_RESULT($ctype_solaris25)
if test $ctype_solaris25 = "yes"; then
ctype_include_dir="config/solaris/solaris2.5"
ctype_include_dir="config/os/solaris/solaris2.5"
ctype_default=no
fi
fi
......@@ -853,7 +884,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_aix=yes, ctype_aix=no)
AC_MSG_RESULT($ctype_aix)
if test $ctype_aix = "yes"; then
ctype_include_dir="config/aix"
ctype_include_dir="config/os/aix"
ctype_default=no
fi
fi
......@@ -875,10 +906,14 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
fi
if test $ctype_default = "yes"; then
ctype_include_dir="config/generic"
ctype_include_dir="config/os/generic"
AC_MSG_WARN("Using default ctype headers.")
fi
AC_SUBST(ctype_include_dir)
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
bits/ctype_noninline.h)
])
])
......@@ -1321,16 +1356,13 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
esac
dnl Check for thread package actually supported in libstdc++
THREADH=
case "$target_thread_file" in
no | none | single)
THREADS=none
THREADH=threads-no.h
;;
posix | pthreads)
THREADS=posix
case "$target" in
*-*-linux*)
;;
esac
THREADH=threads-posix.h
;;
decosf1 | irix | mach | os2 | solaris | win32 | dce | vxworks)
AC_MSG_ERROR(thread package $THREADS not yet supported)
......@@ -1339,38 +1371,33 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
AC_MSG_ERROR($THREADS is an unknown thread package)
;;
esac
AC_MSG_RESULT($THREADS)
AC_MSG_RESULT($THREADH)
THREADLIBS=
THREADINCS=
THREADDEPS=
THREADOBJS=
THREADH=
THREADSPEC=
case "$THREADS" in
posix)
AC_CHECK_HEADER(pthread.h, [have_pthread_h=yes], [have_pthread_h=])
THREADLIBS=-lpthread
THREADSPEC=-lpthread
dnl Not presently used
dnl THREADOBJS=threads-posix.lo
THREADH=threads-posix.h
;;
none)
dnl Not presently used
dnl THREADOBJS=threads-no.lo
THREADH=threads-no.h
;;
esac
AC_SUBST(THREADLIBS)
AC_SUBST(THREADINCS)
AC_SUBST(THREADDEPS)
AC_SUBST(THREADOBJS)
AC_SUBST(THREADSPEC)
AC_LINK_FILES(config/$THREADH, bits/c++threads.h)
])
dnl Enable atomic locking
dnl GLIBCPP_ENABLE_ATOMICITY
AC_DEFUN(GLIBCPP_ENABLE_ATOMICITY, [
AC_MSG_CHECKING([for atomicity.h])
case "$target" in
*-*-linux*)
ATOMICITYH=$cpu_include_dir
;;
*-*-aix*)
ATOMICITYH=$os_include_dir
;;
*)
echo "$enable_threads is an unknown thread package" 1>&2
exit 1
;;
esac
AC_MSG_RESULT($ATOMICITYH/bits/atomicity.h)
AC_LINK_FILES($ATOMICITYH/bits/atomicity.h, bits/atomicity.h)
])
dnl
dnl Check for template specializations for the 'long long' type extension.
dnl
......
libstdc++-v3/aclocal.m4
......@@ -696,18 +696,14 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
])
dnl Check to see what architecture we are compiling for. If it's
dnl supported, use special hand-crafted routines to provide thread
dnl primitives. Also, if architecture-specific flags are required for
dnl compilation, add them here.
dnl Check to see what architecture we are compiling for. Also, if
dnl architecture-specific flags are required for compilation, add them here.
dnl
dnl Depending on what is found, select configure/cpu/*/bits/atomicity.h
dnl If not found, select configure/cpu/generic/bits/atomicity.h
dnl
dnl GLIBCPP_CHECK_CPU
AC_DEFUN(GLIBCPP_CHECK_CPU, [
AC_MSG_CHECKING([for cpu primitives directory])
CPU_FLAGS=
AC_MSG_CHECKING([for cpu config directory])
# Currently unused, but could be useful.
# CPU_FLAGS=
case "${target_cpu}" in
alpha*)
cpu_include_dir="config/cpu/alpha"
......@@ -726,7 +722,6 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
;;
powerpc | rs6000)
cpu_include_dir="config/cpu/powerpc"
CPU_FLAGS='-mcpu=powerpc'
;;
sparc64 | ultrasparc)
cpu_include_dir="config/cpu/sparc/sparc64"
......@@ -739,11 +734,47 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
;;
esac
AC_MSG_RESULT($cpu_include_dir)
AC_SUBST(cpu_include_dir)
AC_SUBST(CPU_FLAGS)
])
dnl Check to see what OS we are compiling for. Also, if os-specific flags
dnl are required for compilation, add them here.
dnl
dnl GLIBCPP_CHECK_OS
AC_DEFUN(GLIBCPP_CHECK_OS, [
AC_MSG_CHECKING([for os config directory])
# Currently unused, but could be useful.
# OS_FLAGS=
case "${target_os}" in
aix*)
os_include_dir="config/os/aix"
;;
bsd* | freebsd*)
os_include_dir="config/os/bsd"
;;
linux*)
os_include_dir="config/os/gnu-linux"
;;
irix*)
os_include_dir="config/os/irix"
;;
solaris2.5*)
os_include_dir="config/os/solaris/solaris2.5"
;;
solaris2.6*)
os_include_dir="config/os/solaris/solaris2.6"
;;
solaris2.7* | solaris2.8*)
os_include_dir="config/os/solaris/solaris2.7"
;;
*)
os_include_dir="config/os/generic"
;;
esac
AC_MSG_RESULT($os_include_dir)
])
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
......@@ -770,7 +801,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_linux=yes, ctype_linux=no)
AC_MSG_RESULT($ctype_linux)
if test $ctype_linux = "yes"; then
ctype_include_dir="config/gnu-linux"
ctype_include_dir="config/os/gnu-linux"
ctype_default=no
fi
......@@ -785,7 +816,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_bsd=yes, ctype_bsd=no)
AC_MSG_RESULT($ctype_bsd)
if test $ctype_bsd = "yes"; then
ctype_include_dir="config/bsd"
ctype_include_dir="config/os/bsd"
ctype_default=no
fi
fi
......@@ -801,7 +832,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_freebsd34=yes, ctype_freebsd34=no)
AC_MSG_RESULT($ctype_freebsd34)
if test $ctype_freebsd34 = "yes"; then
ctype_include_dir="config/bsd"
ctype_include_dir="config/os/bsd"
ctype_default=no
fi
fi
......@@ -826,11 +857,11 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_solaris26=yes, ctype_solaris26=no)
AC_LANG_C
if test $ctype_solaris26 = "yes"; then
ctype_include_dir="config/solaris/solaris2.6"
ctype_include_dir="config/os/solaris/solaris2.6"
AC_MSG_RESULT([Solaris 2.6])
ctype_default=no
else
ctype_include_dir="config/solaris/solaris2.7"
ctype_include_dir="config/os/solaris/solaris2.7"
AC_MSG_RESULT([Solaris 7,8])
ctype_default=no
fi
......@@ -848,7 +879,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_solaris25=yes, ctype_solaris25=no)
AC_MSG_RESULT($ctype_solaris25)
if test $ctype_solaris25 = "yes"; then
ctype_include_dir="config/solaris/solaris2.5"
ctype_include_dir="config/os/solaris/solaris2.5"
ctype_default=no
fi
fi
......@@ -865,7 +896,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_aix=yes, ctype_aix=no)
AC_MSG_RESULT($ctype_aix)
if test $ctype_aix = "yes"; then
ctype_include_dir="config/aix"
ctype_include_dir="config/os/aix"
ctype_default=no
fi
fi
......@@ -887,10 +918,14 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
fi
if test $ctype_default = "yes"; then
ctype_include_dir="config/generic"
ctype_include_dir="config/os/generic"
AC_MSG_WARN("Using default ctype headers.")
fi
AC_SUBST(ctype_include_dir)
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
bits/ctype_noninline.h)
])
])
......@@ -1333,16 +1368,13 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
esac
dnl Check for thread package actually supported in libstdc++
THREADH=
case "$target_thread_file" in
no | none | single)
THREADS=none
THREADH=threads-no.h
;;
posix | pthreads)
THREADS=posix
case "$target" in
*-*-linux*)
;;
esac
THREADH=threads-posix.h
;;
decosf1 | irix | mach | os2 | solaris | win32 | dce | vxworks)
AC_MSG_ERROR(thread package $THREADS not yet supported)
......@@ -1351,38 +1383,33 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
AC_MSG_ERROR($THREADS is an unknown thread package)
;;
esac
AC_MSG_RESULT($THREADS)
AC_MSG_RESULT($THREADH)
THREADLIBS=
THREADINCS=
THREADDEPS=
THREADOBJS=
THREADH=
THREADSPEC=
case "$THREADS" in
posix)
AC_CHECK_HEADER(pthread.h, [have_pthread_h=yes], [have_pthread_h=])
THREADLIBS=-lpthread
THREADSPEC=-lpthread
dnl Not presently used
dnl THREADOBJS=threads-posix.lo
THREADH=threads-posix.h
;;
none)
dnl Not presently used
dnl THREADOBJS=threads-no.lo
THREADH=threads-no.h
;;
esac
AC_SUBST(THREADLIBS)
AC_SUBST(THREADINCS)
AC_SUBST(THREADDEPS)
AC_SUBST(THREADOBJS)
AC_SUBST(THREADSPEC)
AC_LINK_FILES(config/$THREADH, bits/c++threads.h)
])
dnl Enable atomic locking
dnl GLIBCPP_ENABLE_ATOMICITY
AC_DEFUN(GLIBCPP_ENABLE_ATOMICITY, [
AC_MSG_CHECKING([for atomicity.h])
case "$target" in
*-*-linux*)
ATOMICITYH=$cpu_include_dir
;;
*-*-aix*)
ATOMICITYH=$os_include_dir
;;
*)
echo "$enable_threads is an unknown thread package" 1>&2
exit 1
;;
esac
AC_MSG_RESULT($ATOMICITYH/bits/atomicity.h)
AC_LINK_FILES($ATOMICITYH/bits/atomicity.h, bits/atomicity.h)
])
dnl
dnl Check for template specializations for the 'long long' type extension.
dnl
......
libstdc++-v3/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
libstdc++-v3/configure.in
......@@ -27,6 +27,7 @@ AM_CONFIG_HEADER(config.h)
# Check for c++ or library specific bits that don't require linking.
GLIBCPP_CHECK_COMPILER_VERSION
GLIBCPP_CHECK_CPU
GLIBCPP_CHECK_OS
AC_CACHE_SAVE
......@@ -36,6 +37,7 @@ GLIBCPP_ENABLE_CSTDIO
GLIBCPP_ENABLE_LONG_LONG(yes)
GLIBCPP_ENABLE_SHADOW(no)
GLIBCPP_ENABLE_THREADS
GLIBCPP_ENABLE_ATOMICITY
#GLIBCPP_ENABLE_RELIBGCC([../..])
GLIBCPP_ENABLE_CXX_FLAGS([none])
......@@ -70,8 +72,13 @@ if test -n "$with_cross_host"; then
AC_DEFINE(HAVE__FPCLASS)
AC_DEFINE(HAVE_MODF)
ctype_include_dir="config/wince"
AC_SUBST(ctype_include_dir)
ctype_include_dir="config/os/wince"
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
bits/ctype_noninline.h)
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
......@@ -87,8 +94,12 @@ if test -n "$with_cross_host"; then
AC_DEFINE(HAVE_ISINF)
AC_DEFINE(HAVE_ISINFF)
ctype_include_dir="config/newlib"
AC_SUBST(ctype_include_dir)
ctype_include_dir="config/os/newlib"
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
bits/ctype_noninline.h)
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
......
libstdc++-v3/include/bits/locale_facets.h
......@@ -506,8 +506,8 @@ namespace std
use_facet< const ctype<wchar_t> >(const locale& __loc);
#endif //_GLIBCPP_USE_WCHAR_T
// Include host-specific ctype specializations.
#include <bits/ctype_specializations.h>
// Include host-specific ctype inlines.
#include <bits/ctype_inline.h>
// 22.2.1.2 Template class ctype_byname
template<typename _CharT>
......
libstdc++-v3/libio/ChangeLog
2000-10-07 Benjamin Kosnik <bkoz@gnu.org>
* Makefile.am (CONFIG_INCLUDES): Remove.
2000-10-06 Benjamin Kosnik <bkoz@gnu.org>
* Makefile.am (libio_la_DEPENDENCIES): Remove extaneous cruft.
......
libstdc++-v3/libio/Makefile.am
......@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = 1.3 cygnus
noinst_LTLIBRARIES = libio.la
# Root level of the include sources.
glibcpp_includedir = $(top_srcdir)/include
......@@ -36,37 +38,10 @@ else
LIBIO_INCLUDES =
endif
CONFIG_INCLUDES = \
-I$(top_srcdir)/@cpu_include_dir@ \
-I$(top_srcdir)/@ctype_include_dir@
INCLUDES = \
-nostdinc++ \
-I$(top_builddir) -I$(glibcpp_includedir) \
$(CONFIG_INCLUDES) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
noinst_LTLIBRARIES = libio.la
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set.
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
AC_CFLAGS = \
$(WERROR) @CPU_FLAGS@ @DEBUG_FLAGS@
# Need to manually set this option because AC_CXXFLAGS has to be at
# the end of the compile line so that -O2 can be overridden as the
# occasion call for it. (ie, --enable-debug)
AM_CFLAGS = \
-D_GNU_SOURCE $(AC_CFLAGS)
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) \
$(AM_CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
$(AM_CPPFLAGS) \$(CPPFLAGS) $(CFLAGS) $(AM_CFLAGS)
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(CFLAGS) $(AM_CFLAGS) $(LDFLAGS) -o $@
$(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
libio_headers = \
libio.h libioP.h iolibio.h
......@@ -74,7 +49,6 @@ libio_headers = \
if GLIBCPP_NEED_LIBIO
LIBIO_SRCS = \
filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c
# filedoalloc.c genops.c fileops.c stdfiles.c cleanup.c c_codecvt.c
else
LIBIO_SRCS =
endif
......@@ -93,14 +67,9 @@ else
LIBIO_XTRASRCS =
endif
EXTRA_DIST = iostreamP.h
libio_la_SOURCES = $(LIBIO_SRCS) $(LIBIO_WSRCS) $(LIBIO_XTRASRCS)
AM_CFLAGS = -D_GNU_SOURCE @DEBUG_FLAGS@
libstdc++-v3/libio/Makefile.in
......@@ -67,7 +67,6 @@ AR = @AR@
AS = @AS@
CC = @CC@
CPP = @CPP@
CPU_FLAGS = @CPU_FLAGS@
CSHADOWFLAGS = @CSHADOWFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
......@@ -94,23 +93,18 @@ RANLIB = @RANLIB@
SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@
STRIP = @STRIP@
THREADDEPS = @THREADDEPS@
THREADINCS = @THREADINCS@
THREADLIBS = @THREADLIBS@
THREADOBJS = @THREADOBJS@
THREADSPEC = @THREADSPEC@
USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
VERSION = @VERSION@
WERROR = @WERROR@
WFMT_FLAGS = @WFMT_FLAGS@
cpu_include_dir = @cpu_include_dir@
ctype_include_dir = @ctype_include_dir@
glibcpp_basedir = @glibcpp_basedir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
AUTOMAKE_OPTIONS = 1.3 cygnus
noinst_LTLIBRARIES = libio.la
# Root level of the include sources.
glibcpp_includedir = $(top_srcdir)/include
......@@ -119,37 +113,11 @@ TOPLEVEL_INCLUDES = -I$(includedir)
@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_INCLUDES = -I$(top_builddir)/libio -I$(top_srcdir)/libio
@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES =
CONFIG_INCLUDES = -I$(top_srcdir)/@cpu_include_dir@ -I$(top_srcdir)/@ctype_include_dir@
INCLUDES = -nostdinc++ -I$(top_builddir) -I$(glibcpp_includedir) $(CONFIG_INCLUDES) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
noinst_LTLIBRARIES = libio.la
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set.
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
AC_CFLAGS = $(WERROR) @CPU_FLAGS@ @DEBUG_FLAGS@
# Need to manually set this option because AC_CXXFLAGS has to be at
# the end of the compile line so that -O2 can be overridden as the
# occasion call for it. (ie, --enable-debug)
AM_CFLAGS = -D_GNU_SOURCE $(AC_CFLAGS)
INCLUDES = -nostdinc++ -I$(top_builddir) -I$(glibcpp_includedir) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(AM_CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) \$(CPPFLAGS) $(CFLAGS) $(AM_CFLAGS)
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(CFLAGS) $(AM_CFLAGS) $(LDFLAGS) -o $@
libio_headers = libio.h libioP.h iolibio.h
# filedoalloc.c genops.c fileops.c stdfiles.c cleanup.c c_codecvt.c
@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c
@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS =
@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = wfiledoalloc.c wfileops.c wgenops.c
......@@ -160,6 +128,8 @@ libio_headers = libio.h libioP.h iolibio.h
EXTRA_DIST = iostreamP.h
libio_la_SOURCES = $(LIBIO_SRCS) $(LIBIO_WSRCS) $(LIBIO_XTRASRCS)
AM_CFLAGS = -D_GNU_SOURCE @DEBUG_FLAGS@
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
......@@ -229,7 +199,10 @@ libio_la_LIBADD =
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_XTRA_LIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@iofopen.lo \
@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_XTRA_LIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@stdio.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
DIST_COMMON = ChangeLog Makefile.am Makefile.in
......@@ -428,6 +401,16 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
#COMPILE = \
# $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) \
# $(AM_CFLAGS)
#LTCOMPILE = \
# $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \
# $(AM_CPPFLAGS) \$(CPPFLAGS) $(CFLAGS) $(AM_CFLAGS)
#LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(CFLAGS) $(AM_CFLAGS) $(LDFLAGS) -o $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
libstdc++-v3/libmath/Makefile.in
......@@ -67,7 +67,6 @@ AR = @AR@
AS = @AS@
CC = @CC@
CPP = @CPP@
CPU_FLAGS = @CPU_FLAGS@
CSHADOWFLAGS = @CSHADOWFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
......@@ -94,17 +93,10 @@ RANLIB = @RANLIB@
SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@
STRIP = @STRIP@
THREADDEPS = @THREADDEPS@
THREADINCS = @THREADINCS@
THREADLIBS = @THREADLIBS@
THREADOBJS = @THREADOBJS@
THREADSPEC = @THREADSPEC@
USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
VERSION = @VERSION@
WERROR = @WERROR@
WFMT_FLAGS = @WFMT_FLAGS@
cpu_include_dir = @cpu_include_dir@
ctype_include_dir = @ctype_include_dir@
glibcpp_basedir = @glibcpp_basedir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
......
libstdc++-v3/libsupc++/Makefile.in
......@@ -67,7 +67,6 @@ AR = @AR@
AS = @AS@
CC = @CC@
CPP = @CPP@
CPU_FLAGS = @CPU_FLAGS@
CSHADOWFLAGS = @CSHADOWFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
......@@ -93,17 +92,10 @@ RANLIB = @RANLIB@
SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@
STRIP = @STRIP@
THREADDEPS = @THREADDEPS@
THREADINCS = @THREADINCS@
THREADLIBS = @THREADLIBS@
THREADOBJS = @THREADOBJS@
THREADSPEC = @THREADSPEC@
USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
VERSION = @VERSION@
WERROR = @WERROR@
WFMT_FLAGS = @WFMT_FLAGS@
cpu_include_dir = @cpu_include_dir@
ctype_include_dir = @ctype_include_dir@
glibcpp_basedir = @glibcpp_basedir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
......
libstdc++-v3/mkcheck.in
......@@ -56,7 +56,6 @@ fi
# INC_PATH == include path to new headers for use on gcc command-line
if [ $WHICH != "1" ]; then
INC_PATH="@CSHADOWFLAGS@ -I$BUILD_DIR -I$BUILD_DIR/libio \
-I$SRC_DIR/@ctype_include_dir@ -I$SRC_DIR/@cpu_include_dir@ \
-I$SRC_DIR/include/std -I$SRC_DIR/include -I$SRC_DIR/libio \
-I$SRC_DIR/testsuite"
elif [ $WHICH -eq 1 ]; then
......
libstdc++-v3/src/Makefile.am
......@@ -21,7 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA.
## $Id: Makefile.am,v 1.34 2000/10/06 23:31:22 bkoz Exp $
## $Id: Makefile.am,v 1.35 2000/10/07 01:05:37 bkoz Exp $
AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1
......@@ -92,21 +92,16 @@ else
CSHADOW_INCLUDES =
endif
CONFIG_INCLUDES = \
-I$(top_srcdir)/@cpu_include_dir@ \
-I$(top_srcdir)/@ctype_include_dir@
INCLUDES = \
-D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) \
-I$(top_builddir) -I$(glibcpp_includedir) \
$(CONFIG_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \
$(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \
$(TOPLEVEL_INCLUDES)
headers = \
bits/cpp_type_traits.h \
bits/std_cctype.h bits/ctype_base.h bits/ctype_specializations.h \
bits/char_traits.h bits/codecvt.h \
bits/std_cctype.h \
bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h \
bits/basic_string.h bits/std_string.h bits/string.tcc \
bits/generic_shadow.h bits/std_utility.h \
bits/std_complex.h \
......@@ -196,13 +191,12 @@ else
libio_headers =
endif
generated_headers = \
$(top_builddir)/bits/std_limits.h $(top_builddir)/bits/c++config.h \
$(top_builddir)/bits/c++io.h $(top_builddir)/bits/c++threads.h
cpu_headers = \
$(top_srcdir)/@cpu_include_dir@/bits/atomicity.h
build_headers = \
$(top_builddir)/bits/std_limits.h $(top_builddir)/bits/c++config.h \
$(top_builddir)/bits/c++io.h $(top_builddir)/bits/c++threads.h \
$(top_builddir)/bits/atomicity.h $(top_builddir)/bits/ctype_base.h \
$(top_builddir)/bits/ctype_noninline.h \
$(top_builddir)/bits/ctype_inline.h
sources = \
limitsMEMBERS.cc \
......@@ -218,7 +212,6 @@ wstring_sources = \
VPATH += $(top_srcdir) $(top_srcdir)/src
VPATH += $(glibcpp_includedir) $(top_srcdir)/std
VPATH += $(top_srcdir)/@ctype_include_dir@
# Actual sources for the distro, but don't build these.
......@@ -271,7 +264,7 @@ myinstallheaders: $(headers:%=$(myincludep)%)
echo "$(INSTALL_DATA) $(glibcpp_includedir)/std/$$i $(myincludep)"; \
$(INSTALL_DATA) $(glibcpp_includedir)/std/$$i $(myincludep); \
done; \
for i in $(generated_headers); do \
for i in $(build_headers); do \
echo "$(INSTALL_DATA) $$i $(myincludep)bits/"; \
$(INSTALL_DATA) $$i $(myincludep)bits/; \
done; \
......@@ -280,8 +273,6 @@ myinstallheaders: $(headers:%=$(myincludep)%)
echo "$(INSTALL_DATA) $$i $(myincludep)"; \
$(INSTALL_DATA) $$i $(myincludep); \
done; \
echo "$(INSTALL_DATA) $(cpu_headers) $(myincludep)bits/"; \
$(INSTALL_DATA) $(cpu_headers) $(myincludep)bits/; \
fi;
$(headers:%=$(myincludep)%): $(myincludep)%: %
......@@ -293,9 +284,9 @@ $(headers:%=$(myincludep)%): $(myincludep)%: %
# All the (now removed) machinations with string instantiations messes up the
# automake-generated TAGS rule. Make a simple one here.
TAGS: $(generated_headers) $(cpu_headers)
TAGS: $(build_headers) $(cpu_headers)
etags -C $(top_srcdir)/bits/*.h $(top_srcdir)/bits/*.tcc \
$(generated_headers) $(cpu_headers) $(libio_headers) \
$(build_headers) $(libio_headers) \
$(top_srcdir)/src/*.cc \
$(top_builddir)/src/limitsMEMBERS.cc $(top_builddir)/src/c++io.cc \
-o $(top_builddir)/TAGS
......@@ -319,6 +310,8 @@ wstring-inst.o: string-inst.cc
wstring-inst.lo: string-inst.cc
$(LTCXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@
# Alexandre put this in here for some libtool-related reason.
all: libstdc++.INC
libstdc++.INC: Makefile
$(MAKE) \
......@@ -333,3 +326,12 @@ tmp-libstdc++.INC: Makefile
libstdc++-v3/src/locale.cc
......@@ -777,7 +777,7 @@ namespace std {
~_Bad_use_facet() throw() { }
// Platform-specific initialization code for ctype tables.
#include <ctype.cc>
#include <bits/ctype_noninline.h>
locale::id ctype<char>::id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment