acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
dnl
|
|
|
|
dnl GLIBCXX_CONDITIONAL (NAME, SHELL-TEST)
|
|
|
|
dnl
|
|
|
|
dnl Exactly like AM_CONDITIONAL, but delays evaluation of the test until the
|
|
|
|
dnl end of configure. This lets tested variables be reassigned, and the
|
|
|
|
dnl conditional will depend on the final state of the variable. For a simple
|
|
|
|
dnl example of why this is needed, see GLIBCXX_ENABLE_HOSTED.
|
|
|
|
dnl
|
|
|
|
m4_define([_m4_divert(glibcxx_diversion)], 8000)dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CONDITIONAL], [dnl
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
m4_divert_text([glibcxx_diversion],dnl
|
|
|
|
AM_CONDITIONAL([$1],[$2])
|
|
|
|
)dnl
|
|
|
|
])dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_EVALUATE_CONDITIONALS], [m4_undivert([glibcxx_diversion])])dnl
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
|
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl
|
|
|
|
dnl Check to see what architecture and operating system we are compiling
|
|
|
|
dnl for. Also, if architecture- or OS-specific flags are required for
|
|
|
|
dnl compilation, pick them up here.
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_HOST], [
|
2003-08-05 10:00:18 +08:00
|
|
|
. $glibcxx_srcdir/configure.host
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_MSG_NOTICE([CPU config directory is $cpu_include_dir])
|
|
|
|
AC_MSG_NOTICE([OS config directory is $os_include_dir])
|
2003-08-05 10:00:18 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Initialize the rest of the library configury. At this point we have
|
|
|
|
dnl variables like $host.
|
2002-06-26 11:53:45 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Sets:
|
2003-08-27 08:38:28 +08:00
|
|
|
dnl SUBDIRS
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Substs:
|
|
|
|
dnl glibcxx_builddir (absolute path)
|
|
|
|
dnl glibcxx_srcdir (absolute path)
|
Move gthr to toplevel libgcc
gcc:
* gthr-single.h, gthr.h: Move to ../libgcc.
* gthr-aix.h: Move to ../libgcc/config/rs6000.
* gthr-dce.h: Move to ../libgcc/config/pa.
* gthr-lynx.h: Move to ../libgcc/config.
* gthr-mipssde.h: Move to ../libgcc/config/mips.
* gthr-posix.h: Move to ../libgcc/config.
* gthr-rtems.h: Likewise.
* gthr-tpf.h: Move to ../libgcc/config/s390.
* gthr-vxworks.h: Move to ../libgcc/config.
* gthr-win32.h: Move to ../libgcc/config/i386.
* configure.ac (gthread_flags): Remove
(gthr-default.h): Don't create.
(thread_file): Don't substitute.
* configure: Regenerate.
* Makefile.in (GCC_THREAD_FILE): Remove.
(GTHREAD_FLAGS): Remove.
(libgcc.mvars): Remove GTHREAD_FLAGS.
* config/t-vxworks (EXTRA_HEADERS): Remove.
gcc/po:
* EXCLUDES (gthr-aix.h, gthr-dce.h, gthr-posix.c, gthr-posix.h)
(gthr-rtems.h, gthr-single.h, gthr-solaris.h, gthr-vxworks.h)
(gthr-win32.h, gthr.h): Remove.
libgcc:
* gthr-single.h, gthr.h: New files.
* config/gthr-lynx.h, config/gthr-posix.h., config/gthr-rtems.h,
config/gthr-vxworks.h, config/i386/gthr-win32.h,
config/mips/gthr-mipssde.h, config/pa/gthr-dce.h,
config/rs6000/gthr-aix.h, config/s390/gthr-tpf.h: New files.
* config/i386/gthr-win32.c: Include "gthr-win32.h".
* configure.ac (thread_header): New variable.
Set it depending on target_thread_file.
(gthr-default.h): Link from $thread_header.
* configure: Regenerate.
* Makefile.in (LIBGCC2_CFLAGS): Remove $(GTHREAD_FLAGS).
libgfortran:
* Makefile.am (AM_CPPFLAGS): Add
-I$(srcdir)/$(MULTISRCTOP)../libgcc, -I$(MULTIBUILDTOP)../libgcc.
* Makefile.in: Regenerate.
* acinclude.m4 (LIBGFOR_CHECK_GTHR_DEFAULT): Remove.
* configure.ac (LIBGFOR_CHECK_GTHR_DEFAULT): Likewise.
* configure: Regenerate.
* config.h.in: Regenerate.
libobjc:
* Makefile.in (INCLUDES): Add -I$(MULTIBUILDTOP)../libgcc.
* configure.ac (target_thread_file, HAVE_GTHR_DEFAULT): Remove.
* configure: Regenerate.
* config.h.in: Regenerate.
libstdc++-v3:
* acinclude.m4 (GLIBCXX_CONFIGURE): Determine and substitute
toplevel_builddir.
(GLIBCXX_ENABLE_THREADS): Remove glibcxx_thread_h,
HAVE_GTHR_DEFAULT, enable_thread.
(GLIBCXX_CHECK_GTHREADS): Reflect gthr move to libgcc.
* include/Makefile.am (thread_host_headers): Remove
${host_builddir}/gthr-tpf.h.
(${host_builddir}/gthr.h): Reflect gthr move to libgcc.
Use $<.
(${host_builddir}/gthr-single.h): Likewise.
(${host_builddir}/gthr-posix.h): Likewise.
(${host_builddir}/gthr-tpf.h): Remove.
(${host_builddir}/gthr-default.h): Likewise.
* configure, config.h.in: Regenerate.
* Makefile.in, doc/Makefile.in, include/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, python/Makefile.in,
src/Makefile.intestsuite/Makefile.in: Regenerate.
From-SVN: r180776
2011-11-02 23:28:43 +08:00
|
|
|
dnl toplevel_builddir (absolute path)
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl toplevel_srcdir (absolute path)
|
|
|
|
dnl with_cross_host
|
|
|
|
dnl with_newlib
|
|
|
|
dnl with_target_subdir
|
|
|
|
dnl plus
|
|
|
|
dnl - the variables in GLIBCXX_CHECK_HOST / configure.host
|
|
|
|
dnl - default settings for all AM_CONFITIONAL test variables
|
|
|
|
dnl - lots of tools, like CC and CXX
|
2002-06-26 11:53:45 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CONFIGURE], [
|
2003-08-27 08:38:28 +08:00
|
|
|
# Keep these sync'd with the list in Makefile.am. The first provides an
|
|
|
|
# expandable list at autoconf time; the second provides an expandable list
|
|
|
|
# (i.e., shell variable) at configure time.
|
2018-07-25 19:01:39 +08:00
|
|
|
m4_define([glibcxx_SUBDIRS],[include libsupc++ src src/c++98 src/c++11 src/c++17 src/filesystem doc po testsuite python])
|
2003-08-27 08:38:28 +08:00
|
|
|
SUBDIRS='glibcxx_SUBDIRS'
|
|
|
|
|
2002-03-19 05:41:02 +08:00
|
|
|
# These need to be absolute paths, yet at the same time need to
|
|
|
|
# canonicalize only relative paths, because then amd will not unmount
|
|
|
|
# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
|
2003-07-05 12:05:45 +08:00
|
|
|
glibcxx_builddir=`${PWDCMD-pwd}`
|
2002-03-19 05:41:02 +08:00
|
|
|
case $srcdir in
|
2003-08-05 10:00:18 +08:00
|
|
|
[\\/$]* | ?:[\\/]*) glibcxx_srcdir=${srcdir} ;;
|
|
|
|
*) glibcxx_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
|
2002-03-19 05:41:02 +08:00
|
|
|
esac
|
Move gthr to toplevel libgcc
gcc:
* gthr-single.h, gthr.h: Move to ../libgcc.
* gthr-aix.h: Move to ../libgcc/config/rs6000.
* gthr-dce.h: Move to ../libgcc/config/pa.
* gthr-lynx.h: Move to ../libgcc/config.
* gthr-mipssde.h: Move to ../libgcc/config/mips.
* gthr-posix.h: Move to ../libgcc/config.
* gthr-rtems.h: Likewise.
* gthr-tpf.h: Move to ../libgcc/config/s390.
* gthr-vxworks.h: Move to ../libgcc/config.
* gthr-win32.h: Move to ../libgcc/config/i386.
* configure.ac (gthread_flags): Remove
(gthr-default.h): Don't create.
(thread_file): Don't substitute.
* configure: Regenerate.
* Makefile.in (GCC_THREAD_FILE): Remove.
(GTHREAD_FLAGS): Remove.
(libgcc.mvars): Remove GTHREAD_FLAGS.
* config/t-vxworks (EXTRA_HEADERS): Remove.
gcc/po:
* EXCLUDES (gthr-aix.h, gthr-dce.h, gthr-posix.c, gthr-posix.h)
(gthr-rtems.h, gthr-single.h, gthr-solaris.h, gthr-vxworks.h)
(gthr-win32.h, gthr.h): Remove.
libgcc:
* gthr-single.h, gthr.h: New files.
* config/gthr-lynx.h, config/gthr-posix.h., config/gthr-rtems.h,
config/gthr-vxworks.h, config/i386/gthr-win32.h,
config/mips/gthr-mipssde.h, config/pa/gthr-dce.h,
config/rs6000/gthr-aix.h, config/s390/gthr-tpf.h: New files.
* config/i386/gthr-win32.c: Include "gthr-win32.h".
* configure.ac (thread_header): New variable.
Set it depending on target_thread_file.
(gthr-default.h): Link from $thread_header.
* configure: Regenerate.
* Makefile.in (LIBGCC2_CFLAGS): Remove $(GTHREAD_FLAGS).
libgfortran:
* Makefile.am (AM_CPPFLAGS): Add
-I$(srcdir)/$(MULTISRCTOP)../libgcc, -I$(MULTIBUILDTOP)../libgcc.
* Makefile.in: Regenerate.
* acinclude.m4 (LIBGFOR_CHECK_GTHR_DEFAULT): Remove.
* configure.ac (LIBGFOR_CHECK_GTHR_DEFAULT): Likewise.
* configure: Regenerate.
* config.h.in: Regenerate.
libobjc:
* Makefile.in (INCLUDES): Add -I$(MULTIBUILDTOP)../libgcc.
* configure.ac (target_thread_file, HAVE_GTHR_DEFAULT): Remove.
* configure: Regenerate.
* config.h.in: Regenerate.
libstdc++-v3:
* acinclude.m4 (GLIBCXX_CONFIGURE): Determine and substitute
toplevel_builddir.
(GLIBCXX_ENABLE_THREADS): Remove glibcxx_thread_h,
HAVE_GTHR_DEFAULT, enable_thread.
(GLIBCXX_CHECK_GTHREADS): Reflect gthr move to libgcc.
* include/Makefile.am (thread_host_headers): Remove
${host_builddir}/gthr-tpf.h.
(${host_builddir}/gthr.h): Reflect gthr move to libgcc.
Use $<.
(${host_builddir}/gthr-single.h): Likewise.
(${host_builddir}/gthr-posix.h): Likewise.
(${host_builddir}/gthr-tpf.h): Remove.
(${host_builddir}/gthr-default.h): Likewise.
* configure, config.h.in: Regenerate.
* Makefile.in, doc/Makefile.in, include/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, python/Makefile.in,
src/Makefile.intestsuite/Makefile.in: Regenerate.
From-SVN: r180776
2011-11-02 23:28:43 +08:00
|
|
|
toplevel_builddir=${glibcxx_builddir}/..
|
2003-08-05 10:00:18 +08:00
|
|
|
toplevel_srcdir=${glibcxx_srcdir}/..
|
2003-07-05 12:05:45 +08:00
|
|
|
AC_SUBST(glibcxx_builddir)
|
|
|
|
AC_SUBST(glibcxx_srcdir)
|
Move gthr to toplevel libgcc
gcc:
* gthr-single.h, gthr.h: Move to ../libgcc.
* gthr-aix.h: Move to ../libgcc/config/rs6000.
* gthr-dce.h: Move to ../libgcc/config/pa.
* gthr-lynx.h: Move to ../libgcc/config.
* gthr-mipssde.h: Move to ../libgcc/config/mips.
* gthr-posix.h: Move to ../libgcc/config.
* gthr-rtems.h: Likewise.
* gthr-tpf.h: Move to ../libgcc/config/s390.
* gthr-vxworks.h: Move to ../libgcc/config.
* gthr-win32.h: Move to ../libgcc/config/i386.
* configure.ac (gthread_flags): Remove
(gthr-default.h): Don't create.
(thread_file): Don't substitute.
* configure: Regenerate.
* Makefile.in (GCC_THREAD_FILE): Remove.
(GTHREAD_FLAGS): Remove.
(libgcc.mvars): Remove GTHREAD_FLAGS.
* config/t-vxworks (EXTRA_HEADERS): Remove.
gcc/po:
* EXCLUDES (gthr-aix.h, gthr-dce.h, gthr-posix.c, gthr-posix.h)
(gthr-rtems.h, gthr-single.h, gthr-solaris.h, gthr-vxworks.h)
(gthr-win32.h, gthr.h): Remove.
libgcc:
* gthr-single.h, gthr.h: New files.
* config/gthr-lynx.h, config/gthr-posix.h., config/gthr-rtems.h,
config/gthr-vxworks.h, config/i386/gthr-win32.h,
config/mips/gthr-mipssde.h, config/pa/gthr-dce.h,
config/rs6000/gthr-aix.h, config/s390/gthr-tpf.h: New files.
* config/i386/gthr-win32.c: Include "gthr-win32.h".
* configure.ac (thread_header): New variable.
Set it depending on target_thread_file.
(gthr-default.h): Link from $thread_header.
* configure: Regenerate.
* Makefile.in (LIBGCC2_CFLAGS): Remove $(GTHREAD_FLAGS).
libgfortran:
* Makefile.am (AM_CPPFLAGS): Add
-I$(srcdir)/$(MULTISRCTOP)../libgcc, -I$(MULTIBUILDTOP)../libgcc.
* Makefile.in: Regenerate.
* acinclude.m4 (LIBGFOR_CHECK_GTHR_DEFAULT): Remove.
* configure.ac (LIBGFOR_CHECK_GTHR_DEFAULT): Likewise.
* configure: Regenerate.
* config.h.in: Regenerate.
libobjc:
* Makefile.in (INCLUDES): Add -I$(MULTIBUILDTOP)../libgcc.
* configure.ac (target_thread_file, HAVE_GTHR_DEFAULT): Remove.
* configure: Regenerate.
* config.h.in: Regenerate.
libstdc++-v3:
* acinclude.m4 (GLIBCXX_CONFIGURE): Determine and substitute
toplevel_builddir.
(GLIBCXX_ENABLE_THREADS): Remove glibcxx_thread_h,
HAVE_GTHR_DEFAULT, enable_thread.
(GLIBCXX_CHECK_GTHREADS): Reflect gthr move to libgcc.
* include/Makefile.am (thread_host_headers): Remove
${host_builddir}/gthr-tpf.h.
(${host_builddir}/gthr.h): Reflect gthr move to libgcc.
Use $<.
(${host_builddir}/gthr-single.h): Likewise.
(${host_builddir}/gthr-posix.h): Likewise.
(${host_builddir}/gthr-tpf.h): Remove.
(${host_builddir}/gthr-default.h): Likewise.
* configure, config.h.in: Regenerate.
* Makefile.in, doc/Makefile.in, include/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, python/Makefile.in,
src/Makefile.intestsuite/Makefile.in: Regenerate.
From-SVN: r180776
2011-11-02 23:28:43 +08:00
|
|
|
AC_SUBST(toplevel_builddir)
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_SUBST(toplevel_srcdir)
|
2002-03-19 05:41:02 +08:00
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
# We use these options to decide which functions to include. They are
|
|
|
|
# set from the top level.
|
|
|
|
AC_ARG_WITH([target-subdir],
|
|
|
|
AC_HELP_STRING([--with-target-subdir=SUBDIR],
|
2011-03-08 08:04:05 +08:00
|
|
|
[configuring in a subdirectory]))
|
2003-08-05 10:00:18 +08:00
|
|
|
|
|
|
|
AC_ARG_WITH([cross-host],
|
|
|
|
AC_HELP_STRING([--with-cross-host=HOST],
|
2011-03-08 08:04:05 +08:00
|
|
|
[configuring with a cross compiler]))
|
2003-08-05 10:00:18 +08:00
|
|
|
|
|
|
|
AC_ARG_WITH([newlib],
|
|
|
|
AC_HELP_STRING([--with-newlib],
|
2011-03-08 08:04:05 +08:00
|
|
|
[assume newlib as a system C library]))
|
2003-08-05 10:00:18 +08:00
|
|
|
|
|
|
|
# Will set LN_S to either 'ln -s', 'ln', or 'cp -p' (if linking isn't
|
|
|
|
# available). Uncomment the next line to force a particular method.
|
|
|
|
AC_PROG_LN_S
|
|
|
|
#LN_S='cp -p'
|
|
|
|
|
2000-07-26 14:51:38 +08:00
|
|
|
AC_CHECK_TOOL(AS, as)
|
|
|
|
AC_CHECK_TOOL(AR, ar)
|
2001-04-12 02:52:31 +08:00
|
|
|
AC_CHECK_TOOL(RANLIB, ranlib, ranlib-not-found-in-path-error)
|
2000-04-22 04:33:34 +08:00
|
|
|
|
2000-07-26 14:51:38 +08:00
|
|
|
AM_MAINTAINER_MODE
|
2000-04-22 04:33:34 +08:00
|
|
|
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
# Set up safe default values for all subsequent AM_CONDITIONAL tests
|
|
|
|
# which are themselves conditionally expanded.
|
|
|
|
## (Right now, this only matters for enable_wchar_t, but nothing prevents
|
|
|
|
## other macros from doing the same. This should be automated.) -pme
|
2003-06-09 22:54:08 +08:00
|
|
|
|
2011-11-01 08:02:45 +08:00
|
|
|
# Check for C library flavor since GNU/Linux platforms use different
|
|
|
|
# configuration directories depending on the C library in use.
|
2006-02-17 07:29:10 +08:00
|
|
|
AC_EGREP_CPP([_using_uclibc], [
|
|
|
|
#include <stdio.h>
|
|
|
|
#if __UCLIBC__
|
|
|
|
_using_uclibc
|
|
|
|
#endif
|
|
|
|
], uclibc=yes, uclibc=no)
|
|
|
|
|
2010-06-01 17:54:08 +08:00
|
|
|
AC_EGREP_CPP([_using_bionic], [
|
|
|
|
#include <stdio.h>
|
|
|
|
#if __BIONIC__
|
|
|
|
_using_bionic
|
|
|
|
#endif
|
|
|
|
], bionic=yes, bionic=no)
|
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
# Find platform-specific directories containing configuration info.
|
|
|
|
# Also possibly modify flags used elsewhere, as needed by the platform.
|
2003-07-05 12:05:45 +08:00
|
|
|
GLIBCXX_CHECK_HOST
|
2000-04-22 04:33:34 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-06-19 11:14:40 +08:00
|
|
|
dnl
|
2001-06-12 03:35:32 +08:00
|
|
|
dnl Tests for newer compiler features, or features that are present in newer
|
|
|
|
dnl compiler versions but not older compiler versions still in use, should
|
|
|
|
dnl be placed here.
|
2000-04-22 04:33:34 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Defines:
|
|
|
|
dnl WERROR='-Werror' if requested and possible; g++'s that lack the
|
|
|
|
dnl new inlining code or the new system_header pragma will die on -Werror.
|
|
|
|
dnl Leave it out by default and use maint-mode to use it.
|
|
|
|
dnl SECTION_FLAGS='-ffunction-sections -fdata-sections' if
|
|
|
|
dnl compiler supports it and the user has not requested debug mode.
|
2001-03-25 08:16:58 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_COMPILER_FEATURES], [
|
2000-05-25 02:35:37 +08:00
|
|
|
# All these tests are for C++; save the language and the compiler flags.
|
2001-06-12 03:35:32 +08:00
|
|
|
# The CXXFLAGS thing is suspicious, but based on similar bits previously
|
2003-07-05 12:05:45 +08:00
|
|
|
# found in GLIBCXX_CONFIGURE.
|
2000-05-25 02:35:37 +08:00
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_test_CXXFLAGS="${CXXFLAGS+set}"
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
|
2000-06-19 11:14:40 +08:00
|
|
|
# Check for -ffunction-sections -fdata-sections
|
|
|
|
AC_MSG_CHECKING([for g++ that supports -ffunction-sections -fdata-sections])
|
2007-05-17 23:08:48 +08:00
|
|
|
CXXFLAGS='-g -Werror -ffunction-sections -fdata-sections'
|
|
|
|
AC_TRY_COMPILE([int foo; void bar() { };],, [ac_fdsections=yes], [ac_fdsections=no])
|
2000-06-19 11:14:40 +08:00
|
|
|
if test "$ac_test_CXXFLAGS" = set; then
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
else
|
|
|
|
# this is the suspicious part
|
|
|
|
CXXFLAGS=''
|
|
|
|
fi
|
2002-12-17 03:02:01 +08:00
|
|
|
if test x"$ac_fdsections" = x"yes"; then
|
2000-06-19 11:14:40 +08:00
|
|
|
SECTION_FLAGS='-ffunction-sections -fdata-sections'
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_fdsections)
|
|
|
|
|
2000-05-25 02:35:37 +08:00
|
|
|
AC_LANG_RESTORE
|
2000-06-19 11:14:40 +08:00
|
|
|
AC_SUBST(SECTION_FLAGS)
|
2000-04-22 04:33:34 +08:00
|
|
|
])
|
|
|
|
|
2000-06-19 11:14:40 +08:00
|
|
|
|
|
|
|
dnl
|
2000-07-27 05:30:45 +08:00
|
|
|
dnl If GNU ld is in use, check to see if tricky linker opts can be used. If
|
|
|
|
dnl the native linker is in use, all variables will be defined to something
|
|
|
|
dnl safe (like an empty string).
|
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Defines:
|
|
|
|
dnl SECTION_LDFLAGS='-Wl,--gc-sections' if possible
|
2006-01-12 08:17:38 +08:00
|
|
|
dnl OPT_LDFLAGS='-Wl,-O1' and '-z,relro' if possible
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl LD (as a side effect of testing)
|
|
|
|
dnl Sets:
|
|
|
|
dnl with_gnu_ld
|
2008-03-29 01:32:05 +08:00
|
|
|
dnl glibcxx_ld_is_gold (set to "no" or "yes")
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl glibcxx_gnu_ld_version (possibly)
|
|
|
|
dnl
|
|
|
|
dnl The last will be a single integer, e.g., version 1.23.45.0.67.89 will
|
|
|
|
dnl set glibcxx_gnu_ld_version to 12345. Zeros cause problems.
|
2000-06-19 11:14:40 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_LINKER_FEATURES], [
|
2000-07-27 05:30:45 +08:00
|
|
|
# If we're not using GNU ld, then there's no point in even trying these
|
|
|
|
# tests. Check for that first. We should have already tested for gld
|
|
|
|
# by now (in libtool), but require it now just to be safe...
|
2002-01-17 15:33:29 +08:00
|
|
|
test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS=''
|
|
|
|
test -z "$OPT_LDFLAGS" && OPT_LDFLAGS=''
|
2000-07-27 05:30:45 +08:00
|
|
|
AC_REQUIRE([AC_PROG_LD])
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_REQUIRE([AC_PROG_AWK])
|
2000-10-27 20:29:42 +08:00
|
|
|
|
2002-02-21 06:10:39 +08:00
|
|
|
# The name set by libtool depends on the version of libtool. Shame on us
|
|
|
|
# for depending on an impl detail, but c'est la vie. Older versions used
|
|
|
|
# ac_cv_prog_gnu_ld, but now it's lt_cv_prog_gnu_ld, and is copied back on
|
|
|
|
# top of with_gnu_ld (which is also set by --with-gnu-ld, so that actually
|
|
|
|
# makes sense). We'll test with_gnu_ld everywhere else, so if that isn't
|
|
|
|
# set (hence we're using an older libtool), then set it.
|
|
|
|
if test x${with_gnu_ld+set} != xset; then
|
|
|
|
if test x${ac_cv_prog_gnu_ld+set} != xset; then
|
|
|
|
# We got through "ac_require(ac_prog_ld)" and still not set? Huh?
|
|
|
|
with_gnu_ld=no
|
|
|
|
else
|
|
|
|
with_gnu_ld=$ac_cv_prog_gnu_ld
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Start by getting the version number. I think the libtool test already
|
|
|
|
# does some of this, but throws away the result.
|
2008-03-29 01:32:05 +08:00
|
|
|
glibcxx_ld_is_gold=no
|
2006-12-12 20:41:26 +08:00
|
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
|
|
AC_MSG_CHECKING([for ld version])
|
|
|
|
changequote(,)
|
2008-03-29 01:32:05 +08:00
|
|
|
if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
|
|
|
|
glibcxx_ld_is_gold=yes
|
|
|
|
fi
|
2009-09-30 08:43:28 +08:00
|
|
|
ldver=`$LD --version 2>/dev/null |
|
2019-09-03 22:10:26 +08:00
|
|
|
sed -e 's/[. ][0-9]\{8\}$//;s/.* \([^ ]\{1,\}\)$/\1/; q'`
|
2006-12-12 20:41:26 +08:00
|
|
|
changequote([,])
|
|
|
|
glibcxx_gnu_ld_version=`echo $ldver | \
|
2011-03-08 08:04:05 +08:00
|
|
|
$AWK -F. '{ if (NF<3) [$]3=0; print ([$]1*100+[$]2)*100+[$]3 }'`
|
2006-12-12 20:41:26 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_gnu_ld_version)
|
|
|
|
fi
|
2002-02-21 06:10:39 +08:00
|
|
|
|
2000-10-27 20:29:42 +08:00
|
|
|
# Set --gc-sections.
|
2008-03-29 01:32:05 +08:00
|
|
|
glibcxx_have_gc_sections=no
|
|
|
|
if test "$glibcxx_ld_is_gold" = "yes"; then
|
|
|
|
if $LD --help 2>/dev/null | grep gc-sections >/dev/null 2>&1; then
|
|
|
|
glibcxx_have_gc_sections=yes
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
glibcxx_gcsections_min_ld=21602
|
2011-03-08 08:04:05 +08:00
|
|
|
if test x"$with_gnu_ld" = x"yes" &&
|
2006-01-21 06:24:43 +08:00
|
|
|
test $glibcxx_gnu_ld_version -gt $glibcxx_gcsections_min_ld ; then
|
2008-03-29 01:32:05 +08:00
|
|
|
glibcxx_have_gc_sections=yes
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$glibcxx_have_gc_sections" = "yes"; then
|
2006-01-21 06:24:43 +08:00
|
|
|
# Sufficiently young GNU ld it is! Joy and bunny rabbits!
|
|
|
|
# NB: This flag only works reliably after 2.16.1. Configure tests
|
|
|
|
# for this are difficult, so hard wire a value that should work.
|
2000-07-27 05:30:45 +08:00
|
|
|
|
|
|
|
ac_test_CFLAGS="${CFLAGS+set}"
|
|
|
|
ac_save_CFLAGS="$CFLAGS"
|
2007-05-21 18:25:52 +08:00
|
|
|
CFLAGS='-Wl,--gc-sections'
|
2000-07-27 05:30:45 +08:00
|
|
|
|
|
|
|
# Check for -Wl,--gc-sections
|
|
|
|
AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections])
|
2006-01-17 06:25:13 +08:00
|
|
|
AC_TRY_LINK([ int one(void) { return 1; }
|
|
|
|
int two(void) { return 2; }
|
|
|
|
], [ two(); ] , [ac_gcsections=yes], [ac_gcsections=no])
|
2006-01-20 06:36:41 +08:00
|
|
|
if test "$ac_gcsections" = "yes"; then
|
|
|
|
rm -f conftest.c
|
|
|
|
touch conftest.c
|
|
|
|
if $CC -c conftest.c; then
|
|
|
|
if $LD --gc-sections -o conftest conftest.o 2>&1 | \
|
|
|
|
grep "Warning: gc-sections option ignored" > /dev/null; then
|
|
|
|
ac_gcsections=no
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
rm -f conftest.c conftest.o conftest
|
|
|
|
fi
|
2006-01-17 06:25:13 +08:00
|
|
|
if test "$ac_gcsections" = "yes"; then
|
|
|
|
SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_gcsections)
|
|
|
|
|
2000-07-27 05:30:45 +08:00
|
|
|
if test "$ac_test_CFLAGS" = set; then
|
|
|
|
CFLAGS="$ac_save_CFLAGS"
|
|
|
|
else
|
|
|
|
# this is the suspicious part
|
|
|
|
CFLAGS=''
|
|
|
|
fi
|
2000-10-27 20:29:42 +08:00
|
|
|
fi
|
2000-10-17 18:12:23 +08:00
|
|
|
|
2006-01-12 08:17:38 +08:00
|
|
|
# Set -z,relro.
|
2006-01-13 11:58:38 +08:00
|
|
|
# Note this is only for shared objects.
|
2006-01-12 08:17:38 +08:00
|
|
|
ac_ld_relro=no
|
|
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
|
|
AC_MSG_CHECKING([for ld that supports -Wl,-z,relro])
|
|
|
|
cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
|
|
|
|
if test -n "$cxx_z_relo"; then
|
|
|
|
OPT_LDFLAGS="-Wl,-z,relro"
|
|
|
|
ac_ld_relro=yes
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_ld_relro)
|
|
|
|
fi
|
|
|
|
|
2000-10-27 20:29:42 +08:00
|
|
|
# Set linker optimization flags.
|
2002-12-17 03:02:01 +08:00
|
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
2002-01-17 15:33:29 +08:00
|
|
|
OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
|
2000-07-27 05:30:45 +08:00
|
|
|
fi
|
2000-10-27 20:29:42 +08:00
|
|
|
|
2000-06-19 11:14:40 +08:00
|
|
|
AC_SUBST(SECTION_LDFLAGS)
|
2000-07-27 05:30:45 +08:00
|
|
|
AC_SUBST(OPT_LDFLAGS)
|
2000-06-19 11:14:40 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-04-22 04:33:34 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Check for headers for, and arguments to, the setrlimit() function.
|
|
|
|
dnl Used only in testsuite_hooks.h. Called from GLIBCXX_CONFIGURE_TESTSUITE.
|
2002-12-17 03:02:01 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Defines:
|
2011-03-08 08:04:05 +08:00
|
|
|
dnl _GLIBCXX_RES_LIMITS if we can set artificial resource limits
|
2004-04-01 17:16:36 +08:00
|
|
|
dnl various HAVE_LIMIT_* for individual limit names
|
2002-12-17 03:02:01 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_SETRLIMIT_ancilliary], [
|
2005-08-04 05:03:29 +08:00
|
|
|
AC_MSG_CHECKING([for RLIMIT_$1])
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_TRY_COMPILE(
|
|
|
|
[#include <unistd.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <sys/resource.h>
|
|
|
|
],
|
|
|
|
[ int f = RLIMIT_$1 ; ],
|
|
|
|
[glibcxx_mresult=1], [glibcxx_mresult=0])
|
2004-04-01 17:16:36 +08:00
|
|
|
AC_DEFINE_UNQUOTED(HAVE_LIMIT_$1, $glibcxx_mresult,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Only used in build directory testsuite_hooks.h.])
|
2005-08-04 05:03:29 +08:00
|
|
|
if test $glibcxx_mresult = 1 ; then res=yes ; else res=no ; fi
|
|
|
|
AC_MSG_RESULT($res)
|
2003-08-05 10:00:18 +08:00
|
|
|
])
|
|
|
|
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_SETRLIMIT], [
|
2003-08-05 10:00:18 +08:00
|
|
|
setrlimit_have_headers=yes
|
|
|
|
AC_CHECK_HEADERS(unistd.h sys/time.h sys/resource.h,
|
2011-03-08 08:04:05 +08:00
|
|
|
[],
|
|
|
|
[setrlimit_have_headers=no])
|
2003-08-05 10:00:18 +08:00
|
|
|
# If don't have the headers, then we can't run the tests now, and we
|
|
|
|
# won't be seeing any of these during testsuite compilation.
|
|
|
|
if test $setrlimit_have_headers = yes; then
|
|
|
|
# Can't do these in a loop, else the resulting syntax is wrong.
|
|
|
|
GLIBCXX_CHECK_SETRLIMIT_ancilliary(DATA)
|
|
|
|
GLIBCXX_CHECK_SETRLIMIT_ancilliary(RSS)
|
|
|
|
GLIBCXX_CHECK_SETRLIMIT_ancilliary(VMEM)
|
|
|
|
GLIBCXX_CHECK_SETRLIMIT_ancilliary(AS)
|
2004-04-01 17:16:36 +08:00
|
|
|
GLIBCXX_CHECK_SETRLIMIT_ancilliary(FSIZE)
|
2003-08-05 10:00:18 +08:00
|
|
|
|
|
|
|
# Check for rlimit, setrlimit.
|
2008-04-22 04:55:19 +08:00
|
|
|
AC_CACHE_VAL(glibcxx_cv_setrlimit, [
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_TRY_COMPILE(
|
2011-03-08 08:04:05 +08:00
|
|
|
[#include <unistd.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <sys/resource.h>
|
|
|
|
],
|
|
|
|
[struct rlimit r;
|
|
|
|
setrlimit(0, &r);],
|
|
|
|
[glibcxx_cv_setrlimit=yes], [glibcxx_cv_setrlimit=no])
|
2003-08-05 10:00:18 +08:00
|
|
|
])
|
|
|
|
fi
|
|
|
|
|
2004-04-01 17:16:36 +08:00
|
|
|
AC_MSG_CHECKING([for testsuite resource limits support])
|
2008-04-22 04:55:19 +08:00
|
|
|
if test $setrlimit_have_headers = yes && test $glibcxx_cv_setrlimit = yes; then
|
2004-04-01 17:16:36 +08:00
|
|
|
ac_res_limits=yes
|
acinclude.m4 (_GLIBCXX_USE_LONG_LONG, [...]): Use long form of AC_DEFINE ...
2005-04-06 Kelley Cook <kcook@gcc.gnu.org>
* acinclude.m4 (_GLIBCXX_USE_LONG_LONG,
_GLIBCXX_USE_WCHAR_T, _GLIBCXX_USE_C99, _GLIBCXX_USE_C99_MATH,
_GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_RES_LIMITS, _GLIBCXX_CONCEPT_CHECKS,
_GLIBCXX_SYMVER, _GLIBCXX_USE_LFS, _GLIBCXX_FULLY_DYNAMIC_STRING,
_GLIBCXX_USE_NLS, HAVE_GTHR_DEFAULT, HAVE_MBSTATE_T, HAVE_POLL,
HAVE_S_ISREG, HAVE_S_IFREG, HAVE_WRITEV, HAVE_INT64_T,
HAVE_LC_MESSAGES): Use long form of AC_DEFINE ...
* acconfig.h: ... to eliminate them from here.
(_GLIBCXX_ASM_SYMVER): Move definition below @BOTTOM@.
* config.h.in, configure: Regenerate.
From-SVN: r97685
2005-04-06 09:32:03 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_RES_LIMITS, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if using setrlimit to set resource limits during
|
|
|
|
"make check"])
|
2003-08-05 10:00:18 +08:00
|
|
|
else
|
2004-04-01 17:16:36 +08:00
|
|
|
ac_res_limits=no
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
2004-04-01 17:16:36 +08:00
|
|
|
AC_MSG_RESULT($ac_res_limits)
|
2002-12-17 03:02:01 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Check whether S_ISREG (Posix) or S_IFREG is available in <sys/stat.h>.
|
|
|
|
dnl Define HAVE_S_ISREG / HAVE_S_IFREG appropriately.
|
2002-12-17 03:02:01 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_S_ISREG_OR_S_IFREG], [
|
2008-08-17 18:19:34 +08:00
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
|
2005-08-04 05:03:29 +08:00
|
|
|
AC_MSG_CHECKING([for S_ISREG or S_IFREG])
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_CACHE_VAL(glibcxx_cv_S_ISREG, [
|
2008-08-17 18:19:34 +08:00
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
2003-08-05 10:00:18 +08:00
|
|
|
[#include <sys/stat.h>],
|
|
|
|
[struct stat buffer;
|
|
|
|
fstat(0, &buffer);
|
|
|
|
S_ISREG(buffer.st_mode);],
|
|
|
|
[glibcxx_cv_S_ISREG=yes],
|
|
|
|
[glibcxx_cv_S_ISREG=no])
|
|
|
|
])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_S_IFREG, [
|
2008-08-17 18:19:34 +08:00
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
2003-08-05 10:00:18 +08:00
|
|
|
[#include <sys/stat.h>],
|
|
|
|
[struct stat buffer;
|
|
|
|
fstat(0, &buffer);
|
|
|
|
S_IFREG & buffer.st_mode;],
|
|
|
|
[glibcxx_cv_S_IFREG=yes],
|
|
|
|
[glibcxx_cv_S_IFREG=no])
|
|
|
|
])
|
2005-08-04 05:03:29 +08:00
|
|
|
res=no
|
2003-08-05 10:00:18 +08:00
|
|
|
if test $glibcxx_cv_S_ISREG = yes; then
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_DEFINE(HAVE_S_ISREG, 1,
|
2017-03-15 23:23:44 +08:00
|
|
|
[Define if S_ISREG is available in <sys/stat.h>.])
|
2005-08-04 05:03:29 +08:00
|
|
|
res=S_ISREG
|
2003-08-05 10:00:18 +08:00
|
|
|
elif test $glibcxx_cv_S_IFREG = yes; then
|
acinclude.m4 (_GLIBCXX_USE_LONG_LONG, [...]): Use long form of AC_DEFINE ...
2005-04-06 Kelley Cook <kcook@gcc.gnu.org>
* acinclude.m4 (_GLIBCXX_USE_LONG_LONG,
_GLIBCXX_USE_WCHAR_T, _GLIBCXX_USE_C99, _GLIBCXX_USE_C99_MATH,
_GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_RES_LIMITS, _GLIBCXX_CONCEPT_CHECKS,
_GLIBCXX_SYMVER, _GLIBCXX_USE_LFS, _GLIBCXX_FULLY_DYNAMIC_STRING,
_GLIBCXX_USE_NLS, HAVE_GTHR_DEFAULT, HAVE_MBSTATE_T, HAVE_POLL,
HAVE_S_ISREG, HAVE_S_IFREG, HAVE_WRITEV, HAVE_INT64_T,
HAVE_LC_MESSAGES): Use long form of AC_DEFINE ...
* acconfig.h: ... to eliminate them from here.
(_GLIBCXX_ASM_SYMVER): Move definition below @BOTTOM@.
* config.h.in, configure: Regenerate.
From-SVN: r97685
2005-04-06 09:32:03 +08:00
|
|
|
AC_DEFINE(HAVE_S_IFREG, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if S_IFREG is available in <sys/stat.h>.])
|
2005-08-04 05:03:29 +08:00
|
|
|
res=S_IFREG
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
2005-08-04 05:03:29 +08:00
|
|
|
AC_MSG_RESULT($res)
|
2008-08-17 18:19:34 +08:00
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
2000-04-22 04:33:34 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-05-10 04:25:13 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Check whether poll is available in <poll.h>, and define HAVE_POLL.
|
2000-05-10 04:25:13 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_POLL], [
|
2008-08-17 18:19:34 +08:00
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
|
2005-08-04 05:03:29 +08:00
|
|
|
AC_MSG_CHECKING([for poll])
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_CACHE_VAL(glibcxx_cv_POLL, [
|
2008-08-17 18:19:34 +08:00
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
2003-08-05 10:00:18 +08:00
|
|
|
[#include <poll.h>],
|
|
|
|
[struct pollfd pfd[1];
|
|
|
|
pfd[0].events = POLLIN;
|
|
|
|
poll(pfd, 1, 0);],
|
|
|
|
[glibcxx_cv_POLL=yes],
|
|
|
|
[glibcxx_cv_POLL=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_POLL = yes; then
|
acinclude.m4 (_GLIBCXX_USE_LONG_LONG, [...]): Use long form of AC_DEFINE ...
2005-04-06 Kelley Cook <kcook@gcc.gnu.org>
* acinclude.m4 (_GLIBCXX_USE_LONG_LONG,
_GLIBCXX_USE_WCHAR_T, _GLIBCXX_USE_C99, _GLIBCXX_USE_C99_MATH,
_GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_RES_LIMITS, _GLIBCXX_CONCEPT_CHECKS,
_GLIBCXX_SYMVER, _GLIBCXX_USE_LFS, _GLIBCXX_FULLY_DYNAMIC_STRING,
_GLIBCXX_USE_NLS, HAVE_GTHR_DEFAULT, HAVE_MBSTATE_T, HAVE_POLL,
HAVE_S_ISREG, HAVE_S_IFREG, HAVE_WRITEV, HAVE_INT64_T,
HAVE_LC_MESSAGES): Use long form of AC_DEFINE ...
* acconfig.h: ... to eliminate them from here.
(_GLIBCXX_ASM_SYMVER): Move definition below @BOTTOM@.
* config.h.in, configure: Regenerate.
From-SVN: r97685
2005-04-06 09:32:03 +08:00
|
|
|
AC_DEFINE(HAVE_POLL, 1, [Define if poll is available in <poll.h>.])
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
2005-08-04 05:03:29 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_POLL)
|
2008-08-17 18:19:34 +08:00
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
2003-08-05 10:00:18 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check whether writev is available in <sys/uio.h>, and define HAVE_WRITEV.
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_WRITEV], [
|
2008-08-17 18:19:34 +08:00
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
|
2005-08-04 05:03:29 +08:00
|
|
|
AC_MSG_CHECKING([for writev])
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_CACHE_VAL(glibcxx_cv_WRITEV, [
|
2008-08-17 18:19:34 +08:00
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
2003-08-05 10:00:18 +08:00
|
|
|
[#include <sys/uio.h>],
|
|
|
|
[struct iovec iov[2];
|
|
|
|
writev(0, iov, 0);],
|
|
|
|
[glibcxx_cv_WRITEV=yes],
|
|
|
|
[glibcxx_cv_WRITEV=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_WRITEV = yes; then
|
acinclude.m4 (_GLIBCXX_USE_LONG_LONG, [...]): Use long form of AC_DEFINE ...
2005-04-06 Kelley Cook <kcook@gcc.gnu.org>
* acinclude.m4 (_GLIBCXX_USE_LONG_LONG,
_GLIBCXX_USE_WCHAR_T, _GLIBCXX_USE_C99, _GLIBCXX_USE_C99_MATH,
_GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_RES_LIMITS, _GLIBCXX_CONCEPT_CHECKS,
_GLIBCXX_SYMVER, _GLIBCXX_USE_LFS, _GLIBCXX_FULLY_DYNAMIC_STRING,
_GLIBCXX_USE_NLS, HAVE_GTHR_DEFAULT, HAVE_MBSTATE_T, HAVE_POLL,
HAVE_S_ISREG, HAVE_S_IFREG, HAVE_WRITEV, HAVE_INT64_T,
HAVE_LC_MESSAGES): Use long form of AC_DEFINE ...
* acconfig.h: ... to eliminate them from here.
(_GLIBCXX_ASM_SYMVER): Move definition below @BOTTOM@.
* config.h.in, configure: Regenerate.
From-SVN: r97685
2005-04-06 09:32:03 +08:00
|
|
|
AC_DEFINE(HAVE_WRITEV, 1, [Define if writev is available in <sys/uio.h>.])
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
2005-08-04 05:03:29 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_WRITEV)
|
2008-08-17 18:19:34 +08:00
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
2003-08-05 10:00:18 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2003-10-22 23:51:55 +08:00
|
|
|
dnl
|
|
|
|
dnl Check whether int64_t is available in <stdint.h>, and define HAVE_INT64_T.
|
2008-08-06 20:25:00 +08:00
|
|
|
dnl Also check whether int64_t is actually a typedef to long or long long.
|
2003-10-22 23:51:55 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_INT64_T], [
|
2008-08-06 20:25:00 +08:00
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
|
2005-08-04 05:03:29 +08:00
|
|
|
AC_MSG_CHECKING([for int64_t])
|
2003-10-22 23:51:55 +08:00
|
|
|
AC_CACHE_VAL(glibcxx_cv_INT64_T, [
|
|
|
|
AC_TRY_COMPILE(
|
|
|
|
[#include <stdint.h>],
|
|
|
|
[int64_t var;],
|
|
|
|
[glibcxx_cv_INT64_T=yes],
|
|
|
|
[glibcxx_cv_INT64_T=no])
|
|
|
|
])
|
2008-08-06 20:25:00 +08:00
|
|
|
|
2003-10-22 23:51:55 +08:00
|
|
|
if test $glibcxx_cv_INT64_T = yes; then
|
acinclude.m4 (_GLIBCXX_USE_LONG_LONG, [...]): Use long form of AC_DEFINE ...
2005-04-06 Kelley Cook <kcook@gcc.gnu.org>
* acinclude.m4 (_GLIBCXX_USE_LONG_LONG,
_GLIBCXX_USE_WCHAR_T, _GLIBCXX_USE_C99, _GLIBCXX_USE_C99_MATH,
_GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_RES_LIMITS, _GLIBCXX_CONCEPT_CHECKS,
_GLIBCXX_SYMVER, _GLIBCXX_USE_LFS, _GLIBCXX_FULLY_DYNAMIC_STRING,
_GLIBCXX_USE_NLS, HAVE_GTHR_DEFAULT, HAVE_MBSTATE_T, HAVE_POLL,
HAVE_S_ISREG, HAVE_S_IFREG, HAVE_WRITEV, HAVE_INT64_T,
HAVE_LC_MESSAGES): Use long form of AC_DEFINE ...
* acconfig.h: ... to eliminate them from here.
(_GLIBCXX_ASM_SYMVER): Move definition below @BOTTOM@.
* config.h.in, configure: Regenerate.
From-SVN: r97685
2005-04-06 09:32:03 +08:00
|
|
|
AC_DEFINE(HAVE_INT64_T, 1, [Define if int64_t is available in <stdint.h>.])
|
2008-08-06 20:25:00 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_INT64_T)
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for int64_t as long])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_int64_t_long, [
|
|
|
|
AC_TRY_COMPILE(
|
2011-03-08 08:04:05 +08:00
|
|
|
[#include <stdint.h>
|
|
|
|
template<typename, typename> struct same { enum { value = -1 }; };
|
|
|
|
template<typename Tp> struct same<Tp, Tp> { enum { value = 1 }; };
|
|
|
|
int array[same<int64_t, long>::value];], [],
|
2008-08-06 20:25:00 +08:00
|
|
|
[glibcxx_cv_int64_t_long=yes], [glibcxx_cv_int64_t_long=no])
|
|
|
|
])
|
|
|
|
|
|
|
|
if test $glibcxx_cv_int64_t_long = yes; then
|
|
|
|
AC_DEFINE(HAVE_INT64_T_LONG, 1, [Define if int64_t is a long.])
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_int64_t_long)
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for int64_t as long long])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_int64_t_long_long, [
|
|
|
|
AC_TRY_COMPILE(
|
2011-03-08 08:04:05 +08:00
|
|
|
[#include <stdint.h>
|
|
|
|
template<typename, typename> struct same { enum { value = -1 }; };
|
|
|
|
template<typename Tp> struct same<Tp, Tp> { enum { value = 1 }; };
|
|
|
|
int array[same<int64_t, long long>::value];], [],
|
2008-08-06 20:25:00 +08:00
|
|
|
[glibcxx_cv_int64_t_long_long=yes], [glibcxx_cv_int64_t_long_long=no])
|
|
|
|
])
|
|
|
|
|
|
|
|
if test $glibcxx_cv_int64_t_long_long = yes; then
|
|
|
|
AC_DEFINE(HAVE_INT64_T_LONG_LONG, 1, [Define if int64_t is a long long.])
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_int64_t_long_long)
|
|
|
|
fi
|
2003-10-22 23:51:55 +08:00
|
|
|
fi
|
2008-08-06 20:25:00 +08:00
|
|
|
|
|
|
|
AC_LANG_RESTORE
|
2003-10-22 23:51:55 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check whether LFS support is available.
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_LFS], [
|
2003-10-28 07:11:52 +08:00
|
|
|
AC_LANG_SAVE
|
2003-12-30 04:13:22 +08:00
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
2011-03-08 08:04:05 +08:00
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
2005-08-04 05:03:29 +08:00
|
|
|
AC_MSG_CHECKING([for LFS support])
|
2003-10-22 23:51:55 +08:00
|
|
|
AC_CACHE_VAL(glibcxx_cv_LFS, [
|
2008-08-17 18:19:34 +08:00
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
2003-10-28 07:11:52 +08:00
|
|
|
[#include <unistd.h>
|
|
|
|
#include <stdio.h>
|
2004-09-21 17:06:08 +08:00
|
|
|
#include <sys/stat.h>
|
2003-10-28 07:11:52 +08:00
|
|
|
],
|
2003-11-22 04:30:12 +08:00
|
|
|
[FILE* fp;
|
|
|
|
fopen64("t", "w");
|
|
|
|
fseeko64(fp, 0, SEEK_CUR);
|
|
|
|
ftello64(fp);
|
2004-09-21 17:06:08 +08:00
|
|
|
lseek64(1, 0, SEEK_CUR);
|
|
|
|
struct stat64 buf;
|
|
|
|
fstat64(1, &buf);],
|
2003-10-22 23:51:55 +08:00
|
|
|
[glibcxx_cv_LFS=yes],
|
|
|
|
[glibcxx_cv_LFS=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_LFS = yes; then
|
acinclude.m4 (_GLIBCXX_USE_LONG_LONG, [...]): Use long form of AC_DEFINE ...
2005-04-06 Kelley Cook <kcook@gcc.gnu.org>
* acinclude.m4 (_GLIBCXX_USE_LONG_LONG,
_GLIBCXX_USE_WCHAR_T, _GLIBCXX_USE_C99, _GLIBCXX_USE_C99_MATH,
_GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_RES_LIMITS, _GLIBCXX_CONCEPT_CHECKS,
_GLIBCXX_SYMVER, _GLIBCXX_USE_LFS, _GLIBCXX_FULLY_DYNAMIC_STRING,
_GLIBCXX_USE_NLS, HAVE_GTHR_DEFAULT, HAVE_MBSTATE_T, HAVE_POLL,
HAVE_S_ISREG, HAVE_S_IFREG, HAVE_WRITEV, HAVE_INT64_T,
HAVE_LC_MESSAGES): Use long form of AC_DEFINE ...
* acconfig.h: ... to eliminate them from here.
(_GLIBCXX_ASM_SYMVER): Move definition below @BOTTOM@.
* config.h.in, configure: Regenerate.
From-SVN: r97685
2005-04-06 09:32:03 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_USE_LFS, 1, [Define if LFS support is available.])
|
2003-10-22 23:51:55 +08:00
|
|
|
fi
|
2005-08-04 05:03:29 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_LFS)
|
2003-12-30 04:13:22 +08:00
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
2003-10-22 23:51:55 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2004-09-28 16:58:35 +08:00
|
|
|
dnl
|
|
|
|
dnl Check for whether a fully dynamic basic_string implementation should
|
|
|
|
dnl be turned on, that does not put empty objects in per-process static
|
|
|
|
dnl memory (mostly useful together with shared memory allocators, see PR
|
|
|
|
dnl libstdc++/16612 for details).
|
|
|
|
dnl
|
2011-10-14 14:57:55 +08:00
|
|
|
dnl --enable-fully-dynamic-string defines _GLIBCXX_FULLY_DYNAMIC_STRING to 1
|
|
|
|
dnl --disable-fully-dynamic-string defines _GLIBCXX_FULLY_DYNAMIC_STRING to 0
|
|
|
|
dnl otherwise undefined
|
2004-09-28 16:58:35 +08:00
|
|
|
dnl + Usage: GLIBCXX_ENABLE_FULLY_DYNAMIC_STRING[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_FULLY_DYNAMIC_STRING], [
|
|
|
|
GLIBCXX_ENABLE(fully-dynamic-string,$1,,[do not put empty strings in per-process static memory])
|
|
|
|
if test $enable_fully_dynamic_string = yes; then
|
2011-10-14 14:57:55 +08:00
|
|
|
enable_fully_dynamic_string_def=1
|
|
|
|
else
|
|
|
|
enable_fully_dynamic_string_def=0
|
2004-09-28 16:58:35 +08:00
|
|
|
fi
|
2011-10-14 14:57:55 +08:00
|
|
|
AC_DEFINE_UNQUOTED([_GLIBCXX_FULLY_DYNAMIC_STRING], [${enable_fully_dynamic_string_def}],
|
|
|
|
[Define to 1 if a fully dynamic basic_string is wanted, 0 to disable, undefined for platform defaults])
|
2004-09-28 16:58:35 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl
|
|
|
|
dnl Does any necessary configuration of the testsuite directory. Generates
|
|
|
|
dnl the testsuite_hooks.h header.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE must be done before this.
|
|
|
|
dnl
|
|
|
|
dnl Sets:
|
2011-03-08 08:04:05 +08:00
|
|
|
dnl enable_abi_check
|
2004-10-07 06:12:34 +08:00
|
|
|
dnl GLIBCXX_TEST_WCHAR_T
|
|
|
|
dnl GLIBCXX_TEST_THREAD
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Substs:
|
|
|
|
dnl baseline_dir
|
2011-07-08 16:49:57 +08:00
|
|
|
dnl baseline_subdir_switch
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CONFIGURE_TESTSUITE], [
|
2016-09-02 21:42:55 +08:00
|
|
|
# Do checks for resource limit functions.
|
|
|
|
GLIBCXX_CHECK_SETRLIMIT
|
2003-08-05 10:00:18 +08:00
|
|
|
|
2016-09-02 21:42:55 +08:00
|
|
|
if $GLIBCXX_IS_NATIVE ; then
|
2003-08-05 10:00:18 +08:00
|
|
|
# Look for setenv, so that extended locale tests can be performed.
|
|
|
|
GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
|
2005-08-04 07:17:06 +08:00
|
|
|
fi
|
2003-09-11 11:11:31 +08:00
|
|
|
|
2005-08-04 07:17:06 +08:00
|
|
|
if $GLIBCXX_IS_NATIVE && test $is_hosted = yes &&
|
|
|
|
test $enable_symvers != no; then
|
|
|
|
case "$host" in
|
|
|
|
*-*-cygwin*)
|
2011-03-08 08:04:05 +08:00
|
|
|
enable_abi_check=no ;;
|
2005-08-04 07:17:06 +08:00
|
|
|
*)
|
2011-03-08 08:04:05 +08:00
|
|
|
enable_abi_check=yes ;;
|
2005-08-04 07:17:06 +08:00
|
|
|
esac
|
2003-09-11 11:11:31 +08:00
|
|
|
else
|
|
|
|
# Only build this as native, since automake does not understand
|
|
|
|
# CXX_FOR_BUILD.
|
|
|
|
enable_abi_check=no
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
2011-03-08 08:04:05 +08:00
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
# Export file names for ABI checking.
|
2009-02-24 04:42:53 +08:00
|
|
|
baseline_dir="$glibcxx_srcdir/config/abi/post/${abi_baseline_pair}"
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_SUBST(baseline_dir)
|
2011-07-08 16:49:57 +08:00
|
|
|
baseline_subdir_switch="$abi_baseline_subdir_switch"
|
|
|
|
AC_SUBST(baseline_subdir_switch)
|
2003-08-05 10:00:18 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2011-03-08 08:04:05 +08:00
|
|
|
dnl
|
2012-01-19 05:35:45 +08:00
|
|
|
dnl Does any necessary configuration for docbook in the docs directory.
|
2011-03-08 08:04:05 +08:00
|
|
|
dnl
|
|
|
|
dnl XSLTPROC must be set before this
|
|
|
|
dnl
|
|
|
|
dnl Sets:
|
|
|
|
dnl glibcxx_stylesheets
|
|
|
|
dnl Substs:
|
|
|
|
dnl XSL_STYLE_DIR
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CONFIGURE_DOCBOOK], [
|
|
|
|
|
2019-02-27 19:25:44 +08:00
|
|
|
glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/
|
2011-03-08 08:04:05 +08:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([for local stylesheet directory])
|
|
|
|
glibcxx_local_stylesheets=no
|
2019-02-27 19:25:44 +08:00
|
|
|
if test x${XMLCATALOG} = xyes && xsl_style_dir=`xmlcatalog "" $glibcxx_docbook_url 2>/dev/null`
|
|
|
|
then
|
|
|
|
XSL_STYLE_DIR=`echo $xsl_style_dir | sed -n 's;^file://;;p'`
|
|
|
|
glibcxx_local_stylesheets=yes
|
|
|
|
else
|
|
|
|
for dir in \
|
|
|
|
/usr/share/sgml/docbook/xsl-ns-stylesheets \
|
|
|
|
/usr/share/xml/docbook/stylesheet/docbook-xsl-ns \
|
|
|
|
/usr/share/xml/docbook/stylesheet/nwalsh5/current \
|
|
|
|
/usr/share/xml/docbook/stylesheet/nwalsh/current
|
|
|
|
do
|
|
|
|
if test -d $dir; then
|
|
|
|
glibcxx_local_stylesheets=yes
|
|
|
|
XSL_STYLE_DIR=$dir
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
2011-03-08 08:04:05 +08:00
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_local_stylesheets)
|
|
|
|
|
|
|
|
if test x"$glibcxx_local_stylesheets" = x"yes"; then
|
|
|
|
AC_SUBST(XSL_STYLE_DIR)
|
|
|
|
AC_MSG_NOTICE($XSL_STYLE_DIR)
|
2019-02-27 19:25:44 +08:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([for docbook stylesheets for documentation creation])
|
|
|
|
glibcxx_stylesheets=no
|
|
|
|
if test x${XMLCATALOG} = xno || xmlcatalog "" $glibcxx_docbook_url/xhtml/docbook.xsl >/dev/null 2>&1; then
|
|
|
|
if test x${XSLTPROC} = xyes && echo '<title/>' | xsltproc --noout --nonet --xinclude $glibcxx_docbook_url/xhtml/docbook.xsl - 2>/dev/null; then
|
|
|
|
glibcxx_stylesheets=yes
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_stylesheets)
|
|
|
|
|
2011-03-08 08:04:05 +08:00
|
|
|
else
|
|
|
|
glibcxx_stylesheets=no
|
|
|
|
fi
|
2012-01-19 05:35:45 +08:00
|
|
|
|
|
|
|
# Check for epub3 dependencies.
|
|
|
|
AC_MSG_CHECKING([for epub3 stylesheets for documentation creation])
|
|
|
|
glibcxx_epub_stylesheets=no
|
|
|
|
if test x"$glibcxx_local_stylesheets" = x"yes"; then
|
2012-01-19 05:43:31 +08:00
|
|
|
if test -f "$XSL_STYLE_DIR/epub3/chunk.xsl"; then
|
2012-01-19 05:35:45 +08:00
|
|
|
glibcxx_epub_stylesheets=yes
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_epub_stylesheets)
|
2012-01-19 05:43:31 +08:00
|
|
|
AM_CONDITIONAL(BUILD_EPUB, test x"$glibcxx_epub_stylesheets" = x"yes")
|
2012-01-19 05:35:45 +08:00
|
|
|
|
2011-03-08 08:04:05 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl
|
|
|
|
dnl Set up *_INCLUDES variables for all sundry Makefile.am's.
|
|
|
|
dnl
|
|
|
|
dnl Substs:
|
|
|
|
dnl GLIBCXX_INCLUDES
|
|
|
|
dnl TOPLEVEL_INCLUDES
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_EXPORT_INCLUDES], [
|
acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES and LIBSUPCXX_INCLUDES.
2003-08-17 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES
and LIBSUPCXX_INCLUDES. Re-purpose TOPLEVEL_INCLUDES to refer to
things from the top level.
* configure.ac (GLIBCXX_IS_NATIVE): Determine earlier and re-order.
Comment out the conditionals for CANADIAN and GLIBCXX_BUILD_LIBMATH
(currently unused). Strip the fake-VPATH shell fragment from
automake-generated rules, if present.
* linkage.m4: Add comment.
* fragment.am: New file, containing factored-out common settings.
(AM_CPPFLAGS): Absorb the deprecated INCLUDES variable contents.
* Makefile.am: Include fragment.am. Remove common variables.
* include/Makefile.am: Likewise.
* libmath/Makefile.am: Likewise.
* libsupc++/Makefile.am: Likewise.
* po/Makefile.am: Likewise. Print rules during check.
* src/Makefile.am: Likewise.
* testsuite/Makefile.am: Likewise.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerate.
From-SVN: r70522
2003-08-18 04:23:12 +08:00
|
|
|
# Used for every C++ compile we perform.
|
|
|
|
GLIBCXX_INCLUDES="\
|
|
|
|
-I$glibcxx_builddir/include/$host_alias \
|
|
|
|
-I$glibcxx_builddir/include \
|
|
|
|
-I$glibcxx_srcdir/libsupc++"
|
2003-08-05 10:00:18 +08:00
|
|
|
|
acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES and LIBSUPCXX_INCLUDES.
2003-08-17 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES
and LIBSUPCXX_INCLUDES. Re-purpose TOPLEVEL_INCLUDES to refer to
things from the top level.
* configure.ac (GLIBCXX_IS_NATIVE): Determine earlier and re-order.
Comment out the conditionals for CANADIAN and GLIBCXX_BUILD_LIBMATH
(currently unused). Strip the fake-VPATH shell fragment from
automake-generated rules, if present.
* linkage.m4: Add comment.
* fragment.am: New file, containing factored-out common settings.
(AM_CPPFLAGS): Absorb the deprecated INCLUDES variable contents.
* Makefile.am: Include fragment.am. Remove common variables.
* include/Makefile.am: Likewise.
* libmath/Makefile.am: Likewise.
* libsupc++/Makefile.am: Likewise.
* po/Makefile.am: Likewise. Print rules during check.
* src/Makefile.am: Likewise.
* testsuite/Makefile.am: Likewise.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerate.
From-SVN: r70522
2003-08-18 04:23:12 +08:00
|
|
|
# For Canadian crosses, pick this up too.
|
2003-08-05 10:00:18 +08:00
|
|
|
if test $CANADIAN = yes; then
|
2003-08-28 04:26:22 +08:00
|
|
|
GLIBCXX_INCLUDES="$GLIBCXX_INCLUDES -I\${includedir}"
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
|
|
|
|
acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES and LIBSUPCXX_INCLUDES.
2003-08-17 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES
and LIBSUPCXX_INCLUDES. Re-purpose TOPLEVEL_INCLUDES to refer to
things from the top level.
* configure.ac (GLIBCXX_IS_NATIVE): Determine earlier and re-order.
Comment out the conditionals for CANADIAN and GLIBCXX_BUILD_LIBMATH
(currently unused). Strip the fake-VPATH shell fragment from
automake-generated rules, if present.
* linkage.m4: Add comment.
* fragment.am: New file, containing factored-out common settings.
(AM_CPPFLAGS): Absorb the deprecated INCLUDES variable contents.
* Makefile.am: Include fragment.am. Remove common variables.
* include/Makefile.am: Likewise.
* libmath/Makefile.am: Likewise.
* libsupc++/Makefile.am: Likewise.
* po/Makefile.am: Likewise. Print rules during check.
* src/Makefile.am: Likewise.
* testsuite/Makefile.am: Likewise.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerate.
From-SVN: r70522
2003-08-18 04:23:12 +08:00
|
|
|
# Stuff in the actual top level. Currently only used by libsupc++ to
|
Makefile.in (UNWIND_H): Remove.
gcc:
* Makefile.in (UNWIND_H): Remove.
(LIB2ADDEH, LIB2ADDEHSTATIC, LIB2ADDEHSHARED): Move to
../libgcc/Makefile.in.
(LIBUNWIND, SHLIBUNWIND_LINK, SHLIBUNWIND_INSTALL): Likewise.
(LIBUNWINDDEP): Remove.
(libgcc-support): Remove LIB2ADDEH, $(srcdir)/emutls.c dependencies.
(libgcc.mvars): Remove LIB2ADDEH, LIB2ADDEHSTATIC, LIB2ADDEHSHARED,
LIBUNWIND, SHLIBUNWIND_LINK, SHLIBUNWIND_INSTALL.
(stmp-int-hdrs): Remove $(UNWIND_H) dependency.
Don't copy $(UNWIND_H).
* config.gcc (ia64*-*-linux*): Remove with_system_libunwind
handling.
* configure.ac (GCC_CHECK_UNWIND_GETIPINFO): Remove.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* emutls.c, unwind-c.c, unwind-compat.c, unwind-compat.h,
unwind-dw2-fde-compat.c, unwind-dw2-fde-glibc.c, unwind-dw2-fde.c,
unwind-dw2-fde.h, unwind-dw2.c, unwind-dw2.h, unwind-generic.h,
unwind-pe.h, unwind-sjlj.c, unwind.inc: Move to ../libgcc.
* unwind-dw2-fde-darwin.c: Move to ../libgcc/config.
* config/arm/libunwind.S, config/arm/pr-support.c,
config/arm/unwind-arm.c, config/arm/unwind-arm.h: Move to
../libgcc/config/arm.
* config/arm/t-bpabi (UNWIND_H, LIB2ADDEH): Remove.
* config/arm/t-symbian (UNWIND_H, LIB2ADDEH): Remove.
* config/frv/t-frv ($(T)frvbegin$(objext)): Use
$(srcdir)/../libgcc to refer to unwind-dw2-fde.h.
($(T)frvend$(objext)): Likewise.
* config/ia64/t-glibc (LIB2ADDEH): Remove.
* config/ia64/t-glibc-libunwind: Move to ../libgcc/config/ia64.
* config/ia64/fde-glibc.c, config/ia64/fde-vms.c,
config/ia64/unwind-ia64.c, config/ia64/unwind-ia64.h: Move to
../libgcc/config/ia64.
* config/ia64/t-hpux (LIB2ADDEH): Remove.
* config/ia64/t-ia64 (LIB2ADDEH): Remove.
* config/ia64/t-vms (LIB2ADDEH): Remove.
* config/ia64/vms.h (UNW_IVMS_MODE,
MD_UNW_COMPATIBLE_PERSONALITY_P): Remove.
* config/picochip/t-picochip (LIB2ADDEH): Remove.
* config/rs6000/aix.h (R_LR, MD_FROB_UPDATE_CONTEXT): Remove.
* config/rs6000/t-darwin (LIB2ADDEH): Remove.
* config/rs6000/darwin-fallback.c: Move to ../libgcc/config/rs6000.
* config/sh/t-sh ($(T)unwind-dw2-Os-4-200.o): Use
$(srcdir)/../libgcc to refer to unwinder sources.
* config/spu/t-spu-elf (LIB2ADDEH): Remove.
* config/t-darwin (LIB2ADDEH): Remove.
* config/t-freebsd (LIB2ADDEH): Remove.
* config/t-libunwind (LIB2ADDEH, LIB2ADDEHSTATIC): Remove.
* config/t-libunwind-elf: Move to ../libgcc/config.
* config/t-linux (LIB2ADDEH): Remove.
* config/t-sol2 (LIB2ADDEH): Remove.
* config/xtensa/t-xtensa (LIB2ADDEH): Remove.
* system.h (MD_FROB_UPDATE_CONTEXT): Poison.
gcc/po:
* EXCLUDES (unwind-c.c, unwind-dw2-fde-darwin.c)
(unwind-dw2-fde-glibc.c, unwind-dw2-fde.c, unwind-dw2-fde.h)
(unwind-dw2.c, unwind-pe.h, unwind-sjlj.c, unwind.h): Remove.
libgcc:
* Makefile.in (LIB2ADDEH, LIB2ADDEHSTATIC, LIB2ADDEHSHARED): New
variables.
(LIBUNWIND, SHLIBUNWIND_LINK, SHLIBUNWIND_INSTALL): New variables.
(LIB2ADDEH, LIB2ADDEHSTATIC, LIB2ADDEHSHARED): Add $(srcdir)/emutls.c.
(install-unwind_h): New target.
(all): Depend on it.
* config.host (unwind_header): New variable.
(*-*-freebsd*): Set tmake_file to t-eh-dw2-dip.
(*-*-linux*, frv-*-*linux*, *-*-kfreebsd*-gnu, *-*-knetbsd*-gnu,
*-*-gnu*): Likewise, also for *-*-kopensolaris*-gnu.
(*-*-solaris2*): Add t-eh-dw2-dip to tmake_file.
(arm*-*-linux*): Add arm/t-bpabi for arm*-*-linux-*eabi.
Set unwind_header.
(arm*-*-uclinux*): Add arm/t-bpabi for arm*-*-uclinux*eabi.
Set unwind_header.
(arm*-*-eabi*, arm*-*-symbianelf*): Add arm/t-bpabi for
arm*-*-eabi*.
Add arm/t-symbian to tmake_file for arm*-*-symbianelf*.
Set unwind_header.
(ia64*-*-elf*): Add ia64/t-eh-ia64 to tmake_file.
(ia64*-*-freebsd*): Likewise.
(ia64*-*-linux*): Add ia64/t-glibc, ia64/t-eh-ia64, t-libunwind to
tmake_file.
Add t-libunwind-elf, ia64/t-glibc-libunwind unless
$with_system_libunwind.
(ia64*-*-hpux*): Set tmake_file.
(ia64-hp-*vms*): Add ia64/t-eh-ia64 to tmake_file.
(picochip-*-*): Set tmake_file.
(rs6000-ibm-aix4.[3456789]*, powerpc-ibm-aix4.[3456789]*): Set
md_unwind_header.
(rs6000-ibm-aix5.1.*, powerpc-ibm-aix5.1.*): Likewise.
(rs6000-ibm-aix[56789].*, powerpc-ibm-aix[56789].*): Likewise.
(s390x-ibm-tpf*): Add t-eh-dw2-dip to tmake_file.
(xtensa*-*-elf*): Set tmake_file.
(xtensa*-*-linux*): Likewise.
* configure.ac: Include ../config/unwind_ipinfo.m4.
Call GCC_CHECK_UNWIND_GETIPINFO.
Link unwind.h to $unwind_header.
* configure: Regenerate.
* emutls.c, unwind-c.c, unwind-compat.c, unwind-compat.h,
unwind-dw2-fde-compat.c, unwind-dw2-fde-dip.c, unwind-dw2-fde.c,
unwind-dw2-fde.h, unwind-dw2.c, unwind-dw2.h, unwind-generic.h,
unwind-pe.h, unwind-sjlj.c, unwind.inc: New files.
* config/unwind-dw2-fde-darwin.c: New file.
* config/arm/libunwind.S, config/arm/pr-support.c,
config/arm/t-bpabi, config/arm/t-symbian, config/arm/unwind-arm.c,
config/arm/unwind-arm.h,: New files.
* config/ia64/fde-glibc.c, config/ia64/fde-vms.c,
config/ia64/t-eh-ia64, config/ia64/t-glibc,
config/ia64/t-glibc-libunwind, config/ia64/t-hpux,
config/ia64/t-vms, config/ia64/unwind-ia64.c,
config/ia64/unwind-ia64.h: New files.
* config/picochip/t-picochip: New file.
* config/rs6000/aix-unwind.h, config/rs6000/darwin-fallback.c: New
files.
* config/rs6000/t-darwin (LIB2ADDEH): Set.
* config/s390/t-tpf (LIB2ADDEH): Remove.
* config/t-darwin (LIB2ADDEH): Set.
* config/t-eh-dw2-dip: New file.
* config/t-libunwind, config/t-libunwind-elf: New files.
* config/t-sol2 (LIB2ADDEH): Remove.
* config/xtensa/t-xtensa: New file.
gcc/ada:
* gcc-interface/Makefile.in (raise-gcc.o): Search
$(srcdir)/../libgcc.
libgo:
* Makefile.am (AM_CFLAGS): Search $(srcdir)/../libgcc.
* Makefile.in: Regenerate.
libjava:
* configure.ac (GCC_UNWIND_INCLUDE): Rename to
LIBGCC_UNWIND_INCLUDE.
Point to $(multi_basedir)/./libjava/../libgcc.
* configure: Regenerate.
* Makefile.am (GCC_UNWIND_INCLUDE): Reflect this.
* Makefile.in: Regenerate.
libobjc:
* Makefile.in (INCLUDES): Search
$(srcdir)/$(MULTISRCTOP)../libgcc.
libstdc++-v3:
* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Point TOPLEVEL_INCLUDES
to $(toplevel_srcdir)/libgcc.
* configure: Regenerate.
From-SVN: r177447
2011-08-05 22:37:48 +08:00
|
|
|
# get unwind* headers from the libgcc dir.
|
|
|
|
#TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/libgcc -I$(toplevel_srcdir)/include'
|
|
|
|
TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/libgcc'
|
2003-08-05 10:00:18 +08:00
|
|
|
|
|
|
|
# Now, export this to all the little Makefiles....
|
|
|
|
AC_SUBST(GLIBCXX_INCLUDES)
|
|
|
|
AC_SUBST(TOPLEVEL_INCLUDES)
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's.
|
|
|
|
dnl (SECTION_FLAGS is done under CHECK_COMPILER_FEATURES.)
|
|
|
|
dnl
|
|
|
|
dnl Substs:
|
|
|
|
dnl OPTIMIZE_CXXFLAGS
|
|
|
|
dnl WARN_FLAGS
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_EXPORT_FLAGS], [
|
2003-08-05 10:00:18 +08:00
|
|
|
# Optimization flags that are probably a good idea for thrill-seekers. Just
|
|
|
|
# uncomment the lines below and make, everything else is ready to go...
|
2006-12-03 01:06:57 +08:00
|
|
|
# Alternatively OPTIMIZE_CXXFLAGS can be set in configure.host.
|
2003-08-05 10:00:18 +08:00
|
|
|
# OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc
|
|
|
|
AC_SUBST(OPTIMIZE_CXXFLAGS)
|
|
|
|
|
2018-07-17 21:18:47 +08:00
|
|
|
WARN_FLAGS="-Wall -Wextra -Wwrite-strings -Wcast-qual -Wabi=2"
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_SUBST(WARN_FLAGS)
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl All installation directory information is determined here.
|
|
|
|
dnl
|
|
|
|
dnl Substs:
|
|
|
|
dnl gxx_install_dir
|
|
|
|
dnl glibcxx_prefixdir
|
|
|
|
dnl glibcxx_toolexecdir
|
|
|
|
dnl glibcxx_toolexeclibdir
|
|
|
|
dnl
|
|
|
|
dnl Assumes cross_compiling bits already done, and with_cross_host in
|
|
|
|
dnl particular.
|
|
|
|
dnl
|
2006-06-21 17:16:03 +08:00
|
|
|
dnl This logic must match gcc/configure.ac's setting of gcc_gxx_include_dir.
|
2006-07-22 04:49:06 +08:00
|
|
|
dnl config/gxx-include-dir.m4 must be kept consistant with this as well.
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
|
2003-08-05 10:00:18 +08:00
|
|
|
glibcxx_toolexecdir=no
|
|
|
|
glibcxx_toolexeclibdir=no
|
|
|
|
glibcxx_prefixdir=$prefix
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for gxx-include-dir])
|
|
|
|
AC_ARG_WITH([gxx-include-dir],
|
|
|
|
AC_HELP_STRING([--with-gxx-include-dir=DIR],
|
2011-03-08 08:04:05 +08:00
|
|
|
[installation directory for include files]),
|
2003-08-05 10:00:18 +08:00
|
|
|
[case "$withval" in
|
|
|
|
yes) AC_MSG_ERROR([Missing directory for --with-gxx-include-dir]) ;;
|
|
|
|
no) gxx_include_dir=no ;;
|
|
|
|
*) gxx_include_dir=$withval ;;
|
|
|
|
esac],
|
|
|
|
[gxx_include_dir=no])
|
|
|
|
AC_MSG_RESULT($gxx_include_dir)
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
|
|
|
|
AC_ARG_ENABLE([version-specific-runtime-libs],
|
|
|
|
AC_HELP_STRING([--enable-version-specific-runtime-libs],
|
2011-03-08 08:04:05 +08:00
|
|
|
[Specify that runtime libraries should be installed in a compiler-specific directory]),
|
2003-08-05 10:00:18 +08:00
|
|
|
[case "$enableval" in
|
|
|
|
yes) version_specific_libs=yes ;;
|
|
|
|
no) version_specific_libs=no ;;
|
|
|
|
*) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);;
|
|
|
|
esac],
|
|
|
|
[version_specific_libs=no])
|
|
|
|
AC_MSG_RESULT($version_specific_libs)
|
|
|
|
|
|
|
|
# Default case for install directory for include files.
|
|
|
|
if test $version_specific_libs = no && test $gxx_include_dir = no; then
|
2006-06-21 17:16:03 +08:00
|
|
|
gxx_include_dir='include/c++/${gcc_version}'
|
2011-03-08 08:04:05 +08:00
|
|
|
if test -n "$with_cross_host" &&
|
|
|
|
test x"$with_cross_host" != x"no"; then
|
2006-06-21 17:16:03 +08:00
|
|
|
gxx_include_dir='${prefix}/${target_alias}/'"$gxx_include_dir"
|
|
|
|
else
|
|
|
|
gxx_include_dir='${prefix}/'"$gxx_include_dir"
|
|
|
|
fi
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Version-specific runtime libs processing.
|
|
|
|
if test $version_specific_libs = yes; then
|
|
|
|
# Need the gcc compiler version to know where to install libraries
|
|
|
|
# and header files if --enable-version-specific-runtime-libs option
|
2004-02-06 07:19:54 +08:00
|
|
|
# is selected. FIXME: these variables are misnamed, there are
|
|
|
|
# no executables installed in _toolexecdir or _toolexeclibdir.
|
2003-08-05 10:00:18 +08:00
|
|
|
if test x"$gxx_include_dir" = x"no"; then
|
2005-03-22 01:40:24 +08:00
|
|
|
gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++'
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
2004-02-06 07:19:54 +08:00
|
|
|
glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
|
2005-03-22 01:40:24 +08:00
|
|
|
glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
|
|
|
|
# Install a library built with a cross compiler in tooldir, not libdir.
|
|
|
|
if test x"$glibcxx_toolexecdir" = x"no"; then
|
|
|
|
if test -n "$with_cross_host" &&
|
|
|
|
test x"$with_cross_host" != x"no"; then
|
2003-08-11 13:26:58 +08:00
|
|
|
glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
|
|
|
|
glibcxx_toolexeclibdir='${toolexecdir}/lib'
|
2003-08-05 10:00:18 +08:00
|
|
|
else
|
2004-02-06 07:19:54 +08:00
|
|
|
glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
|
2003-08-11 13:26:58 +08:00
|
|
|
glibcxx_toolexeclibdir='${libdir}'
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
2003-08-11 13:26:58 +08:00
|
|
|
multi_os_directory=`$CXX -print-multi-os-directory`
|
2003-08-05 10:00:18 +08:00
|
|
|
case $multi_os_directory in
|
|
|
|
.) ;; # Avoid trailing /.
|
|
|
|
*) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for install location])
|
|
|
|
AC_MSG_RESULT($gxx_include_dir)
|
|
|
|
|
|
|
|
AC_SUBST(glibcxx_prefixdir)
|
|
|
|
AC_SUBST(gxx_include_dir)
|
|
|
|
AC_SUBST(glibcxx_toolexecdir)
|
|
|
|
AC_SUBST(glibcxx_toolexeclibdir)
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl GLIBCXX_ENABLE
|
|
|
|
dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING)
|
|
|
|
dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, permit a|b|c)
|
|
|
|
dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, SHELL-CODE-HANDLER)
|
|
|
|
dnl
|
2013-05-22 16:12:45 +08:00
|
|
|
dnl See manual/appendix_porting.html#appendix.porting.build_hacking for
|
|
|
|
dnl documentation.
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl
|
|
|
|
m4_define([GLIBCXX_ENABLE],[dnl
|
|
|
|
m4_define([_g_switch],[--enable-$1])dnl
|
2010-10-04 16:49:59 +08:00
|
|
|
m4_define([_g_help],[AC_HELP_STRING([_g_switch$3],[$4 @<:@default=$2@:>@])])dnl
|
|
|
|
AC_ARG_ENABLE([$1],m4_dquote(_g_help),
|
2003-08-05 10:00:18 +08:00
|
|
|
m4_bmatch([$5],
|
|
|
|
[^permit ],
|
|
|
|
[[
|
|
|
|
case "$enableval" in
|
|
|
|
m4_bpatsubst([$5],[permit ])) ;;
|
|
|
|
*) AC_MSG_ERROR(Unknown argument to enable/disable $1) ;;
|
2011-03-08 08:04:05 +08:00
|
|
|
dnl Idea for future: generate a URL pointing to
|
|
|
|
dnl "onlinedocs/configopts.html#whatever"
|
2003-08-05 10:00:18 +08:00
|
|
|
esac
|
|
|
|
]],
|
|
|
|
[^$],
|
|
|
|
[[
|
|
|
|
case "$enableval" in
|
|
|
|
yes|no) ;;
|
|
|
|
*) AC_MSG_ERROR(Argument to enable/disable $1 must be yes or no) ;;
|
|
|
|
esac
|
|
|
|
]],
|
|
|
|
[[$5]]),
|
|
|
|
[enable_]m4_bpatsubst([$1],-,_)[=][$2])
|
|
|
|
m4_undefine([_g_switch])dnl
|
|
|
|
m4_undefine([_g_help])dnl
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check for ISO/IEC 9899:1999 "C99" support.
|
|
|
|
dnl
|
|
|
|
dnl --enable-c99 defines _GLIBCXX_USE_C99
|
|
|
|
dnl --disable-c99 leaves _GLIBCXX_USE_C99 undefined
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_C99[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'.
|
|
|
|
dnl + If 'C99' stuff is not available, ignores DEFAULT and sets `no'.
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_C99], [
|
2003-08-05 10:00:18 +08:00
|
|
|
GLIBCXX_ENABLE(c99,$1,,[turns on ISO/IEC 9899:1999 support])
|
|
|
|
|
2005-03-24 13:45:45 +08:00
|
|
|
if test x"$enable_c99" = x"yes"; then
|
More fine-grained autoconf checks for C99 library
2015-11-13 Jennifer Yao <jenny.hyphen.fa@gmail.com>
Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/58393
PR libstdc++/61580
* acinclude.m4 (GLIBCXX_ENABLE_C99): Perform tests twice, with
-std=c++11 as well as -std=c++98, and define separate macros for each.
Cache the results of checking for complex math and wide character
functions. Reformat for readability.
* config.h.in: Regenerate.
* include/bits/c++config: Define _GLIBCXX_USE_C99_XXX macros to
either _GLIBCXX98_USE_C99_XXX or _GLIBCXX11_USE_C99_XXX according to
language standard in use.
* config/locale/dragonfly/c_locale.h (std::__convert_from_v): Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* config/locale/generic/c_locale.h (std::__convert_from_v): Likewise.
* config/locale/gnu/c_locale.h (std::__convert_from_v): Likewise.
* config/os/bsd/dragonfly/os_defines.h: Define _GLIBCXX_USE_C99_STDIO,
_GLIBCXX_USE_C99_STDLIB, and _GLIBCXX_USE_C99_WCHAR.
* configure: Regenerate.
* include/bits/basic_string.h: Make numeric conversion functions
depend on _GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, or
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* include/ext/vstring.h: Likewise.
* include/bits/locale_facets.tcc (std::num_put::_M_insert_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* include/bits/locale_facets_nonio.tcc (std::money_put::do_put):
Likewise.
* include/c_compatibility/math.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_MATH.
* include/c_compatibility/wchar.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_global/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_global/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_global/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_std/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_std/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_std/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/tr1/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/tr1/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/stdlib.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* src/c++98/locale_facets.cc (std::__num_base::_S_format_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/18_support/exception_ptr/60612-terminate.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/18_support/exception_ptr/60612-unexpected.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
(test01): Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stof.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoi.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stol.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stold.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoll.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoul.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoull.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
to_wstring.cc: Likewise.
* testsuite/26_numerics/headers/cstdlib/13943.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/26_numerics/headers/cstdlib/types_std_c++0x.cc: Likewise.
* testsuite/lib/libstdc++.exp (check_v3_target_string_conversions):
Change preprocessor #if conditional so that it uses
_GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, and
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* testsuite/tr1/8_c_compatibility/cmath/templates.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_MATH.
* testsuite/tr1/8_c_compatibility/cstdio/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/tr1/8_c_compatibility/cstdlib/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/tr1/8_c_compatibility/cstdlib/types_std_tr1.cc: Likewise.
* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/util/testsuite_fs.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>
From-SVN: r230324
2015-11-13 22:51:25 +08:00
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
|
|
|
|
# Use -std=c++98 (instead of -std=gnu++98) because leaving __STRICT_ANSI__
|
|
|
|
# undefined may cause fake C99 facilities, like pre-standard snprintf,
|
|
|
|
# to be spuriously enabled.
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -std=c++98"
|
|
|
|
ac_save_LIBS="$LIBS"
|
|
|
|
ac_save_gcc_no_link="$gcc_no_link"
|
|
|
|
|
|
|
|
if test x$gcc_no_link != xyes; then
|
|
|
|
# Use -fno-exceptions to that the C driver can link these tests without
|
|
|
|
# hitting undefined references to personality routines.
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
AC_CHECK_LIB(m, sin, [LIBS="$LIBS -lm"], [
|
|
|
|
# Use the default compile-only tests in GCC_TRY_COMPILE_OR_LINK
|
|
|
|
gcc_no_link=yes
|
|
|
|
])
|
|
|
|
fi
|
2005-03-24 13:45:45 +08:00
|
|
|
|
More fine-grained autoconf checks for C99 library
2015-11-13 Jennifer Yao <jenny.hyphen.fa@gmail.com>
Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/58393
PR libstdc++/61580
* acinclude.m4 (GLIBCXX_ENABLE_C99): Perform tests twice, with
-std=c++11 as well as -std=c++98, and define separate macros for each.
Cache the results of checking for complex math and wide character
functions. Reformat for readability.
* config.h.in: Regenerate.
* include/bits/c++config: Define _GLIBCXX_USE_C99_XXX macros to
either _GLIBCXX98_USE_C99_XXX or _GLIBCXX11_USE_C99_XXX according to
language standard in use.
* config/locale/dragonfly/c_locale.h (std::__convert_from_v): Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* config/locale/generic/c_locale.h (std::__convert_from_v): Likewise.
* config/locale/gnu/c_locale.h (std::__convert_from_v): Likewise.
* config/os/bsd/dragonfly/os_defines.h: Define _GLIBCXX_USE_C99_STDIO,
_GLIBCXX_USE_C99_STDLIB, and _GLIBCXX_USE_C99_WCHAR.
* configure: Regenerate.
* include/bits/basic_string.h: Make numeric conversion functions
depend on _GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, or
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* include/ext/vstring.h: Likewise.
* include/bits/locale_facets.tcc (std::num_put::_M_insert_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* include/bits/locale_facets_nonio.tcc (std::money_put::do_put):
Likewise.
* include/c_compatibility/math.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_MATH.
* include/c_compatibility/wchar.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_global/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_global/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_global/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_std/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_std/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_std/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/tr1/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/tr1/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/stdlib.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* src/c++98/locale_facets.cc (std::__num_base::_S_format_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/18_support/exception_ptr/60612-terminate.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/18_support/exception_ptr/60612-unexpected.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
(test01): Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stof.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoi.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stol.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stold.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoll.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoul.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoull.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
to_wstring.cc: Likewise.
* testsuite/26_numerics/headers/cstdlib/13943.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/26_numerics/headers/cstdlib/types_std_c++0x.cc: Likewise.
* testsuite/lib/libstdc++.exp (check_v3_target_string_conversions):
Change preprocessor #if conditional so that it uses
_GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, and
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* testsuite/tr1/8_c_compatibility/cmath/templates.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_MATH.
* testsuite/tr1/8_c_compatibility/cstdio/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/tr1/8_c_compatibility/cstdlib/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/tr1/8_c_compatibility/cstdlib/types_std_tr1.cc: Likewise.
* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/util/testsuite_fs.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>
From-SVN: r230324
2015-11-13 22:51:25 +08:00
|
|
|
# Check for the existence of <math.h> functions used if C99 is enabled.
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <math.h> for C++98])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_math_cxx98, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <math.h>
|
|
|
|
volatile double d1, d2;
|
|
|
|
volatile int i;],
|
|
|
|
[i = fpclassify(d1);
|
|
|
|
i = isfinite(d1);
|
|
|
|
i = isinf(d1);
|
|
|
|
i = isnan(d1);
|
|
|
|
i = isnormal(d1);
|
|
|
|
i = signbit(d1);
|
|
|
|
i = isgreater(d1, d2);
|
|
|
|
i = isgreaterequal(d1, d2);
|
|
|
|
i = isless(d1, d2);
|
|
|
|
i = islessequal(d1, d2);
|
|
|
|
i = islessgreater(d1, d2);
|
|
|
|
i = islessgreater(d1, d2);
|
|
|
|
i = isunordered(d1, d2);
|
|
|
|
], [glibcxx_cv_c99_math_cxx98=yes], [glibcxx_cv_c99_math_cxx98=no])
|
|
|
|
])
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_math_cxx98)
|
|
|
|
if test x"$glibcxx_cv_c99_math_cxx98" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX98_USE_C99_MATH, 1,
|
|
|
|
[Define if C99 functions or macros in <math.h> should be imported
|
|
|
|
in <cmath> in namespace std for C++98.])
|
|
|
|
fi
|
2003-08-05 10:00:18 +08:00
|
|
|
|
More fine-grained autoconf checks for C99 library
2015-11-13 Jennifer Yao <jenny.hyphen.fa@gmail.com>
Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/58393
PR libstdc++/61580
* acinclude.m4 (GLIBCXX_ENABLE_C99): Perform tests twice, with
-std=c++11 as well as -std=c++98, and define separate macros for each.
Cache the results of checking for complex math and wide character
functions. Reformat for readability.
* config.h.in: Regenerate.
* include/bits/c++config: Define _GLIBCXX_USE_C99_XXX macros to
either _GLIBCXX98_USE_C99_XXX or _GLIBCXX11_USE_C99_XXX according to
language standard in use.
* config/locale/dragonfly/c_locale.h (std::__convert_from_v): Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* config/locale/generic/c_locale.h (std::__convert_from_v): Likewise.
* config/locale/gnu/c_locale.h (std::__convert_from_v): Likewise.
* config/os/bsd/dragonfly/os_defines.h: Define _GLIBCXX_USE_C99_STDIO,
_GLIBCXX_USE_C99_STDLIB, and _GLIBCXX_USE_C99_WCHAR.
* configure: Regenerate.
* include/bits/basic_string.h: Make numeric conversion functions
depend on _GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, or
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* include/ext/vstring.h: Likewise.
* include/bits/locale_facets.tcc (std::num_put::_M_insert_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* include/bits/locale_facets_nonio.tcc (std::money_put::do_put):
Likewise.
* include/c_compatibility/math.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_MATH.
* include/c_compatibility/wchar.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_global/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_global/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_global/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_std/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_std/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_std/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/tr1/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/tr1/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/stdlib.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* src/c++98/locale_facets.cc (std::__num_base::_S_format_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/18_support/exception_ptr/60612-terminate.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/18_support/exception_ptr/60612-unexpected.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
(test01): Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stof.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoi.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stol.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stold.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoll.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoul.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoull.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
to_wstring.cc: Likewise.
* testsuite/26_numerics/headers/cstdlib/13943.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/26_numerics/headers/cstdlib/types_std_c++0x.cc: Likewise.
* testsuite/lib/libstdc++.exp (check_v3_target_string_conversions):
Change preprocessor #if conditional so that it uses
_GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, and
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* testsuite/tr1/8_c_compatibility/cmath/templates.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_MATH.
* testsuite/tr1/8_c_compatibility/cstdio/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/tr1/8_c_compatibility/cstdlib/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/tr1/8_c_compatibility/cstdlib/types_std_tr1.cc: Likewise.
* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/util/testsuite_fs.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>
From-SVN: r230324
2015-11-13 22:51:25 +08:00
|
|
|
# Check for the existence of <complex.h> complex math functions.
|
|
|
|
# This is necessary even though libstdc++ uses the builtin versions
|
|
|
|
# of these functions, because if the builtin cannot be used, a reference
|
|
|
|
# to the library function is emitted.
|
|
|
|
AC_CHECK_HEADERS(tgmath.h, ac_has_tgmath_h=yes, ac_has_tgmath_h=no)
|
|
|
|
AC_CHECK_HEADERS(complex.h, ac_has_complex_h=yes, ac_has_complex_h=no)
|
|
|
|
if test x"$ac_has_complex_h" = x"yes"; then
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <complex.h> for C++98])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_complex_cxx98, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <complex.h>
|
|
|
|
typedef __complex__ float float_type;
|
|
|
|
typedef __complex__ double double_type;
|
|
|
|
typedef __complex__ long double ld_type;
|
|
|
|
volatile float_type tmpf;
|
|
|
|
volatile double_type tmpd;
|
|
|
|
volatile ld_type tmpld;
|
|
|
|
volatile float f;
|
|
|
|
volatile double d;
|
|
|
|
volatile long double ld;],
|
|
|
|
[f = cabsf(tmpf);
|
|
|
|
f = cargf(tmpf);
|
|
|
|
tmpf = ccosf(tmpf);
|
|
|
|
tmpf = ccoshf(tmpf);
|
|
|
|
tmpf = cexpf(tmpf);
|
|
|
|
tmpf = clogf(tmpf);
|
|
|
|
tmpf = csinf(tmpf);
|
|
|
|
tmpf = csinhf(tmpf);
|
|
|
|
tmpf = csqrtf(tmpf);
|
|
|
|
tmpf = ctanf(tmpf);
|
|
|
|
tmpf = ctanhf(tmpf);
|
|
|
|
tmpf = cpowf(tmpf, tmpf);
|
|
|
|
tmpf = cprojf(tmpf);
|
|
|
|
d = cabs(tmpd);
|
|
|
|
d = carg(tmpd);
|
|
|
|
tmpd = ccos(tmpd);
|
|
|
|
tmpd = ccosh(tmpd);
|
|
|
|
tmpd = cexp(tmpd);
|
|
|
|
tmpd = clog(tmpd);
|
|
|
|
tmpd = csin(tmpd);
|
|
|
|
tmpd = csinh(tmpd);
|
|
|
|
tmpd = csqrt(tmpd);
|
|
|
|
tmpd = ctan(tmpd);
|
|
|
|
tmpd = ctanh(tmpd);
|
|
|
|
tmpd = cpow(tmpd, tmpd);
|
|
|
|
tmpd = cproj(tmpd);
|
|
|
|
ld = cabsl(tmpld);
|
|
|
|
ld = cargl(tmpld);
|
|
|
|
tmpld = ccosl(tmpld);
|
|
|
|
tmpld = ccoshl(tmpld);
|
|
|
|
tmpld = cexpl(tmpld);
|
|
|
|
tmpld = clogl(tmpld);
|
|
|
|
tmpld = csinl(tmpld);
|
|
|
|
tmpld = csinhl(tmpld);
|
|
|
|
tmpld = csqrtl(tmpld);
|
|
|
|
tmpld = ctanl(tmpld);
|
|
|
|
tmpld = ctanhl(tmpld);
|
|
|
|
tmpld = cpowl(tmpld, tmpld);
|
|
|
|
tmpld = cprojl(tmpld);
|
|
|
|
], [glibcxx_cv_c99_complex_cxx98=yes], [glibcxx_cv_c99_complex_cxx98=no])
|
|
|
|
])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_complex_cxx98)
|
|
|
|
if test x"$glibcxx_cv_c99_complex_cxx98" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX98_USE_C99_COMPLEX, 1,
|
|
|
|
[Define if C99 functions in <complex.h> should be used in
|
|
|
|
<complex> for C++98. Using compiler builtins for these functions
|
|
|
|
requires corresponding C99 library functions to be present.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Check for the existence in <stdio.h> of vscanf, et. al.
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <stdio.h> for C++98])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_stdio_cxx98, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <stdio.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
void foo(char* fmt, ...)
|
|
|
|
{
|
|
|
|
va_list args; va_start(args, fmt);
|
|
|
|
vfscanf(stderr, "%i", args);
|
|
|
|
vscanf("%i", args);
|
|
|
|
vsnprintf(fmt, 0, "%i", args);
|
|
|
|
vsscanf(fmt, "%i", args);
|
|
|
|
snprintf(fmt, 0, "%i");
|
|
|
|
}], [],
|
|
|
|
[glibcxx_cv_c99_stdio_cxx98=yes], [glibcxx_cv_c99_stdio_cxx98=no])
|
2007-10-03 22:16:57 +08:00
|
|
|
])
|
More fine-grained autoconf checks for C99 library
2015-11-13 Jennifer Yao <jenny.hyphen.fa@gmail.com>
Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/58393
PR libstdc++/61580
* acinclude.m4 (GLIBCXX_ENABLE_C99): Perform tests twice, with
-std=c++11 as well as -std=c++98, and define separate macros for each.
Cache the results of checking for complex math and wide character
functions. Reformat for readability.
* config.h.in: Regenerate.
* include/bits/c++config: Define _GLIBCXX_USE_C99_XXX macros to
either _GLIBCXX98_USE_C99_XXX or _GLIBCXX11_USE_C99_XXX according to
language standard in use.
* config/locale/dragonfly/c_locale.h (std::__convert_from_v): Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* config/locale/generic/c_locale.h (std::__convert_from_v): Likewise.
* config/locale/gnu/c_locale.h (std::__convert_from_v): Likewise.
* config/os/bsd/dragonfly/os_defines.h: Define _GLIBCXX_USE_C99_STDIO,
_GLIBCXX_USE_C99_STDLIB, and _GLIBCXX_USE_C99_WCHAR.
* configure: Regenerate.
* include/bits/basic_string.h: Make numeric conversion functions
depend on _GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, or
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* include/ext/vstring.h: Likewise.
* include/bits/locale_facets.tcc (std::num_put::_M_insert_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* include/bits/locale_facets_nonio.tcc (std::money_put::do_put):
Likewise.
* include/c_compatibility/math.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_MATH.
* include/c_compatibility/wchar.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_global/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_global/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_global/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_std/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_std/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_std/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/tr1/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/tr1/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/stdlib.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* src/c++98/locale_facets.cc (std::__num_base::_S_format_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/18_support/exception_ptr/60612-terminate.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/18_support/exception_ptr/60612-unexpected.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
(test01): Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stof.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoi.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stol.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stold.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoll.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoul.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoull.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
to_wstring.cc: Likewise.
* testsuite/26_numerics/headers/cstdlib/13943.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/26_numerics/headers/cstdlib/types_std_c++0x.cc: Likewise.
* testsuite/lib/libstdc++.exp (check_v3_target_string_conversions):
Change preprocessor #if conditional so that it uses
_GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, and
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* testsuite/tr1/8_c_compatibility/cmath/templates.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_MATH.
* testsuite/tr1/8_c_compatibility/cstdio/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/tr1/8_c_compatibility/cstdlib/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/tr1/8_c_compatibility/cstdlib/types_std_tr1.cc: Likewise.
* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/util/testsuite_fs.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>
From-SVN: r230324
2015-11-13 22:51:25 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_stdio_cxx98)
|
|
|
|
if test x"$glibcxx_cv_c99_stdio_cxx98" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX98_USE_C99_STDIO, 1,
|
|
|
|
[Define if C99 functions or macros in <stdio.h> should be imported
|
|
|
|
in <cstdio> in namespace std for C++98.])
|
|
|
|
fi
|
2007-10-03 22:16:57 +08:00
|
|
|
|
2016-02-05 07:47:21 +08:00
|
|
|
# Check for the existence in <stdlib.h> of lldiv_t, et. al.
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <stdlib.h> for C++98])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_stdlib_cxx98, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <stdlib.h>
|
|
|
|
volatile float f;
|
|
|
|
volatile long double ld;
|
|
|
|
volatile unsigned long long ll;
|
|
|
|
lldiv_t mydivt;],
|
|
|
|
[char* tmp;
|
|
|
|
f = strtof("gnu", &tmp);
|
|
|
|
ld = strtold("gnu", &tmp);
|
|
|
|
ll = strtoll("gnu", &tmp, 10);
|
|
|
|
ll = strtoull("gnu", &tmp, 10);
|
|
|
|
ll = llabs(10);
|
|
|
|
mydivt = lldiv(10,1);
|
|
|
|
ll = mydivt.quot;
|
|
|
|
ll = mydivt.rem;
|
|
|
|
ll = atoll("10");
|
|
|
|
_Exit(0);
|
|
|
|
], [glibcxx_cv_c99_stdlib_cxx98=yes], [glibcxx_cv_c99_stdlib_cxx98=no])
|
|
|
|
])
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_stdlib_cxx98)
|
|
|
|
if test x"$glibcxx_cv_c99_stdlib_cxx98" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX98_USE_C99_STDLIB, 1,
|
|
|
|
[Define if C99 functions or macros in <stdlib.h> should be imported
|
|
|
|
in <cstdlib> in namespace std for C++98.])
|
|
|
|
fi
|
|
|
|
|
More fine-grained autoconf checks for C99 library
2015-11-13 Jennifer Yao <jenny.hyphen.fa@gmail.com>
Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/58393
PR libstdc++/61580
* acinclude.m4 (GLIBCXX_ENABLE_C99): Perform tests twice, with
-std=c++11 as well as -std=c++98, and define separate macros for each.
Cache the results of checking for complex math and wide character
functions. Reformat for readability.
* config.h.in: Regenerate.
* include/bits/c++config: Define _GLIBCXX_USE_C99_XXX macros to
either _GLIBCXX98_USE_C99_XXX or _GLIBCXX11_USE_C99_XXX according to
language standard in use.
* config/locale/dragonfly/c_locale.h (std::__convert_from_v): Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* config/locale/generic/c_locale.h (std::__convert_from_v): Likewise.
* config/locale/gnu/c_locale.h (std::__convert_from_v): Likewise.
* config/os/bsd/dragonfly/os_defines.h: Define _GLIBCXX_USE_C99_STDIO,
_GLIBCXX_USE_C99_STDLIB, and _GLIBCXX_USE_C99_WCHAR.
* configure: Regenerate.
* include/bits/basic_string.h: Make numeric conversion functions
depend on _GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, or
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* include/ext/vstring.h: Likewise.
* include/bits/locale_facets.tcc (std::num_put::_M_insert_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* include/bits/locale_facets_nonio.tcc (std::money_put::do_put):
Likewise.
* include/c_compatibility/math.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_MATH.
* include/c_compatibility/wchar.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_global/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_global/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_global/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_std/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_std/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_std/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/tr1/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/tr1/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/stdlib.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* src/c++98/locale_facets.cc (std::__num_base::_S_format_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/18_support/exception_ptr/60612-terminate.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/18_support/exception_ptr/60612-unexpected.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
(test01): Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stof.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoi.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stol.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stold.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoll.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoul.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoull.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
to_wstring.cc: Likewise.
* testsuite/26_numerics/headers/cstdlib/13943.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/26_numerics/headers/cstdlib/types_std_c++0x.cc: Likewise.
* testsuite/lib/libstdc++.exp (check_v3_target_string_conversions):
Change preprocessor #if conditional so that it uses
_GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, and
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* testsuite/tr1/8_c_compatibility/cmath/templates.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_MATH.
* testsuite/tr1/8_c_compatibility/cstdio/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/tr1/8_c_compatibility/cstdlib/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/tr1/8_c_compatibility/cstdlib/types_std_tr1.cc: Likewise.
* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/util/testsuite_fs.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>
From-SVN: r230324
2015-11-13 22:51:25 +08:00
|
|
|
# Check for the existence in <wchar.h> of wcstold, etc.
|
|
|
|
if test x"$ac_has_wchar_h" = xyes &&
|
|
|
|
test x"$ac_has_wctype_h" = xyes; then
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <wchar.h> for C++98])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_wchar_cxx98, [
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>
|
|
|
|
namespace test
|
|
|
|
{
|
|
|
|
using ::wcstold;
|
|
|
|
using ::wcstoll;
|
|
|
|
using ::wcstoull;
|
|
|
|
}
|
|
|
|
], [], [glibcxx_cv_c99_wchar_cxx98=yes], [glibcxx_cv_c99_wchar_cxx98=no])
|
|
|
|
])
|
|
|
|
|
|
|
|
# Checks for wide character functions that may not be present.
|
|
|
|
# Injection of these is wrapped with guard macros.
|
|
|
|
# NB: only put functions here, instead of immediately above, if
|
|
|
|
# absolutely necessary.
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>
|
|
|
|
namespace test { using ::vfwscanf; }], [],
|
|
|
|
[AC_DEFINE(HAVE_VFWSCANF, 1, [Defined if vfwscanf exists.])], [])
|
|
|
|
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>
|
|
|
|
namespace test { using ::vswscanf; }], [],
|
|
|
|
[AC_DEFINE(HAVE_VSWSCANF, 1, [Defined if vswscanf exists.])], [])
|
|
|
|
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>
|
|
|
|
namespace test { using ::vwscanf; }], [],
|
|
|
|
[AC_DEFINE(HAVE_VWSCANF, 1, [Defined if vwscanf exists.])], [])
|
|
|
|
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>
|
|
|
|
namespace test { using ::wcstof; }], [],
|
|
|
|
[AC_DEFINE(HAVE_WCSTOF, 1, [Defined if wcstof exists.])], [])
|
|
|
|
|
|
|
|
AC_TRY_COMPILE([#include <wctype.h>],
|
|
|
|
[wint_t t; int i = iswblank(t);],
|
|
|
|
[AC_DEFINE(HAVE_ISWBLANK, 1, [Defined if iswblank exists.])], [])
|
|
|
|
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_wchar_cxx98)
|
|
|
|
if test x"$glibcxx_cv_c99_wchar_cxx98" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX98_USE_C99_WCHAR, 1,
|
|
|
|
[Define if C99 functions or macros in <wchar.h> should be imported
|
|
|
|
in <cwchar> in namespace std for C++98.])
|
|
|
|
fi
|
|
|
|
fi
|
2003-12-30 03:26:16 +08:00
|
|
|
|
More fine-grained autoconf checks for C99 library
2015-11-13 Jennifer Yao <jenny.hyphen.fa@gmail.com>
Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/58393
PR libstdc++/61580
* acinclude.m4 (GLIBCXX_ENABLE_C99): Perform tests twice, with
-std=c++11 as well as -std=c++98, and define separate macros for each.
Cache the results of checking for complex math and wide character
functions. Reformat for readability.
* config.h.in: Regenerate.
* include/bits/c++config: Define _GLIBCXX_USE_C99_XXX macros to
either _GLIBCXX98_USE_C99_XXX or _GLIBCXX11_USE_C99_XXX according to
language standard in use.
* config/locale/dragonfly/c_locale.h (std::__convert_from_v): Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* config/locale/generic/c_locale.h (std::__convert_from_v): Likewise.
* config/locale/gnu/c_locale.h (std::__convert_from_v): Likewise.
* config/os/bsd/dragonfly/os_defines.h: Define _GLIBCXX_USE_C99_STDIO,
_GLIBCXX_USE_C99_STDLIB, and _GLIBCXX_USE_C99_WCHAR.
* configure: Regenerate.
* include/bits/basic_string.h: Make numeric conversion functions
depend on _GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, or
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* include/ext/vstring.h: Likewise.
* include/bits/locale_facets.tcc (std::num_put::_M_insert_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* include/bits/locale_facets_nonio.tcc (std::money_put::do_put):
Likewise.
* include/c_compatibility/math.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_MATH.
* include/c_compatibility/wchar.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_global/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_global/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_global/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_std/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_std/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_std/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/tr1/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/tr1/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/stdlib.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* src/c++98/locale_facets.cc (std::__num_base::_S_format_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/18_support/exception_ptr/60612-terminate.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/18_support/exception_ptr/60612-unexpected.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
(test01): Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stof.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoi.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stol.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stold.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoll.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoul.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoull.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
to_wstring.cc: Likewise.
* testsuite/26_numerics/headers/cstdlib/13943.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/26_numerics/headers/cstdlib/types_std_c++0x.cc: Likewise.
* testsuite/lib/libstdc++.exp (check_v3_target_string_conversions):
Change preprocessor #if conditional so that it uses
_GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, and
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* testsuite/tr1/8_c_compatibility/cmath/templates.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_MATH.
* testsuite/tr1/8_c_compatibility/cstdio/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/tr1/8_c_compatibility/cstdlib/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/tr1/8_c_compatibility/cstdlib/types_std_tr1.cc: Likewise.
* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/util/testsuite_fs.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>
From-SVN: r230324
2015-11-13 22:51:25 +08:00
|
|
|
# Option parsed, now set things appropriately.
|
|
|
|
if test x"$glibcxx_cv_c99_math_cxx98" = x"no" ||
|
|
|
|
test x"$glibcxx_cv_c99_complex_cxx98" = x"no" ||
|
|
|
|
test x"$glibcxx_cv_c99_stdio_cxx98" = x"no" ||
|
|
|
|
test x"$glibcxx_cv_c99_stdlib_cxx98" = x"no" ||
|
|
|
|
test x"$glibcxx_cv_c99_wchar_cxx98" = x"no"; then
|
|
|
|
enable_c99=no;
|
|
|
|
else
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_C99, 1,
|
|
|
|
[Define if C99 functions or macros from <wchar.h>, <math.h>,
|
|
|
|
<complex.h>, <stdio.h>, and <stdlib.h> can be used or exposed.])
|
|
|
|
fi
|
2005-01-25 23:47:35 +08:00
|
|
|
|
More fine-grained autoconf checks for C99 library
2015-11-13 Jennifer Yao <jenny.hyphen.fa@gmail.com>
Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/58393
PR libstdc++/61580
* acinclude.m4 (GLIBCXX_ENABLE_C99): Perform tests twice, with
-std=c++11 as well as -std=c++98, and define separate macros for each.
Cache the results of checking for complex math and wide character
functions. Reformat for readability.
* config.h.in: Regenerate.
* include/bits/c++config: Define _GLIBCXX_USE_C99_XXX macros to
either _GLIBCXX98_USE_C99_XXX or _GLIBCXX11_USE_C99_XXX according to
language standard in use.
* config/locale/dragonfly/c_locale.h (std::__convert_from_v): Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* config/locale/generic/c_locale.h (std::__convert_from_v): Likewise.
* config/locale/gnu/c_locale.h (std::__convert_from_v): Likewise.
* config/os/bsd/dragonfly/os_defines.h: Define _GLIBCXX_USE_C99_STDIO,
_GLIBCXX_USE_C99_STDLIB, and _GLIBCXX_USE_C99_WCHAR.
* configure: Regenerate.
* include/bits/basic_string.h: Make numeric conversion functions
depend on _GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, or
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* include/ext/vstring.h: Likewise.
* include/bits/locale_facets.tcc (std::num_put::_M_insert_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* include/bits/locale_facets_nonio.tcc (std::money_put::do_put):
Likewise.
* include/c_compatibility/math.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_MATH.
* include/c_compatibility/wchar.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_global/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_global/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_global/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_std/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_std/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_std/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/tr1/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/tr1/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/stdlib.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* src/c++98/locale_facets.cc (std::__num_base::_S_format_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/18_support/exception_ptr/60612-terminate.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/18_support/exception_ptr/60612-unexpected.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
(test01): Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stof.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoi.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stol.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stold.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoll.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoul.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoull.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
to_wstring.cc: Likewise.
* testsuite/26_numerics/headers/cstdlib/13943.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/26_numerics/headers/cstdlib/types_std_c++0x.cc: Likewise.
* testsuite/lib/libstdc++.exp (check_v3_target_string_conversions):
Change preprocessor #if conditional so that it uses
_GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, and
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* testsuite/tr1/8_c_compatibility/cmath/templates.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_MATH.
* testsuite/tr1/8_c_compatibility/cstdio/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/tr1/8_c_compatibility/cstdlib/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/tr1/8_c_compatibility/cstdlib/types_std_tr1.cc: Likewise.
* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/util/testsuite_fs.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>
From-SVN: r230324
2015-11-13 22:51:25 +08:00
|
|
|
gcc_no_link="$ac_save_gcc_no_link"
|
|
|
|
LIBS="$ac_save_LIBS"
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
|
|
|
|
# Use -std=c++11 and test again for C99 library feature in C++11 mode.
|
|
|
|
# For the reasons given above we use -std=c++11 not -std=gnu++11.
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -std=c++11"
|
|
|
|
ac_save_LIBS="$LIBS"
|
|
|
|
ac_save_gcc_no_link="$gcc_no_link"
|
|
|
|
|
|
|
|
if test x$gcc_no_link != xyes; then
|
|
|
|
# Use -fno-exceptions to that the C driver can link these tests without
|
|
|
|
# hitting undefined references to personality routines.
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
AC_CHECK_LIB(m, sin, [LIBS="$LIBS -lm"], [
|
|
|
|
# Use the default compile-only tests in GCC_TRY_COMPILE_OR_LINK
|
|
|
|
gcc_no_link=yes
|
|
|
|
])
|
|
|
|
fi
|
2003-08-05 10:00:18 +08:00
|
|
|
|
More fine-grained autoconf checks for C99 library
2015-11-13 Jennifer Yao <jenny.hyphen.fa@gmail.com>
Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/58393
PR libstdc++/61580
* acinclude.m4 (GLIBCXX_ENABLE_C99): Perform tests twice, with
-std=c++11 as well as -std=c++98, and define separate macros for each.
Cache the results of checking for complex math and wide character
functions. Reformat for readability.
* config.h.in: Regenerate.
* include/bits/c++config: Define _GLIBCXX_USE_C99_XXX macros to
either _GLIBCXX98_USE_C99_XXX or _GLIBCXX11_USE_C99_XXX according to
language standard in use.
* config/locale/dragonfly/c_locale.h (std::__convert_from_v): Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* config/locale/generic/c_locale.h (std::__convert_from_v): Likewise.
* config/locale/gnu/c_locale.h (std::__convert_from_v): Likewise.
* config/os/bsd/dragonfly/os_defines.h: Define _GLIBCXX_USE_C99_STDIO,
_GLIBCXX_USE_C99_STDLIB, and _GLIBCXX_USE_C99_WCHAR.
* configure: Regenerate.
* include/bits/basic_string.h: Make numeric conversion functions
depend on _GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, or
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* include/ext/vstring.h: Likewise.
* include/bits/locale_facets.tcc (std::num_put::_M_insert_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* include/bits/locale_facets_nonio.tcc (std::money_put::do_put):
Likewise.
* include/c_compatibility/math.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_MATH.
* include/c_compatibility/wchar.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_global/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_global/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_global/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_std/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_std/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_std/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/tr1/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/tr1/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/stdlib.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* src/c++98/locale_facets.cc (std::__num_base::_S_format_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/18_support/exception_ptr/60612-terminate.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/18_support/exception_ptr/60612-unexpected.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
(test01): Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stof.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoi.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stol.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stold.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoll.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoul.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoull.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
to_wstring.cc: Likewise.
* testsuite/26_numerics/headers/cstdlib/13943.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/26_numerics/headers/cstdlib/types_std_c++0x.cc: Likewise.
* testsuite/lib/libstdc++.exp (check_v3_target_string_conversions):
Change preprocessor #if conditional so that it uses
_GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, and
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* testsuite/tr1/8_c_compatibility/cmath/templates.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_MATH.
* testsuite/tr1/8_c_compatibility/cstdio/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/tr1/8_c_compatibility/cstdlib/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/tr1/8_c_compatibility/cstdlib/types_std_tr1.cc: Likewise.
* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/util/testsuite_fs.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>
From-SVN: r230324
2015-11-13 22:51:25 +08:00
|
|
|
# Check for the existence of <math.h> functions used if C99 is enabled.
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <math.h> for C++11])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_math_cxx11, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <math.h>
|
|
|
|
volatile double d1, d2;
|
|
|
|
volatile int i;],
|
|
|
|
[i = fpclassify(d1);
|
|
|
|
i = isfinite(d1);
|
|
|
|
i = isinf(d1);
|
|
|
|
i = isnan(d1);
|
|
|
|
i = isnormal(d1);
|
|
|
|
i = signbit(d1);
|
|
|
|
i = isgreater(d1, d2);
|
|
|
|
i = isgreaterequal(d1, d2);
|
|
|
|
i = isless(d1, d2);
|
|
|
|
i = islessequal(d1, d2);
|
|
|
|
i = islessgreater(d1, d2);
|
|
|
|
i = islessgreater(d1, d2);
|
|
|
|
i = isunordered(d1, d2);
|
|
|
|
], [glibcxx_cv_c99_math_cxx11=yes], [glibcxx_cv_c99_math_cxx11=no])
|
|
|
|
])
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_math_cxx11)
|
|
|
|
if test x"$glibcxx_cv_c99_math_cxx11" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX11_USE_C99_MATH, 1,
|
|
|
|
[Define if C99 functions or macros in <math.h> should be imported
|
|
|
|
in <cmath> in namespace std for C++11.])
|
|
|
|
fi
|
2003-08-05 10:00:18 +08:00
|
|
|
|
More fine-grained autoconf checks for C99 library
2015-11-13 Jennifer Yao <jenny.hyphen.fa@gmail.com>
Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/58393
PR libstdc++/61580
* acinclude.m4 (GLIBCXX_ENABLE_C99): Perform tests twice, with
-std=c++11 as well as -std=c++98, and define separate macros for each.
Cache the results of checking for complex math and wide character
functions. Reformat for readability.
* config.h.in: Regenerate.
* include/bits/c++config: Define _GLIBCXX_USE_C99_XXX macros to
either _GLIBCXX98_USE_C99_XXX or _GLIBCXX11_USE_C99_XXX according to
language standard in use.
* config/locale/dragonfly/c_locale.h (std::__convert_from_v): Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* config/locale/generic/c_locale.h (std::__convert_from_v): Likewise.
* config/locale/gnu/c_locale.h (std::__convert_from_v): Likewise.
* config/os/bsd/dragonfly/os_defines.h: Define _GLIBCXX_USE_C99_STDIO,
_GLIBCXX_USE_C99_STDLIB, and _GLIBCXX_USE_C99_WCHAR.
* configure: Regenerate.
* include/bits/basic_string.h: Make numeric conversion functions
depend on _GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, or
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* include/ext/vstring.h: Likewise.
* include/bits/locale_facets.tcc (std::num_put::_M_insert_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* include/bits/locale_facets_nonio.tcc (std::money_put::do_put):
Likewise.
* include/c_compatibility/math.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_MATH.
* include/c_compatibility/wchar.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_global/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_global/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_global/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/c_std/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/c_std/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/c_std/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/cstdio: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
* include/tr1/cstdlib: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* include/tr1/cwchar: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_WCHAR.
* include/tr1/stdlib.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDLIB.
* src/c++98/locale_facets.cc (std::__num_base::_S_format_float):
Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/18_support/exception_ptr/60612-terminate.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/18_support/exception_ptr/60612-unexpected.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
(test01): Replace _GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stof.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoi.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stol.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stold.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoll.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoul.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
stoull.cc: Likewise.
* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
to_wstring.cc: Likewise.
* testsuite/26_numerics/headers/cstdlib/13943.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/26_numerics/headers/cstdlib/types_std_c++0x.cc: Likewise.
* testsuite/lib/libstdc++.exp (check_v3_target_string_conversions):
Change preprocessor #if conditional so that it uses
_GLIBCXX_USE_C99_STDIO, _GLIBCXX_USE_C99_STDLIB, and
_GLIBCXX_USE_C99_WCHAR, instead of _GLIBCXX_USE_C99.
* testsuite/tr1/8_c_compatibility/cmath/templates.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_MATH.
* testsuite/tr1/8_c_compatibility/cstdio/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDIO.
* testsuite/tr1/8_c_compatibility/cstdlib/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_STDLIB.
* testsuite/tr1/8_c_compatibility/cstdlib/types_std_tr1.cc: Likewise.
* testsuite/tr1/8_c_compatibility/cwchar/functions.cc: Replace
_GLIBCXX_USE_C99 with _GLIBCXX_USE_C99_WCHAR.
* testsuite/util/testsuite_fs.h: Replace _GLIBCXX_USE_C99 with
_GLIBCXX_USE_C99_STDIO.
Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>
From-SVN: r230324
2015-11-13 22:51:25 +08:00
|
|
|
# Check for the existence of <complex.h> complex math functions.
|
|
|
|
# This is necessary even though libstdc++ uses the builtin versions
|
|
|
|
# of these functions, because if the builtin cannot be used, a reference
|
|
|
|
# to the library function is emitted.
|
|
|
|
AC_CHECK_HEADERS(tgmath.h, ac_has_tgmath_h=yes, ac_has_tgmath_h=no)
|
|
|
|
AC_CHECK_HEADERS(complex.h, ac_has_complex_h=yes, ac_has_complex_h=no)
|
|
|
|
if test x"$ac_has_complex_h" = x"yes"; then
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <complex.h> for C++11])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_complex_cxx11, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <complex.h>
|
|
|
|
typedef __complex__ float float_type;
|
|
|
|
typedef __complex__ double double_type;
|
|
|
|
typedef __complex__ long double ld_type;
|
|
|
|
volatile float_type tmpf;
|
|
|
|
volatile double_type tmpd;
|
|
|
|
volatile ld_type tmpld;
|
|
|
|
volatile float f;
|
|
|
|
volatile double d;
|
|
|
|
volatile long double ld;],
|
|
|
|
[f = cabsf(tmpf);
|
|
|
|
f = cargf(tmpf);
|
|
|
|
tmpf = ccosf(tmpf);
|
|
|
|
tmpf = ccoshf(tmpf);
|
|
|
|
tmpf = cexpf(tmpf);
|
|
|
|
tmpf = clogf(tmpf);
|
|
|
|
tmpf = csinf(tmpf);
|
|
|
|
tmpf = csinhf(tmpf);
|
|
|
|
tmpf = csqrtf(tmpf);
|
|
|
|
tmpf = ctanf(tmpf);
|
|
|
|
tmpf = ctanhf(tmpf);
|
|
|
|
tmpf = cpowf(tmpf, tmpf);
|
|
|
|
tmpf = cprojf(tmpf);
|
|
|
|
d = cabs(tmpd);
|
|
|
|
d = carg(tmpd);
|
|
|
|
tmpd = ccos(tmpd);
|
|
|
|
tmpd = ccosh(tmpd);
|
|
|
|
tmpd = cexp(tmpd);
|
|
|
|
tmpd = clog(tmpd);
|
|
|
|
tmpd = csin(tmpd);
|
|
|
|
tmpd = csinh(tmpd);
|
|
|
|
tmpd = csqrt(tmpd);
|
|
|
|
tmpd = ctan(tmpd);
|
|
|
|
tmpd = ctanh(tmpd);
|
|
|
|
tmpd = cpow(tmpd, tmpd);
|
|
|
|
tmpd = cproj(tmpd);
|
|
|
|
ld = cabsl(tmpld);
|
|
|
|
ld = cargl(tmpld);
|
|
|
|
tmpld = ccosl(tmpld);
|
|
|
|
tmpld = ccoshl(tmpld);
|
|
|
|
tmpld = cexpl(tmpld);
|
|
|
|
tmpld = clogl(tmpld);
|
|
|
|
tmpld = csinl(tmpld);
|
|
|
|
tmpld = csinhl(tmpld);
|
|
|
|
tmpld = csqrtl(tmpld);
|
|
|
|
tmpld = ctanl(tmpld);
|
|
|
|
tmpld = ctanhl(tmpld);
|
|
|
|
tmpld = cpowl(tmpld, tmpld);
|
|
|
|
tmpld = cprojl(tmpld);
|
|
|
|
], [glibcxx_cv_c99_complex_cxx11=yes], [glibcxx_cv_c99_complex_cxx11=no])
|
|
|
|
])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_complex_cxx11)
|
|
|
|
if test x"$glibcxx_cv_c99_complex_cxx11" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX11_USE_C99_COMPLEX, 1,
|
|
|
|
[Define if C99 functions in <complex.h> should be used in
|
|
|
|
<complex> for C++11. Using compiler builtins for these functions
|
|
|
|
requires corresponding C99 library functions to be present.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Check for the existence in <stdio.h> of vscanf, et. al.
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <stdio.h> for C++11])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_stdio_cxx11, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <stdio.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
void foo(char* fmt, ...)
|
|
|
|
{
|
|
|
|
va_list args; va_start(args, fmt);
|
|
|
|
vfscanf(stderr, "%i", args);
|
|
|
|
vscanf("%i", args);
|
|
|
|
vsnprintf(fmt, 0, "%i", args);
|
|
|
|
vsscanf(fmt, "%i", args);
|
|
|
|
snprintf(fmt, 0, "%i");
|
|
|
|
}], [],
|
|
|
|
[glibcxx_cv_c99_stdio_cxx11=yes], [glibcxx_cv_c99_stdio_cxx11=no])
|
|
|
|
])
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_stdio_cxx11)
|
|
|
|
if test x"$glibcxx_cv_c99_stdio_cxx11" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX11_USE_C99_STDIO, 1,
|
|
|
|
[Define if C99 functions or macros in <stdio.h> should be imported
|
|
|
|
in <cstdio> in namespace std for C++11.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Check for the existence in <stdlib.h> of lldiv_t, et. al.
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <stdlib.h> for C++11])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_stdlib_cxx11, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <stdlib.h>
|
|
|
|
volatile float f;
|
|
|
|
volatile long double ld;
|
|
|
|
volatile unsigned long long ll;
|
|
|
|
lldiv_t mydivt;],
|
|
|
|
[char* tmp;
|
|
|
|
f = strtof("gnu", &tmp);
|
|
|
|
ld = strtold("gnu", &tmp);
|
|
|
|
ll = strtoll("gnu", &tmp, 10);
|
|
|
|
ll = strtoull("gnu", &tmp, 10);
|
|
|
|
ll = llabs(10);
|
|
|
|
mydivt = lldiv(10,1);
|
|
|
|
ll = mydivt.quot;
|
|
|
|
ll = mydivt.rem;
|
|
|
|
ll = atoll("10");
|
|
|
|
_Exit(0);
|
|
|
|
], [glibcxx_cv_c99_stdlib_cxx11=yes], [glibcxx_cv_c99_stdlib_cxx11=no])
|
|
|
|
])
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_stdlib_cxx11)
|
|
|
|
if test x"$glibcxx_cv_c99_stdlib_cxx11" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX11_USE_C99_STDLIB, 1,
|
|
|
|
[Define if C99 functions or macros in <stdlib.h> should be imported
|
|
|
|
in <cstdlib> in namespace std for C++11.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Check for the existence in <wchar.h> of wcstold, etc.
|
|
|
|
if test x"$ac_has_wchar_h" = xyes &&
|
|
|
|
test x"$ac_has_wctype_h" = xyes; then
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <wchar.h> for C++11])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_wchar_cxx11, [
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>
|
|
|
|
namespace test
|
|
|
|
{
|
|
|
|
using ::wcstold;
|
|
|
|
using ::wcstoll;
|
|
|
|
using ::wcstoull;
|
|
|
|
}
|
|
|
|
], [], [glibcxx_cv_c99_wchar_cxx11=yes], [glibcxx_cv_c99_wchar_cxx11=no])
|
|
|
|
])
|
|
|
|
|
|
|
|
# Checks for wide character functions that may not be present.
|
|
|
|
# Injection of these is wrapped with guard macros.
|
|
|
|
# NB: only put functions here, instead of immediately above, if
|
|
|
|
# absolutely necessary.
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>
|
|
|
|
namespace test { using ::vfwscanf; }], [],
|
|
|
|
[AC_DEFINE(HAVE_VFWSCANF, 1, [Defined if vfwscanf exists.])], [])
|
|
|
|
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>
|
|
|
|
namespace test { using ::vswscanf; }], [],
|
|
|
|
[AC_DEFINE(HAVE_VSWSCANF, 1, [Defined if vswscanf exists.])], [])
|
|
|
|
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>
|
|
|
|
namespace test { using ::vwscanf; }], [],
|
|
|
|
[AC_DEFINE(HAVE_VWSCANF, 1, [Defined if vwscanf exists.])], [])
|
|
|
|
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>
|
|
|
|
namespace test { using ::wcstof; }], [],
|
|
|
|
[AC_DEFINE(HAVE_WCSTOF, 1, [Defined if wcstof exists.])], [])
|
|
|
|
|
|
|
|
AC_TRY_COMPILE([#include <wctype.h>],
|
|
|
|
[wint_t t; int i = iswblank(t);],
|
|
|
|
[AC_DEFINE(HAVE_ISWBLANK, 1, [Defined if iswblank exists.])], [])
|
|
|
|
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_wchar_cxx11)
|
|
|
|
if test x"$glibcxx_cv_c99_wchar_cxx11" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX11_USE_C99_WCHAR, 1,
|
|
|
|
[Define if C99 functions or macros in <wchar.h> should be imported
|
|
|
|
in <cwchar> in namespace std for C++11.])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
gcc_no_link="$ac_save_gcc_no_link"
|
|
|
|
LIBS="$ac_save_LIBS"
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
2011-03-08 08:04:05 +08:00
|
|
|
fi
|
2005-03-24 13:45:45 +08:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([for fully enabled ISO C99 support])
|
|
|
|
AC_MSG_RESULT($enable_c99)
|
2000-05-10 04:25:13 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2008-07-16 07:23:23 +08:00
|
|
|
dnl
|
2009-01-15 22:01:04 +08:00
|
|
|
dnl Check for clock_gettime, nanosleep and sched_yield, used in the
|
2012-08-10 06:45:20 +08:00
|
|
|
dnl implementation of 20.11.7 [time.clock], and 30.3.2 [thread.thread.this]
|
|
|
|
dnl in the C++11 standard.
|
2008-07-16 07:23:23 +08:00
|
|
|
dnl
|
2009-01-15 22:01:04 +08:00
|
|
|
dnl --enable-libstdcxx-time
|
|
|
|
dnl --enable-libstdcxx-time=yes
|
|
|
|
dnl checks for the availability of monotonic and realtime clocks,
|
2012-08-10 06:45:20 +08:00
|
|
|
dnl nanosleep and sched_yield in libc and libposix4 and, if needed,
|
|
|
|
dnl links in the latter.
|
2009-01-15 22:01:04 +08:00
|
|
|
dnl --enable-libstdcxx-time=rt
|
2012-08-10 06:45:20 +08:00
|
|
|
dnl also searches (and, if needed, links) librt. Note that this is
|
2013-05-22 16:12:45 +08:00
|
|
|
dnl not always desirable because, in glibc 2.16 and earlier, for
|
|
|
|
dnl example, in turn it triggers the linking of libpthread too,
|
|
|
|
dnl which activates locking,
|
2008-08-24 17:37:07 +08:00
|
|
|
dnl a large overhead for single-thread programs.
|
2009-01-15 22:01:04 +08:00
|
|
|
dnl --enable-libstdcxx-time=no
|
|
|
|
dnl --disable-libstdcxx-time
|
2008-08-24 08:25:22 +08:00
|
|
|
dnl disables the checks completely
|
|
|
|
dnl
|
2012-10-11 07:12:10 +08:00
|
|
|
dnl N.B. Darwin provides nanosleep but doesn't support the whole POSIX
|
|
|
|
dnl Timers option, so doesn't define _POSIX_TIMERS. Because the test
|
|
|
|
dnl below fails Darwin unconditionally defines _GLIBCXX_USE_NANOSLEEP in
|
|
|
|
dnl os_defines.h and also defines _GLIBCXX_USE_SCHED_YIELD.
|
|
|
|
dnl
|
2009-01-15 22:01:04 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
|
2008-08-24 08:25:22 +08:00
|
|
|
|
2013-05-22 16:12:45 +08:00
|
|
|
GLIBCXX_ENABLE(libstdcxx-time,auto,[[[=KIND]]],
|
2008-08-24 08:25:22 +08:00
|
|
|
[use KIND for check type],
|
|
|
|
[permit yes|no|rt])
|
2008-07-16 07:23:23 +08:00
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
2008-08-01 22:06:38 +08:00
|
|
|
ac_save_LIBS="$LIBS"
|
|
|
|
|
2010-04-06 09:27:44 +08:00
|
|
|
ac_has_clock_monotonic=no
|
|
|
|
ac_has_clock_realtime=no
|
2013-05-22 16:12:45 +08:00
|
|
|
ac_has_nanosleep=no
|
|
|
|
ac_has_sched_yield=no
|
|
|
|
|
|
|
|
if test x"$enable_libstdcxx_time" = x"auto"; then
|
|
|
|
|
|
|
|
case "${target_os}" in
|
|
|
|
cygwin*)
|
|
|
|
ac_has_nanosleep=yes
|
|
|
|
;;
|
|
|
|
darwin*)
|
|
|
|
ac_has_nanosleep=yes
|
|
|
|
ac_has_sched_yield=yes
|
|
|
|
;;
|
|
|
|
gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
|
|
|
|
AC_MSG_CHECKING([for at least GNU libc 2.17])
|
|
|
|
AC_TRY_COMPILE(
|
|
|
|
[#include <features.h>],
|
|
|
|
[
|
|
|
|
#if ! __GLIBC_PREREQ(2, 17)
|
|
|
|
#error
|
|
|
|
#endif
|
|
|
|
],
|
|
|
|
[glibcxx_glibc217=yes], [glibcxx_glibc217=no])
|
|
|
|
AC_MSG_RESULT($glibcxx_glibc217)
|
|
|
|
|
|
|
|
if test x"$glibcxx_glibc217" = x"yes"; then
|
|
|
|
ac_has_clock_monotonic=yes
|
|
|
|
ac_has_clock_realtime=yes
|
|
|
|
fi
|
|
|
|
ac_has_nanosleep=yes
|
|
|
|
ac_has_sched_yield=yes
|
|
|
|
;;
|
2017-11-21 14:22:13 +08:00
|
|
|
freebsd*|netbsd*|dragonfly*|rtems*)
|
2013-05-22 16:12:45 +08:00
|
|
|
ac_has_clock_monotonic=yes
|
|
|
|
ac_has_clock_realtime=yes
|
|
|
|
ac_has_nanosleep=yes
|
|
|
|
ac_has_sched_yield=yes
|
|
|
|
;;
|
|
|
|
openbsd*)
|
|
|
|
ac_has_clock_monotonic=yes
|
|
|
|
ac_has_clock_realtime=yes
|
|
|
|
ac_has_nanosleep=yes
|
|
|
|
;;
|
|
|
|
solaris*)
|
|
|
|
GLIBCXX_LIBS="$GLIBCXX_LIBS -lrt"
|
|
|
|
ac_has_clock_monotonic=yes
|
|
|
|
ac_has_clock_realtime=yes
|
|
|
|
ac_has_nanosleep=yes
|
|
|
|
ac_has_sched_yield=yes
|
|
|
|
;;
|
|
|
|
esac
|
2008-08-01 22:06:38 +08:00
|
|
|
|
2013-05-22 16:12:45 +08:00
|
|
|
elif test x"$enable_libstdcxx_time" != x"no"; then
|
2008-08-01 22:06:38 +08:00
|
|
|
|
2009-01-15 22:01:04 +08:00
|
|
|
if test x"$enable_libstdcxx_time" = x"rt"; then
|
2008-08-24 08:25:22 +08:00
|
|
|
AC_SEARCH_LIBS(clock_gettime, [rt posix4])
|
2009-01-15 22:01:04 +08:00
|
|
|
AC_SEARCH_LIBS(nanosleep, [rt posix4])
|
2008-08-24 08:25:22 +08:00
|
|
|
else
|
|
|
|
AC_SEARCH_LIBS(clock_gettime, [posix4])
|
2009-01-15 22:01:04 +08:00
|
|
|
AC_SEARCH_LIBS(nanosleep, [posix4])
|
2008-08-24 08:25:22 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
case "$ac_cv_search_clock_gettime" in
|
|
|
|
-l*) GLIBCXX_LIBS=$ac_cv_search_clock_gettime
|
2009-01-15 22:01:04 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
case "$ac_cv_search_nanosleep" in
|
|
|
|
-l*) GLIBCXX_LIBS="$GLIBCXX_LIBS $ac_cv_search_nanosleep"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
AC_SEARCH_LIBS(sched_yield, [rt posix4])
|
|
|
|
|
|
|
|
case "$ac_cv_search_sched_yield" in
|
|
|
|
-lposix4*)
|
|
|
|
GLIBCXX_LIBS="$GLIBCXX_LIBS $ac_cv_search_sched_yield"
|
2013-05-22 16:12:45 +08:00
|
|
|
ac_has_sched_yield=yes
|
2009-01-15 22:01:04 +08:00
|
|
|
;;
|
|
|
|
-lrt*)
|
|
|
|
if test x"$enable_libstdcxx_time" = x"rt"; then
|
2011-03-08 08:04:05 +08:00
|
|
|
GLIBCXX_LIBS="$GLIBCXX_LIBS $ac_cv_search_sched_yield"
|
2013-05-22 16:12:45 +08:00
|
|
|
ac_has_sched_yield=yes
|
2009-01-15 22:01:04 +08:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
*)
|
2013-05-22 16:12:45 +08:00
|
|
|
ac_has_sched_yield=yes
|
2009-01-15 22:01:04 +08:00
|
|
|
;;
|
2008-08-24 08:25:22 +08:00
|
|
|
esac
|
|
|
|
|
|
|
|
AC_CHECK_HEADERS(unistd.h, ac_has_unistd_h=yes, ac_has_unistd_h=no)
|
|
|
|
|
|
|
|
if test x"$ac_has_unistd_h" = x"yes"; then
|
|
|
|
AC_MSG_CHECKING([for monotonic clock])
|
|
|
|
AC_TRY_LINK(
|
2011-03-08 08:04:05 +08:00
|
|
|
[#include <unistd.h>
|
|
|
|
#include <time.h>
|
|
|
|
],
|
|
|
|
[#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK)
|
|
|
|
timespec tp;
|
|
|
|
#endif
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &tp);
|
|
|
|
], [ac_has_clock_monotonic=yes], [ac_has_clock_monotonic=no])
|
|
|
|
|
|
|
|
AC_MSG_RESULT($ac_has_clock_monotonic)
|
|
|
|
|
2008-08-24 08:25:22 +08:00
|
|
|
AC_MSG_CHECKING([for realtime clock])
|
|
|
|
AC_TRY_LINK(
|
2011-03-08 08:04:05 +08:00
|
|
|
[#include <unistd.h>
|
|
|
|
#include <time.h>
|
|
|
|
],
|
|
|
|
[#if _POSIX_TIMERS > 0
|
|
|
|
timespec tp;
|
|
|
|
#endif
|
|
|
|
clock_gettime(CLOCK_REALTIME, &tp);
|
|
|
|
], [ac_has_clock_realtime=yes], [ac_has_clock_realtime=no])
|
2008-08-24 08:25:22 +08:00
|
|
|
|
|
|
|
AC_MSG_RESULT($ac_has_clock_realtime)
|
|
|
|
|
2009-01-15 22:01:04 +08:00
|
|
|
AC_MSG_CHECKING([for nanosleep])
|
|
|
|
AC_TRY_LINK(
|
2011-03-08 08:04:05 +08:00
|
|
|
[#include <unistd.h>
|
|
|
|
#include <time.h>
|
|
|
|
],
|
|
|
|
[#if _POSIX_TIMERS > 0
|
|
|
|
timespec tp;
|
|
|
|
#endif
|
|
|
|
nanosleep(&tp, 0);
|
|
|
|
], [ac_has_nanosleep=yes], [ac_has_nanosleep=no])
|
2009-01-15 22:01:04 +08:00
|
|
|
|
|
|
|
AC_MSG_RESULT($ac_has_nanosleep)
|
|
|
|
fi
|
2008-08-24 08:25:22 +08:00
|
|
|
fi
|
|
|
|
|
chrono.cc: If _GLIBCXX_USE_CLOCK_GETTIME_SYSCALL, include unistd.h and sys/syscall.h.
* src/c++11/chrono.cc: If _GLIBCXX_USE_CLOCK_GETTIME_SYSCALL,
include unistd.h and sys/syscall.h. If _GLIBCXX_COMPATIBILITY_CXX0X,
don't define system_clock::is_steady, system_clock::now() and
steady_clock::is_steady.
(std::chrono::system_clock::now()): If
_GLIBCXX_USE_CLOCK_GETTIME_SYSCALL, call
syscall (SYS_clock_gettime, ...) instead of clock_gettime (...).
(std::chrono::system_clock::now()): Likewise. Add weak attribute
if _GLIBCXX_COMPATIBILITY_CXX0X and compatibility-chrono.cc will
be non-empty.
* src/Makefile.am (cxx11_sources): Add compatibility-chrono.cc.
(compatibility-chrono.lo, compatibility-chrono.o): New goals.
* src/c++11/compatibility-chrono.cc: New file.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_TIME): On linux*, check for
syscall (SYS_clock_gettime, CLOCK_MONOTONIC, &tp).
* testsuite/util/testsuite_abi.cc (check_version): Add
GLIBCXX_3.4.20 version and make it the latest.
* config/abi/pre/gnu.ver (_ZNSt6chrono12steady_clock3nowEv): Export
also @@GLIBCXX_3.4.19. Move all symbols so far added for GCC 4.9 to
@@GLIBCXX_3.4.20 instead.
* config/abi/post/i386-linux-gnu/baseline_symbols.txt: Regenerated.
* config/abi/post/s390x-linux-gnu/baseline_symbols.txt: Regenerated.
* config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt:
Regenerated.
* config/abi/post/powerpc64-linux-gnu/32/baseline_symbols.txt:
Regenerated.
* config/abi/post/x86_64-linux-gnu/baseline_symbols.txt: Regenerated.
* config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt:
Regenerated.
* config/abi/post/powerpc-linux-gnu/baseline_symbols.txt: Regenerated.
* config/abi/post/s390-linux-gnu/baseline_symbols.txt: Regenerated.
* config/abi/post/i486-linux-gnu/baseline_symbols.txt: Regenerated.
* config/abi/post/solaris2.10/baseline_symbols.txt: Regenerated.
* config/abi/post/solaris2.10/amd64/baseline_symbols.txt: Regenerated.
* config/abi/post/solaris2.10/sparcv9/baseline_symbols.txt:
Regenerated.
* config/abi/post/solaris2.9/baseline_symbols.txt: Regenerated.
* config/abi/post/solaris2.9/sparcv9/baseline_symbols.txt: Regenerated.
* config.h.in: Regenerated.
* src/Makefile.in: Regenerated.
* configure: Regenerated.
From-SVN: r199307
2013-05-25 02:08:42 +08:00
|
|
|
if test x"$ac_has_clock_monotonic" != x"yes"; then
|
|
|
|
case ${target_os} in
|
|
|
|
linux*)
|
|
|
|
AC_MSG_CHECKING([for clock_gettime syscall])
|
|
|
|
AC_TRY_COMPILE(
|
|
|
|
[#include <unistd.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <sys/syscall.h>
|
|
|
|
],
|
|
|
|
[#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK)
|
|
|
|
timespec tp;
|
|
|
|
#endif
|
|
|
|
syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &tp);
|
|
|
|
syscall(SYS_clock_gettime, CLOCK_REALTIME, &tp);
|
|
|
|
], [ac_has_clock_monotonic_syscall=yes], [ac_has_clock_monotonic_syscall=no])
|
|
|
|
AC_MSG_RESULT($ac_has_clock_monotonic_syscall)
|
|
|
|
if test x"$ac_has_clock_monotonic_syscall" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_CLOCK_GETTIME_SYSCALL, 1,
|
|
|
|
[ Defined if clock_gettime syscall has monotonic and realtime clock support. ])
|
|
|
|
ac_has_clock_monotonic=yes
|
|
|
|
ac_has_clock_realtime=yes
|
|
|
|
fi;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
2008-07-16 07:23:23 +08:00
|
|
|
if test x"$ac_has_clock_monotonic" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_CLOCK_MONOTONIC, 1,
|
|
|
|
[ Defined if clock_gettime has monotonic clock support. ])
|
|
|
|
fi
|
2008-08-01 22:06:38 +08:00
|
|
|
|
2008-07-16 07:23:23 +08:00
|
|
|
if test x"$ac_has_clock_realtime" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_CLOCK_REALTIME, 1,
|
|
|
|
[ Defined if clock_gettime has realtime clock support. ])
|
|
|
|
fi
|
2008-08-01 22:06:38 +08:00
|
|
|
|
2013-05-22 16:12:45 +08:00
|
|
|
if test x"$ac_has_sched_yield" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_SCHED_YIELD, 1,
|
|
|
|
[ Defined if sched_yield is available. ])
|
|
|
|
fi
|
|
|
|
|
2009-01-15 22:01:04 +08:00
|
|
|
if test x"$ac_has_nanosleep" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_NANOSLEEP, 1,
|
|
|
|
[ Defined if nanosleep is available. ])
|
2012-11-24 06:11:23 +08:00
|
|
|
else
|
|
|
|
AC_MSG_CHECKING([for sleep])
|
|
|
|
AC_TRY_COMPILE([#include <unistd.h>],
|
|
|
|
[sleep(1)],
|
|
|
|
[ac_has_sleep=yes],[ac_has_sleep=no])
|
|
|
|
if test x"$ac_has_sleep" = x"yes"; then
|
|
|
|
AC_DEFINE(HAVE_SLEEP,1, [Defined if sleep exists.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_has_sleep)
|
|
|
|
AC_MSG_CHECKING([for usleep])
|
|
|
|
AC_TRY_COMPILE([#include <unistd.h>],
|
|
|
|
[sleep(1);
|
|
|
|
usleep(100);],
|
|
|
|
[ac_has_usleep=yes],[ac_has_usleep=no])
|
|
|
|
if test x"$ac_has_usleep" = x"yes"; then
|
|
|
|
AC_DEFINE(HAVE_USLEEP,1, [Defined if usleep exists.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_has_usleep)
|
2009-01-15 22:01:04 +08:00
|
|
|
fi
|
|
|
|
|
2012-12-20 22:36:56 +08:00
|
|
|
if test x"$ac_has_nanosleep$ac_has_sleep" = x"nono"; then
|
|
|
|
AC_MSG_CHECKING([for Sleep])
|
|
|
|
AC_TRY_COMPILE([#include <windows.h>],
|
|
|
|
[Sleep(1)],
|
|
|
|
[ac_has_win32_sleep=yes],[ac_has_win32_sleep=no])
|
|
|
|
if test x"$ac_has_win32_sleep" = x"yes"; then
|
|
|
|
AC_DEFINE(HAVE_WIN32_SLEEP,1, [Defined if Sleep exists.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_has_win32_sleep)
|
|
|
|
fi
|
|
|
|
|
2008-08-01 22:06:38 +08:00
|
|
|
AC_SUBST(GLIBCXX_LIBS)
|
|
|
|
|
2008-07-16 07:23:23 +08:00
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
2008-08-01 22:06:38 +08:00
|
|
|
LIBS="$ac_save_LIBS"
|
2008-07-16 07:23:23 +08:00
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
|
|
|
dnl
|
2012-08-10 06:45:20 +08:00
|
|
|
dnl Check for gettimeofday, used in the implementation of 20.11.7
|
|
|
|
dnl [time.clock] in the C++11 standard.
|
2008-07-16 07:23:23 +08:00
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_GETTIMEOFDAY], [
|
2011-03-08 08:04:05 +08:00
|
|
|
|
2008-08-24 08:25:22 +08:00
|
|
|
AC_MSG_CHECKING([for gettimeofday])
|
|
|
|
|
2008-07-16 07:23:23 +08:00
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
2011-03-08 08:04:05 +08:00
|
|
|
|
2008-07-16 07:23:23 +08:00
|
|
|
ac_has_gettimeofday=no;
|
|
|
|
AC_CHECK_HEADERS(sys/time.h, ac_has_sys_time_h=yes, ac_has_sys_time_h=no)
|
|
|
|
if test x"$ac_has_sys_time_h" = x"yes"; then
|
|
|
|
AC_MSG_CHECKING([for gettimeofday])
|
2008-08-24 08:25:22 +08:00
|
|
|
GCC_TRY_COMPILE_OR_LINK([#include <sys/time.h>],
|
2008-07-16 07:23:23 +08:00
|
|
|
[timeval tv; gettimeofday(&tv, 0);],
|
|
|
|
[ac_has_gettimeofday=yes], [ac_has_gettimeofday=no])
|
2011-03-08 08:04:05 +08:00
|
|
|
|
2008-07-16 07:23:23 +08:00
|
|
|
AC_MSG_RESULT($ac_has_gettimeofday)
|
|
|
|
fi
|
2011-03-08 08:04:05 +08:00
|
|
|
|
2008-07-16 07:23:23 +08:00
|
|
|
if test x"$ac_has_gettimeofday" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_GETTIMEOFDAY, 1,
|
|
|
|
[ Defined if gettimeofday is available. ])
|
|
|
|
fi
|
2011-03-08 08:04:05 +08:00
|
|
|
|
2008-07-16 07:23:23 +08:00
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
2006-01-26 03:29:40 +08:00
|
|
|
dnl
|
|
|
|
dnl Check for ISO/IEC 9899:1999 "C99" support to ISO/IEC DTR 19768 "TR1"
|
|
|
|
dnl facilities in Chapter 8, "C compatibility".
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_C99_TR1], [
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
|
2007-11-09 23:54:33 +08:00
|
|
|
# Use -std=c++98 because the default (-std=gnu++98) leaves __STRICT_ANSI__
|
|
|
|
# undefined and fake C99 facilities may be spuriously enabled.
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -std=c++98"
|
|
|
|
|
2006-01-26 03:29:40 +08:00
|
|
|
# Check for the existence of <complex.h> complex math functions used
|
|
|
|
# by tr1/complex.
|
|
|
|
AC_CHECK_HEADERS(complex.h, ac_has_complex_h=yes, ac_has_complex_h=no)
|
|
|
|
ac_c99_complex_tr1=no;
|
|
|
|
if test x"$ac_has_complex_h" = x"yes"; then
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support to TR1 in <complex.h>])
|
|
|
|
AC_TRY_COMPILE([#include <complex.h>],
|
2011-03-08 08:04:05 +08:00
|
|
|
[typedef __complex__ float float_type; float_type tmpf;
|
|
|
|
cacosf(tmpf);
|
|
|
|
casinf(tmpf);
|
|
|
|
catanf(tmpf);
|
|
|
|
cacoshf(tmpf);
|
|
|
|
casinhf(tmpf);
|
|
|
|
catanhf(tmpf);
|
2006-01-26 03:29:40 +08:00
|
|
|
typedef __complex__ double double_type; double_type tmpd;
|
2011-03-08 08:04:05 +08:00
|
|
|
cacos(tmpd);
|
|
|
|
casin(tmpd);
|
|
|
|
catan(tmpd);
|
|
|
|
cacosh(tmpd);
|
|
|
|
casinh(tmpd);
|
|
|
|
catanh(tmpd);
|
2006-01-26 03:29:40 +08:00
|
|
|
typedef __complex__ long double ld_type; ld_type tmpld;
|
2011-03-08 08:04:05 +08:00
|
|
|
cacosl(tmpld);
|
|
|
|
casinl(tmpld);
|
|
|
|
catanl(tmpld);
|
|
|
|
cacoshl(tmpld);
|
|
|
|
casinhl(tmpld);
|
|
|
|
catanhl(tmpld);
|
2006-01-26 03:29:40 +08:00
|
|
|
],[ac_c99_complex_tr1=yes], [ac_c99_complex_tr1=no])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_c99_complex_tr1)
|
|
|
|
if test x"$ac_c99_complex_tr1" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_C99_COMPLEX_TR1, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if C99 functions in <complex.h> should be used in
|
|
|
|
<tr1/complex>. Using compiler builtins for these functions
|
2006-01-26 03:29:40 +08:00
|
|
|
requires corresponding C99 library functions to be present.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Check for the existence of <ctype.h> functions.
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support to TR1 in <ctype.h>])
|
2008-04-22 04:55:19 +08:00
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_ctype_tr1, [
|
2006-01-26 03:29:40 +08:00
|
|
|
AC_TRY_COMPILE([#include <ctype.h>],
|
2011-03-08 08:04:05 +08:00
|
|
|
[int ch;
|
|
|
|
int ret;
|
|
|
|
ret = isblank(ch);
|
2008-08-12 18:41:26 +08:00
|
|
|
],[glibcxx_cv_c99_ctype_tr1=yes],
|
|
|
|
[glibcxx_cv_c99_ctype_tr1=no])
|
2006-01-26 03:29:40 +08:00
|
|
|
])
|
2008-04-22 04:55:19 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_ctype_tr1)
|
|
|
|
if test x"$glibcxx_cv_c99_ctype_tr1" = x"yes"; then
|
2006-01-26 03:29:40 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_USE_C99_CTYPE_TR1, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if C99 functions in <ctype.h> should be imported in
|
2006-01-26 03:29:40 +08:00
|
|
|
<tr1/cctype> in namespace std::tr1.])
|
|
|
|
fi
|
|
|
|
|
2006-01-26 19:29:20 +08:00
|
|
|
# Check for the existence of <fenv.h> functions.
|
|
|
|
AC_CHECK_HEADERS(fenv.h, ac_has_fenv_h=yes, ac_has_fenv_h=no)
|
|
|
|
ac_c99_fenv_tr1=no;
|
|
|
|
if test x"$ac_has_fenv_h" = x"yes"; then
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support to TR1 in <fenv.h>])
|
|
|
|
AC_TRY_COMPILE([#include <fenv.h>],
|
2011-03-08 08:04:05 +08:00
|
|
|
[int except, mode;
|
|
|
|
fexcept_t* pflag;
|
|
|
|
fenv_t* penv;
|
|
|
|
int ret;
|
|
|
|
ret = feclearexcept(except);
|
|
|
|
ret = fegetexceptflag(pflag, except);
|
|
|
|
ret = feraiseexcept(except);
|
|
|
|
ret = fesetexceptflag(pflag, except);
|
|
|
|
ret = fetestexcept(except);
|
|
|
|
ret = fegetround();
|
|
|
|
ret = fesetround(mode);
|
|
|
|
ret = fegetenv(penv);
|
|
|
|
ret = feholdexcept(penv);
|
|
|
|
ret = fesetenv(penv);
|
|
|
|
ret = feupdateenv(penv);
|
2006-01-26 19:29:20 +08:00
|
|
|
],[ac_c99_fenv_tr1=yes], [ac_c99_fenv_tr1=no])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_c99_fenv_tr1)
|
|
|
|
if test x"$ac_c99_fenv_tr1" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_C99_FENV_TR1, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if C99 functions in <fenv.h> should be imported in
|
2006-01-26 19:29:20 +08:00
|
|
|
<tr1/cfenv> in namespace std::tr1.])
|
|
|
|
fi
|
|
|
|
|
2006-01-30 03:02:31 +08:00
|
|
|
# Check for the existence of <stdint.h> types.
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support to TR1 in <stdint.h>])
|
2008-04-22 04:55:19 +08:00
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_stdint_tr1, [
|
2008-08-18 23:02:10 +08:00
|
|
|
AC_TRY_COMPILE([#define __STDC_LIMIT_MACROS
|
2011-03-08 08:04:05 +08:00
|
|
|
#define __STDC_CONSTANT_MACROS
|
|
|
|
#include <stdint.h>],
|
|
|
|
[typedef int8_t my_int8_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int8_t i8 = INT8_MIN;
|
|
|
|
i8 = INT8_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef int16_t my_int16_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int16_t i16 = INT16_MIN;
|
|
|
|
i16 = INT16_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef int32_t my_int32_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int32_t i32 = INT32_MIN;
|
|
|
|
i32 = INT32_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef int64_t my_int64_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int64_t i64 = INT64_MIN;
|
|
|
|
i64 = INT64_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef int_fast8_t my_int_fast8_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int_fast8_t if8 = INT_FAST8_MIN;
|
|
|
|
if8 = INT_FAST8_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef int_fast16_t my_int_fast16_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int_fast16_t if16 = INT_FAST16_MIN;
|
|
|
|
if16 = INT_FAST16_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef int_fast32_t my_int_fast32_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int_fast32_t if32 = INT_FAST32_MIN;
|
|
|
|
if32 = INT_FAST32_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef int_fast64_t my_int_fast64_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int_fast64_t if64 = INT_FAST64_MIN;
|
|
|
|
if64 = INT_FAST64_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef int_least8_t my_int_least8_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int_least8_t il8 = INT_LEAST8_MIN;
|
|
|
|
il8 = INT_LEAST8_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef int_least16_t my_int_least16_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int_least16_t il16 = INT_LEAST16_MIN;
|
|
|
|
il16 = INT_LEAST16_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef int_least32_t my_int_least32_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int_least32_t il32 = INT_LEAST32_MIN;
|
|
|
|
il32 = INT_LEAST32_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef int_least64_t my_int_least64_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_int_least64_t il64 = INT_LEAST64_MIN;
|
|
|
|
il64 = INT_LEAST64_MAX;
|
2006-01-30 03:02:31 +08:00
|
|
|
typedef intmax_t my_intmax_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_intmax_t im = INTMAX_MAX;
|
|
|
|
im = INTMAX_MIN;
|
2006-01-30 03:02:31 +08:00
|
|
|
typedef intptr_t my_intptr_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_intptr_t ip = INTPTR_MAX;
|
|
|
|
ip = INTPTR_MIN;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint8_t my_uint8_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint8_t ui8 = UINT8_MAX;
|
|
|
|
ui8 = UINT8_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint16_t my_uint16_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint16_t ui16 = UINT16_MAX;
|
|
|
|
ui16 = UINT16_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint32_t my_uint32_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint32_t ui32 = UINT32_MAX;
|
|
|
|
ui32 = UINT32_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint64_t my_uint64_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint64_t ui64 = UINT64_MAX;
|
|
|
|
ui64 = UINT64_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint_fast8_t my_uint_fast8_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint_fast8_t uif8 = UINT_FAST8_MAX;
|
|
|
|
uif8 = UINT_FAST8_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint_fast16_t my_uint_fast16_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint_fast16_t uif16 = UINT_FAST16_MAX;
|
|
|
|
uif16 = UINT_FAST16_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint_fast32_t my_uint_fast32_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint_fast32_t uif32 = UINT_FAST32_MAX;
|
|
|
|
uif32 = UINT_FAST32_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint_fast64_t my_uint_fast64_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint_fast64_t uif64 = UINT_FAST64_MAX;
|
|
|
|
uif64 = UINT_FAST64_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint_least8_t my_uint_least8_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint_least8_t uil8 = UINT_LEAST8_MAX;
|
|
|
|
uil8 = UINT_LEAST8_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint_least16_t my_uint_least16_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint_least16_t uil16 = UINT_LEAST16_MAX;
|
|
|
|
uil16 = UINT_LEAST16_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint_least32_t my_uint_least32_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint_least32_t uil32 = UINT_LEAST32_MAX;
|
|
|
|
uil32 = UINT_LEAST32_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
typedef uint_least64_t my_uint_least64_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uint_least64_t uil64 = UINT_LEAST64_MAX;
|
|
|
|
uil64 = UINT_LEAST64_MAX;
|
2006-01-30 03:02:31 +08:00
|
|
|
typedef uintmax_t my_uintmax_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uintmax_t uim = UINTMAX_MAX;
|
|
|
|
uim = UINTMAX_MAX;
|
2006-01-30 03:02:31 +08:00
|
|
|
typedef uintptr_t my_uintptr_t;
|
2008-08-18 23:02:10 +08:00
|
|
|
my_uintptr_t uip = UINTPTR_MAX;
|
|
|
|
uip = UINTPTR_MAX;
|
2008-08-12 18:41:26 +08:00
|
|
|
],[glibcxx_cv_c99_stdint_tr1=yes],
|
|
|
|
[glibcxx_cv_c99_stdint_tr1=no])
|
2006-01-30 03:02:31 +08:00
|
|
|
])
|
2008-04-22 04:55:19 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_stdint_tr1)
|
|
|
|
if test x"$glibcxx_cv_c99_stdint_tr1" = x"yes"; then
|
2006-01-30 03:02:31 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_USE_C99_STDINT_TR1, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if C99 types in <stdint.h> should be imported in
|
2006-01-30 03:02:31 +08:00
|
|
|
<tr1/cstdint> in namespace std::tr1.])
|
|
|
|
fi
|
|
|
|
|
2006-02-07 21:14:03 +08:00
|
|
|
# Check for the existence of <math.h> functions.
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support to TR1 in <math.h>])
|
2008-04-22 04:55:19 +08:00
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_math_tr1, [
|
2006-02-07 21:14:03 +08:00
|
|
|
AC_TRY_COMPILE([#include <math.h>],
|
2011-03-08 08:04:05 +08:00
|
|
|
[typedef double_t my_double_t;
|
|
|
|
typedef float_t my_float_t;
|
|
|
|
acosh(0.0);
|
|
|
|
acoshf(0.0f);
|
|
|
|
acoshl(0.0l);
|
|
|
|
asinh(0.0);
|
|
|
|
asinhf(0.0f);
|
|
|
|
asinhl(0.0l);
|
|
|
|
atanh(0.0);
|
|
|
|
atanhf(0.0f);
|
|
|
|
atanhl(0.0l);
|
|
|
|
cbrt(0.0);
|
|
|
|
cbrtf(0.0f);
|
|
|
|
cbrtl(0.0l);
|
|
|
|
copysign(0.0, 0.0);
|
|
|
|
copysignf(0.0f, 0.0f);
|
|
|
|
copysignl(0.0l, 0.0l);
|
|
|
|
erf(0.0);
|
|
|
|
erff(0.0f);
|
|
|
|
erfl(0.0l);
|
|
|
|
erfc(0.0);
|
|
|
|
erfcf(0.0f);
|
|
|
|
erfcl(0.0l);
|
|
|
|
exp2(0.0);
|
|
|
|
exp2f(0.0f);
|
|
|
|
exp2l(0.0l);
|
|
|
|
expm1(0.0);
|
|
|
|
expm1f(0.0f);
|
|
|
|
expm1l(0.0l);
|
|
|
|
fdim(0.0, 0.0);
|
|
|
|
fdimf(0.0f, 0.0f);
|
|
|
|
fdiml(0.0l, 0.0l);
|
|
|
|
fma(0.0, 0.0, 0.0);
|
|
|
|
fmaf(0.0f, 0.0f, 0.0f);
|
|
|
|
fmal(0.0l, 0.0l, 0.0l);
|
|
|
|
fmax(0.0, 0.0);
|
|
|
|
fmaxf(0.0f, 0.0f);
|
|
|
|
fmaxl(0.0l, 0.0l);
|
|
|
|
fmin(0.0, 0.0);
|
|
|
|
fminf(0.0f, 0.0f);
|
|
|
|
fminl(0.0l, 0.0l);
|
|
|
|
hypot(0.0, 0.0);
|
|
|
|
hypotf(0.0f, 0.0f);
|
|
|
|
hypotl(0.0l, 0.0l);
|
|
|
|
ilogb(0.0);
|
|
|
|
ilogbf(0.0f);
|
|
|
|
ilogbl(0.0l);
|
|
|
|
lgamma(0.0);
|
|
|
|
lgammaf(0.0f);
|
|
|
|
lgammal(0.0l);
|
2017-01-10 01:15:58 +08:00
|
|
|
#ifndef __APPLE__ /* see below */
|
2011-03-08 08:04:05 +08:00
|
|
|
llrint(0.0);
|
|
|
|
llrintf(0.0f);
|
|
|
|
llrintl(0.0l);
|
|
|
|
llround(0.0);
|
|
|
|
llroundf(0.0f);
|
|
|
|
llroundl(0.0l);
|
2017-01-10 01:15:58 +08:00
|
|
|
#endif
|
2011-03-08 08:04:05 +08:00
|
|
|
log1p(0.0);
|
|
|
|
log1pf(0.0f);
|
|
|
|
log1pl(0.0l);
|
|
|
|
log2(0.0);
|
|
|
|
log2f(0.0f);
|
|
|
|
log2l(0.0l);
|
|
|
|
logb(0.0);
|
|
|
|
logbf(0.0f);
|
|
|
|
logbl(0.0l);
|
|
|
|
lrint(0.0);
|
|
|
|
lrintf(0.0f);
|
|
|
|
lrintl(0.0l);
|
|
|
|
lround(0.0);
|
|
|
|
lroundf(0.0f);
|
|
|
|
lroundl(0.0l);
|
|
|
|
nan(0);
|
|
|
|
nanf(0);
|
|
|
|
nanl(0);
|
|
|
|
nearbyint(0.0);
|
|
|
|
nearbyintf(0.0f);
|
|
|
|
nearbyintl(0.0l);
|
|
|
|
nextafter(0.0, 0.0);
|
|
|
|
nextafterf(0.0f, 0.0f);
|
|
|
|
nextafterl(0.0l, 0.0l);
|
|
|
|
nexttoward(0.0, 0.0);
|
|
|
|
nexttowardf(0.0f, 0.0f);
|
|
|
|
nexttowardl(0.0l, 0.0l);
|
|
|
|
remainder(0.0, 0.0);
|
|
|
|
remainderf(0.0f, 0.0f);
|
|
|
|
remainderl(0.0l, 0.0l);
|
|
|
|
remquo(0.0, 0.0, 0);
|
|
|
|
remquof(0.0f, 0.0f, 0);
|
|
|
|
remquol(0.0l, 0.0l, 0);
|
|
|
|
rint(0.0);
|
|
|
|
rintf(0.0f);
|
|
|
|
rintl(0.0l);
|
|
|
|
round(0.0);
|
|
|
|
roundf(0.0f);
|
|
|
|
roundl(0.0l);
|
|
|
|
scalbln(0.0, 0l);
|
|
|
|
scalblnf(0.0f, 0l);
|
|
|
|
scalblnl(0.0l, 0l);
|
|
|
|
scalbn(0.0, 0);
|
|
|
|
scalbnf(0.0f, 0);
|
|
|
|
scalbnl(0.0l, 0);
|
|
|
|
tgamma(0.0);
|
|
|
|
tgammaf(0.0f);
|
|
|
|
tgammal(0.0l);
|
|
|
|
trunc(0.0);
|
|
|
|
truncf(0.0f);
|
|
|
|
truncl(0.0l);
|
2008-04-22 04:55:19 +08:00
|
|
|
],[glibcxx_cv_c99_math_tr1=yes], [glibcxx_cv_c99_math_tr1=no])
|
2006-02-07 21:14:03 +08:00
|
|
|
])
|
2008-04-22 04:55:19 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_math_tr1)
|
|
|
|
if test x"$glibcxx_cv_c99_math_tr1" = x"yes"; then
|
2006-02-07 21:14:03 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_USE_C99_MATH_TR1, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if C99 functions or macros in <math.h> should be imported
|
|
|
|
in <tr1/cmath> in namespace std::tr1.])
|
2017-01-10 01:15:58 +08:00
|
|
|
|
|
|
|
case "${target_os}" in
|
|
|
|
darwin*)
|
|
|
|
AC_MSG_CHECKING([for ISO C99 rounding functions in <math.h>])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_c99_math_llround, [
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],
|
|
|
|
[llrint(0.0);
|
|
|
|
llrintf(0.0f);
|
|
|
|
llrintl(0.0l);
|
|
|
|
llround(0.0);
|
|
|
|
llroundf(0.0f);
|
|
|
|
llroundl(0.0l);
|
|
|
|
],
|
|
|
|
[glibcxx_cv_c99_math_llround=yes],
|
|
|
|
[glibcxx_cv_c99_math_llround=no])
|
|
|
|
])
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_c99_math_llround)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
if test x"$glibcxx_cv_c99_math_llround" = x"no"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_NO_C99_ROUNDING_FUNCS, 1,
|
|
|
|
[Define if C99 llrint and llround functions are missing from <math.h>.])
|
|
|
|
fi
|
2006-02-07 21:14:03 +08:00
|
|
|
fi
|
|
|
|
|
2006-01-30 23:32:09 +08:00
|
|
|
# Check for the existence of <inttypes.h> functions (NB: doesn't make
|
2008-09-08 00:41:06 +08:00
|
|
|
# sense if the glibcxx_cv_c99_stdint_tr1 check fails, per C99, 7.8/1).
|
2006-01-30 23:32:09 +08:00
|
|
|
ac_c99_inttypes_tr1=no;
|
2008-04-22 04:55:19 +08:00
|
|
|
if test x"$glibcxx_cv_c99_stdint_tr1" = x"yes"; then
|
2006-01-30 23:32:09 +08:00
|
|
|
AC_MSG_CHECKING([for ISO C99 support to TR1 in <inttypes.h>])
|
|
|
|
AC_TRY_COMPILE([#include <inttypes.h>],
|
2011-03-08 08:04:05 +08:00
|
|
|
[intmax_t i, numer, denom, base;
|
|
|
|
const char* s;
|
|
|
|
char** endptr;
|
|
|
|
intmax_t ret = imaxabs(i);
|
|
|
|
imaxdiv_t dret = imaxdiv(numer, denom);
|
|
|
|
ret = strtoimax(s, endptr, base);
|
|
|
|
uintmax_t uret = strtoumax(s, endptr, base);
|
|
|
|
],[ac_c99_inttypes_tr1=yes], [ac_c99_inttypes_tr1=no])
|
2006-01-30 23:32:09 +08:00
|
|
|
fi
|
2006-01-30 22:17:49 +08:00
|
|
|
AC_MSG_RESULT($ac_c99_inttypes_tr1)
|
|
|
|
if test x"$ac_c99_inttypes_tr1" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_C99_INTTYPES_TR1, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if C99 functions in <inttypes.h> should be imported in
|
|
|
|
<tr1/cinttypes> in namespace std::tr1.])
|
2006-01-30 22:17:49 +08:00
|
|
|
fi
|
|
|
|
|
2015-01-16 23:02:35 +08:00
|
|
|
# Check for the existence of wchar_t <inttypes.h> functions (NB: doesn't
|
2008-09-08 00:41:06 +08:00
|
|
|
# make sense if the glibcxx_cv_c99_stdint_tr1 check fails, per C99, 7.8/1).
|
|
|
|
ac_c99_inttypes_wchar_t_tr1=no;
|
|
|
|
if test x"$glibcxx_cv_c99_stdint_tr1" = x"yes"; then
|
|
|
|
AC_MSG_CHECKING([for wchar_t ISO C99 support to TR1 in <inttypes.h>])
|
|
|
|
AC_TRY_COMPILE([#include <inttypes.h>],
|
2011-03-08 08:04:05 +08:00
|
|
|
[intmax_t base;
|
2008-09-08 00:41:06 +08:00
|
|
|
const wchar_t* s;
|
2011-03-08 08:04:05 +08:00
|
|
|
wchar_t** endptr;
|
|
|
|
intmax_t ret = wcstoimax(s, endptr, base);
|
|
|
|
uintmax_t uret = wcstoumax(s, endptr, base);
|
|
|
|
],[ac_c99_inttypes_wchar_t_tr1=yes],
|
2008-09-08 00:41:06 +08:00
|
|
|
[ac_c99_inttypes_wchar_t_tr1=no])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_c99_inttypes_wchar_t_tr1)
|
|
|
|
if test x"$ac_c99_inttypes_wchar_t_tr1" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_C99_INTTYPES_WCHAR_T_TR1, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if wchar_t C99 functions in <inttypes.h> should be
|
2008-09-08 00:41:06 +08:00
|
|
|
imported in <tr1/cinttypes> in namespace std::tr1.])
|
|
|
|
fi
|
|
|
|
|
2011-03-08 08:04:05 +08:00
|
|
|
# Check for the existence of the <stdbool.h> header.
|
2006-02-27 02:42:29 +08:00
|
|
|
AC_CHECK_HEADERS(stdbool.h)
|
|
|
|
|
2011-11-07 16:46:58 +08:00
|
|
|
# Check for the existence of the <stdalign.h> header.
|
|
|
|
AC_CHECK_HEADERS(stdalign.h)
|
|
|
|
|
2007-11-09 23:54:33 +08:00
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
2006-01-26 03:29:40 +08:00
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
2015-09-04 19:13:34 +08:00
|
|
|
dnl
|
|
|
|
dnl Check for uchar.h and usability.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_UCHAR_H], [
|
|
|
|
|
|
|
|
# Test uchar.h.
|
|
|
|
AC_CHECK_HEADERS(uchar.h, ac_has_uchar_h=yes, ac_has_uchar_h=no)
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -std=c++11"
|
|
|
|
|
|
|
|
if test x"$ac_has_uchar_h" = x"yes"; then
|
|
|
|
AC_MSG_CHECKING([for ISO C11 support for <uchar.h>])
|
|
|
|
AC_TRY_COMPILE([#include <uchar.h>
|
|
|
|
#ifdef __STDC_UTF_16__
|
|
|
|
long i = __STDC_UTF_16__;
|
|
|
|
#endif
|
|
|
|
#ifdef __STDC_UTF_32__
|
|
|
|
long j = __STDC_UTF_32__;
|
|
|
|
#endif
|
|
|
|
namespace test
|
|
|
|
{
|
|
|
|
using ::c16rtomb;
|
|
|
|
using ::c32rtomb;
|
|
|
|
using ::mbrtoc16;
|
|
|
|
using ::mbrtoc32;
|
|
|
|
}
|
|
|
|
],
|
|
|
|
[], [ac_c11_uchar_cxx11=yes], [ac_c11_uchar_cxx11=no])
|
|
|
|
else
|
|
|
|
ac_c11_uchar_cxx11=no
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_c11_uchar_cxx11)
|
|
|
|
if test x"$ac_c11_uchar_cxx11" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_C11_UCHAR_CXX11, 1,
|
|
|
|
[Define if C11 functions in <uchar.h> should be imported into
|
|
|
|
namespace std in <cuchar>.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2006-06-10 07:37:28 +08:00
|
|
|
dnl
|
2018-10-16 22:49:29 +08:00
|
|
|
dnl Check whether "/dev/random" and "/dev/urandom" are available for
|
|
|
|
dnl class std::random_device from C++ 2011 [rand.device], and
|
2006-06-10 07:37:28 +08:00
|
|
|
dnl random_device of "TR1" (Chapter 5.1, "Random number generation").
|
|
|
|
dnl
|
2018-10-16 22:49:29 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_DEV_RANDOM], [
|
2006-06-10 07:37:28 +08:00
|
|
|
|
2018-10-16 22:49:29 +08:00
|
|
|
AC_MSG_CHECKING([for "/dev/random" and "/dev/urandom" for std::random_device])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_dev_random, [
|
2008-08-25 07:47:35 +08:00
|
|
|
if test -r /dev/random && test -r /dev/urandom; then
|
2018-10-16 22:49:29 +08:00
|
|
|
## For MSys environment the test above is detected as false-positive
|
|
|
|
## on mingw-targets. So disable it explicitly for them.
|
2013-03-01 18:23:21 +08:00
|
|
|
case ${target_os} in
|
2018-10-16 22:49:29 +08:00
|
|
|
*mingw*) glibcxx_cv_dev_random=no ;;
|
|
|
|
*) glibcxx_cv_dev_random=yes ;;
|
2013-03-01 18:23:21 +08:00
|
|
|
esac
|
2008-08-25 07:47:35 +08:00
|
|
|
else
|
2018-10-16 22:49:29 +08:00
|
|
|
glibcxx_cv_dev_random=no;
|
2008-08-25 07:47:35 +08:00
|
|
|
fi
|
2006-06-10 07:37:28 +08:00
|
|
|
])
|
2018-10-16 22:49:29 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_dev_random)
|
2008-08-25 07:47:35 +08:00
|
|
|
|
2018-10-16 22:49:29 +08:00
|
|
|
if test x"$glibcxx_cv_dev_random" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_DEV_RANDOM, 1,
|
|
|
|
[Define if /dev/random and /dev/urandom are available for
|
|
|
|
std::random_device.])
|
2006-06-10 07:37:28 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_USE_RANDOM_TR1, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if /dev/random and /dev/urandom are available for
|
2006-06-10 07:37:28 +08:00
|
|
|
the random_device of TR1 (Chapter 5.1).])
|
|
|
|
fi
|
|
|
|
|
|
|
|
])
|
2006-01-26 03:29:40 +08:00
|
|
|
|
2008-08-07 07:17:05 +08:00
|
|
|
dnl
|
2010-07-27 18:36:50 +08:00
|
|
|
dnl Compute the EOF, SEEK_CUR, and SEEK_END integer constants.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_COMPUTE_STDIO_INTEGER_CONSTANTS], [
|
|
|
|
|
2010-07-28 01:41:47 +08:00
|
|
|
AC_CACHE_CHECK([for the value of EOF], glibcxx_cv_stdio_eof, [
|
2010-07-27 18:36:50 +08:00
|
|
|
AC_COMPUTE_INT([glibcxx_cv_stdio_eof], [[EOF]],
|
2011-03-08 08:04:05 +08:00
|
|
|
[#include <stdio.h>],
|
|
|
|
[AC_MSG_ERROR([computing EOF failed])])
|
2010-07-27 18:36:50 +08:00
|
|
|
])
|
|
|
|
AC_DEFINE_UNQUOTED(_GLIBCXX_STDIO_EOF, $glibcxx_cv_stdio_eof,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define to the value of the EOF integer constant.])
|
2010-07-27 18:36:50 +08:00
|
|
|
|
2010-07-28 01:41:47 +08:00
|
|
|
AC_CACHE_CHECK([for the value of SEEK_CUR], glibcxx_cv_stdio_seek_cur, [
|
2010-07-27 18:36:50 +08:00
|
|
|
AC_COMPUTE_INT([glibcxx_cv_stdio_seek_cur], [[SEEK_CUR]],
|
2011-03-08 08:04:05 +08:00
|
|
|
[#include <stdio.h>],
|
|
|
|
[AC_MSG_ERROR([computing SEEK_CUR failed])])
|
2010-07-27 18:36:50 +08:00
|
|
|
])
|
|
|
|
AC_DEFINE_UNQUOTED(_GLIBCXX_STDIO_SEEK_CUR, $glibcxx_cv_stdio_seek_cur,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define to the value of the SEEK_CUR integer constant.])
|
2010-07-27 18:36:50 +08:00
|
|
|
|
2010-07-28 01:41:47 +08:00
|
|
|
AC_CACHE_CHECK([for the value of SEEK_END], glibcxx_cv_stdio_seek_end, [
|
2010-07-27 18:36:50 +08:00
|
|
|
AC_COMPUTE_INT([glibcxx_cv_stdio_seek_end], [[SEEK_END]],
|
2011-03-08 08:04:05 +08:00
|
|
|
[#include <stdio.h>],
|
|
|
|
[AC_MSG_ERROR([computing SEEK_END failed])])
|
2010-07-27 18:36:50 +08:00
|
|
|
])
|
|
|
|
AC_DEFINE_UNQUOTED(_GLIBCXX_STDIO_SEEK_END, $glibcxx_cv_stdio_seek_end,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define to the value of the SEEK_END integer constant.])
|
2008-08-07 07:17:05 +08:00
|
|
|
])
|
|
|
|
|
2012-03-02 15:13:55 +08:00
|
|
|
dnl
|
|
|
|
dnl Check whether required C++ overloads are present in <stdio.h>.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_STDIO_PROTO], [
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
2016-10-01 02:28:53 +08:00
|
|
|
# Use C++11 because a conforming <stdio.h> won't define gets for C++14,
|
|
|
|
# and we don't need a declaration for C++14 anyway.
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -std=gnu++11"
|
2012-03-02 15:13:55 +08:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([for gets declaration])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_gets, [
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
|
|
|
|
[#include <stdio.h>
|
|
|
|
namespace test
|
|
|
|
{
|
|
|
|
using ::gets;
|
|
|
|
}
|
|
|
|
])],
|
|
|
|
[glibcxx_cv_gets=yes],
|
|
|
|
[glibcxx_cv_gets=no]
|
|
|
|
)])
|
|
|
|
|
|
|
|
if test $glibcxx_cv_gets = yes; then
|
2016-10-01 02:28:53 +08:00
|
|
|
AC_DEFINE(HAVE_GETS, 1, [Define if gets is available in <stdio.h> before C++14.])
|
2012-03-02 15:13:55 +08:00
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_gets)
|
|
|
|
|
2016-10-01 02:28:53 +08:00
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
2012-03-02 15:13:55 +08:00
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
2015-11-24 21:15:43 +08:00
|
|
|
dnl
|
2016-11-22 00:09:47 +08:00
|
|
|
dnl Check whether required C++11 overloads for floating point and integral
|
|
|
|
dnl types are present in <math.h>.
|
2015-11-24 21:15:43 +08:00
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_MATH11_PROTO], [
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -std=c++11"
|
|
|
|
|
|
|
|
case "$host" in
|
|
|
|
*-*-solaris2.*)
|
2016-11-22 00:09:47 +08:00
|
|
|
# Solaris 12 Build 86, Solaris 11.3 SRU 3.6, and Solaris 10 Patch
|
|
|
|
# 11996[67]-02 introduced the C++11 <math.h> floating point overloads.
|
|
|
|
AC_MSG_CHECKING([for C++11 <math.h> floating point overloads])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_math11_fp_overload, [
|
2015-11-24 21:15:43 +08:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
|
|
|
|
[#include <math.h>
|
|
|
|
#undef isfinite
|
|
|
|
namespace std {
|
|
|
|
inline bool isfinite(float __x)
|
|
|
|
{ return __builtin_isfinite(__x); }
|
|
|
|
}
|
|
|
|
])],
|
2016-11-22 00:09:47 +08:00
|
|
|
[glibcxx_cv_math11_fp_overload=no],
|
|
|
|
[glibcxx_cv_math11_fp_overload=yes]
|
2015-11-24 21:15:43 +08:00
|
|
|
)])
|
|
|
|
|
|
|
|
# autoheader cannot handle indented templates.
|
2016-11-22 00:09:47 +08:00
|
|
|
AH_VERBATIM([__CORRECT_ISO_CPP11_MATH_H_PROTO_FP],
|
|
|
|
[/* Define if all C++11 floating point overloads are available in <math.h>. */
|
2015-11-24 21:15:43 +08:00
|
|
|
#if __cplusplus >= 201103L
|
2016-11-22 00:09:47 +08:00
|
|
|
#undef __CORRECT_ISO_CPP11_MATH_H_PROTO_FP
|
2015-11-24 21:15:43 +08:00
|
|
|
#endif])
|
|
|
|
|
2016-11-22 00:09:47 +08:00
|
|
|
if test $glibcxx_cv_math11_fp_overload = yes; then
|
|
|
|
AC_DEFINE(__CORRECT_ISO_CPP11_MATH_H_PROTO_FP)
|
2015-11-24 21:15:43 +08:00
|
|
|
fi
|
2016-11-22 00:09:47 +08:00
|
|
|
AC_MSG_RESULT([$glibcxx_cv_math11_fp_overload])
|
|
|
|
|
|
|
|
# Solaris 12 Build 90, Solaris 11.3 SRU 5.6, and Solaris 10 Patch
|
|
|
|
# 11996[67]-02 introduced the C++11 <math.h> integral type overloads.
|
|
|
|
AC_MSG_CHECKING([for C++11 <math.h> integral type overloads])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_math11_int_overload, [
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
|
|
|
|
[#include <math.h>
|
|
|
|
namespace std {
|
|
|
|
template<typename _Tp>
|
|
|
|
struct __is_integer;
|
|
|
|
template<>
|
|
|
|
struct __is_integer<int>
|
|
|
|
{
|
|
|
|
enum { __value = 1 };
|
|
|
|
};
|
|
|
|
}
|
|
|
|
namespace __gnu_cxx {
|
|
|
|
template<bool, typename>
|
|
|
|
struct __enable_if;
|
|
|
|
template<typename _Tp>
|
|
|
|
struct __enable_if<true, _Tp>
|
|
|
|
{ typedef _Tp __type; };
|
|
|
|
}
|
|
|
|
namespace std {
|
|
|
|
template<typename _Tp>
|
|
|
|
constexpr typename __gnu_cxx::__enable_if
|
|
|
|
<__is_integer<_Tp>::__value, double>::__type
|
|
|
|
log2(_Tp __x)
|
|
|
|
{ return __builtin_log2(__x); }
|
|
|
|
}
|
|
|
|
int
|
|
|
|
main (void)
|
|
|
|
{
|
|
|
|
int i = 1000;
|
|
|
|
return std::log2(i);
|
|
|
|
}
|
|
|
|
])],
|
|
|
|
[glibcxx_cv_math11_int_overload=no],
|
|
|
|
[glibcxx_cv_math11_int_overload=yes]
|
|
|
|
)])
|
|
|
|
|
|
|
|
# autoheader cannot handle indented templates.
|
|
|
|
AH_VERBATIM([__CORRECT_ISO_CPP11_MATH_H_PROTO_INT],
|
|
|
|
[/* Define if all C++11 integral type overloads are available in <math.h>. */
|
|
|
|
#if __cplusplus >= 201103L
|
|
|
|
#undef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
|
|
|
|
#endif])
|
|
|
|
|
|
|
|
if test $glibcxx_cv_math11_int_overload = yes; then
|
|
|
|
AC_DEFINE(__CORRECT_ISO_CPP11_MATH_H_PROTO_INT)
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT([$glibcxx_cv_math11_int_overload])
|
2015-11-24 21:15:43 +08:00
|
|
|
;;
|
2016-02-08 23:22:32 +08:00
|
|
|
*)
|
2016-01-14 00:25:56 +08:00
|
|
|
# If <math.h> defines the obsolete isinf(double) and isnan(double)
|
|
|
|
# functions (instead of or as well as the C99 generic macros) then we
|
|
|
|
# can't define std::isinf(double) and std::isnan(double) in <cmath>
|
|
|
|
# and must use the ones from <math.h> instead.
|
2016-01-28 21:09:23 +08:00
|
|
|
AC_MSG_CHECKING([for obsolete isinf function in <math.h>])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_obsolete_isinf, [
|
2016-01-14 00:25:56 +08:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
|
2016-02-08 23:22:32 +08:00
|
|
|
[#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
|
|
|
#include <math.h>
|
2016-01-14 00:25:56 +08:00
|
|
|
#undef isinf
|
|
|
|
namespace std {
|
|
|
|
using ::isinf;
|
2016-02-08 23:37:59 +08:00
|
|
|
bool isinf(float);
|
|
|
|
bool isinf(long double);
|
2016-01-28 21:09:23 +08:00
|
|
|
}
|
|
|
|
using std::isinf;
|
|
|
|
bool b = isinf(0.0);
|
|
|
|
])],
|
|
|
|
[glibcxx_cv_obsolete_isinf=yes],
|
|
|
|
[glibcxx_cv_obsolete_isinf=no]
|
|
|
|
)])
|
|
|
|
AC_MSG_RESULT([$glibcxx_cv_obsolete_isinf])
|
|
|
|
if test $glibcxx_cv_obsolete_isinf = yes; then
|
|
|
|
AC_DEFINE(HAVE_OBSOLETE_ISINF, 1,
|
|
|
|
[Define if <math.h> defines obsolete isinf function.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for obsolete isnan function in <math.h>])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_obsolete_isnan, [
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
|
2017-03-10 20:22:45 +08:00
|
|
|
[#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
|
|
|
#include <math.h>
|
2016-01-28 21:09:23 +08:00
|
|
|
#undef isnan
|
|
|
|
namespace std {
|
2016-01-14 00:25:56 +08:00
|
|
|
using ::isnan;
|
|
|
|
bool isnan(float);
|
|
|
|
bool isnan(long double);
|
|
|
|
}
|
|
|
|
using std::isnan;
|
2016-01-28 21:09:23 +08:00
|
|
|
bool b = isnan(0.0);
|
2016-01-14 00:25:56 +08:00
|
|
|
])],
|
2016-01-28 21:09:23 +08:00
|
|
|
[glibcxx_cv_obsolete_isnan=yes],
|
|
|
|
[glibcxx_cv_obsolete_isnan=no]
|
2016-01-14 00:25:56 +08:00
|
|
|
)])
|
2016-01-28 21:09:23 +08:00
|
|
|
AC_MSG_RESULT([$glibcxx_cv_obsolete_isnan])
|
|
|
|
if test $glibcxx_cv_obsolete_isnan = yes; then
|
|
|
|
AC_DEFINE(HAVE_OBSOLETE_ISNAN, 1,
|
|
|
|
[Define if <math.h> defines obsolete isnan function.])
|
2016-01-14 00:25:56 +08:00
|
|
|
fi
|
|
|
|
;;
|
2015-11-24 21:15:43 +08:00
|
|
|
esac
|
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
2007-08-24 00:16:41 +08:00
|
|
|
dnl
|
|
|
|
dnl Check whether macros, etc are present for <system_error>
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_SYSTEM_ERROR], [
|
|
|
|
|
2008-04-22 04:55:19 +08:00
|
|
|
m4_pushdef([n_syserr], [1])dnl
|
|
|
|
m4_foreach([syserr], [EOWNERDEAD, ENOTRECOVERABLE, ENOLINK, EPROTO, ENODATA,
|
2008-05-17 05:55:00 +08:00
|
|
|
ENOSR, ENOSTR, ETIME, EBADMSG, ECANCELED,
|
configure: Regenerated.
* configure: Regenerated.
* config.h.in: Regenerated.
* acinclude.m4 (GLIBCXX_CHECK_SYSTEM_ERROR) Add
checks for ECHILD, ENOSPC, EPERM, ETIMEDOUT, and
EWOULDBLOCK.
* config/os/mingw32/error_constants.h (errc): Add
enumerator values no_child_process, no_space_on_device,
not_supported, operation_not_permitted, operation_would_block,
timed_out, and value_too_large,
From-SVN: r178257
2011-08-30 03:57:24 +08:00
|
|
|
EOVERFLOW, ENOTSUP, EIDRM, ETXTBSY,
|
|
|
|
ECHILD, ENOSPC, EPERM,
|
|
|
|
ETIMEDOUT, EWOULDBLOCK],
|
2008-04-22 04:55:19 +08:00
|
|
|
[m4_pushdef([SYSERR], m4_toupper(syserr))dnl
|
|
|
|
AC_MSG_CHECKING([for syserr])
|
|
|
|
AC_CACHE_VAL([glibcxx_cv_system_error[]n_syserr], [
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <errno.h>]],
|
|
|
|
[int i = syserr;])],
|
|
|
|
[glibcxx_cv_system_error[]n_syserr=yes],
|
|
|
|
[glibcxx_cv_system_error[]n_syserr=no])
|
|
|
|
])
|
|
|
|
AC_MSG_RESULT([$glibcxx_cv_system_error[]n_syserr])
|
|
|
|
if test x"$glibcxx_cv_system_error[]n_syserr" = x"yes"; then
|
|
|
|
AC_DEFINE([HAVE_]SYSERR, 1, [Define if ]syserr[ exists.])
|
|
|
|
fi
|
|
|
|
m4_define([n_syserr], m4_incr(n_syserr))dnl
|
|
|
|
m4_popdef([SYSERR])dnl
|
|
|
|
])
|
|
|
|
m4_popdef([n_syserr])dnl
|
2007-08-24 00:16:41 +08:00
|
|
|
])
|
|
|
|
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 17:18:51 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Check for what type of C headers to use.
|
|
|
|
dnl
|
|
|
|
dnl --enable-cheaders= [does stuff].
|
|
|
|
dnl --disable-cheaders [does not do anything, really].
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_CHEADERS[(DEFAULT)]
|
2007-03-05 06:59:49 +08:00
|
|
|
dnl Where DEFAULT is either 'c' or 'c_std' or 'c_global'.
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_CHEADERS], [
|
2010-10-04 16:49:59 +08:00
|
|
|
GLIBCXX_ENABLE(cheaders,$1,[[[=KIND]]],
|
2007-03-05 06:59:49 +08:00
|
|
|
[construct "C" headers for g++], [permit c|c_std|c_global])
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_MSG_NOTICE("C" header strategy set to $enable_cheaders)
|
|
|
|
|
|
|
|
C_INCLUDE_DIR='${glibcxx_srcdir}/include/'$enable_cheaders
|
|
|
|
|
2007-03-05 06:59:49 +08:00
|
|
|
# Allow overrides to configure.host here.
|
|
|
|
if test $enable_cheaders = c_global; then
|
|
|
|
c_compatibility=yes
|
|
|
|
fi
|
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_SUBST(C_INCLUDE_DIR)
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_C_HEADERS_C, test $enable_cheaders = c)
|
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_C_HEADERS_C_STD, test $enable_cheaders = c_std)
|
2007-03-05 06:59:49 +08:00
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_C_HEADERS_C_GLOBAL, test $enable_cheaders = c_global)
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_C_HEADERS_COMPATIBILITY, test $c_compatibility = yes)
|
2003-08-05 10:00:18 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 17:18:51 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Check for which locale library to use. The choice is mapped to
|
|
|
|
dnl a subdirectory of config/locale.
|
2002-12-30 22:54:45 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Default is generic.
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 17:18:51 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
|
2010-10-04 16:49:59 +08:00
|
|
|
GLIBCXX_ENABLE(clocale,auto,[[[=MODEL]]],
|
2003-08-05 10:00:18 +08:00
|
|
|
[use MODEL for target locale package],
|
2011-07-16 06:29:53 +08:00
|
|
|
[permit generic|gnu|ieee_1003.1-2001|newlib|yes|no|auto])
|
2007-05-29 01:02:30 +08:00
|
|
|
|
|
|
|
# Deal with gettext issues. Default to not using it (=no) until we detect
|
|
|
|
# support for it later. Let the user turn it off via --e/d, but let that
|
|
|
|
# default to on for easier handling.
|
|
|
|
USE_NLS=no
|
|
|
|
AC_ARG_ENABLE(nls,
|
|
|
|
AC_HELP_STRING([--enable-nls],[use Native Language Support (default)]),
|
|
|
|
[],
|
|
|
|
[enable_nls=yes])
|
2011-03-08 08:04:05 +08:00
|
|
|
|
2011-07-16 06:29:53 +08:00
|
|
|
# Either a known package, or "auto"
|
2003-08-05 10:00:18 +08:00
|
|
|
if test $enable_clocale = no || test $enable_clocale = yes; then
|
|
|
|
enable_clocale=auto
|
|
|
|
fi
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 17:18:51 +08:00
|
|
|
enable_clocale_flag=$enable_clocale
|
|
|
|
|
2007-05-29 01:02:30 +08:00
|
|
|
# Probe for locale model to use if none specified.
|
2003-08-05 10:00:18 +08:00
|
|
|
# Default to "generic".
|
|
|
|
if test $enable_clocale_flag = auto; then
|
2004-07-11 15:46:21 +08:00
|
|
|
case ${target_os} in
|
|
|
|
linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
|
2011-03-08 08:04:05 +08:00
|
|
|
enable_clocale_flag=gnu
|
|
|
|
;;
|
2015-11-15 05:17:24 +08:00
|
|
|
darwin*)
|
2011-03-08 08:04:05 +08:00
|
|
|
enable_clocale_flag=darwin
|
2004-10-30 09:03:12 +08:00
|
|
|
;;
|
2015-11-15 05:17:24 +08:00
|
|
|
dragonfly* | freebsd*)
|
2014-05-21 19:08:58 +08:00
|
|
|
enable_clocale_flag=dragonfly
|
|
|
|
;;
|
2012-10-11 07:11:54 +08:00
|
|
|
openbsd*)
|
|
|
|
enable_clocale_flag=newlib
|
|
|
|
;;
|
2001-12-16 02:58:49 +08:00
|
|
|
*)
|
2011-07-16 06:29:53 +08:00
|
|
|
if test x"$with_newlib" = x"yes"; then
|
|
|
|
enable_clocale_flag=newlib
|
|
|
|
else
|
|
|
|
enable_clocale_flag=generic
|
|
|
|
fi
|
2011-03-08 08:04:05 +08:00
|
|
|
;;
|
2001-12-16 02:58:49 +08:00
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
2007-05-29 01:02:30 +08:00
|
|
|
# Sanity check model, and test for special functionality.
|
|
|
|
if test $enable_clocale_flag = gnu; then
|
|
|
|
AC_EGREP_CPP([_GLIBCXX_ok], [
|
|
|
|
#include <features.h>
|
2010-05-21 22:07:00 +08:00
|
|
|
#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined(__UCLIBC__)
|
2007-05-29 01:02:30 +08:00
|
|
|
_GLIBCXX_ok
|
|
|
|
#endif
|
|
|
|
], enable_clocale_flag=gnu, enable_clocale_flag=generic)
|
|
|
|
|
|
|
|
# Set it to scream when it hurts.
|
2011-03-08 08:04:05 +08:00
|
|
|
ac_save_CFLAGS="$CFLAGS"
|
2007-05-29 01:02:30 +08:00
|
|
|
CFLAGS="-Wimplicit-function-declaration -Werror"
|
|
|
|
|
|
|
|
# Use strxfrm_l if available.
|
|
|
|
AC_TRY_COMPILE([#define _GNU_SOURCE 1
|
|
|
|
#include <string.h>
|
|
|
|
#include <locale.h>],
|
2011-03-08 08:04:05 +08:00
|
|
|
[char s[128]; __locale_t loc; strxfrm_l(s, "C", 5, loc);],
|
|
|
|
AC_DEFINE(HAVE_STRXFRM_L, 1,
|
|
|
|
[Define if strxfrm_l is available in <string.h>.]),)
|
|
|
|
|
2007-05-29 01:02:30 +08:00
|
|
|
# Use strerror_l if available.
|
|
|
|
AC_TRY_COMPILE([#define _GNU_SOURCE 1
|
|
|
|
#include <string.h>
|
|
|
|
#include <locale.h>],
|
2011-03-08 08:04:05 +08:00
|
|
|
[__locale_t loc; strerror_l(5, loc);],
|
|
|
|
AC_DEFINE(HAVE_STRERROR_L, 1,
|
|
|
|
[Define if strerror_l is available in <string.h>.]),)
|
2007-05-29 01:02:30 +08:00
|
|
|
|
|
|
|
CFLAGS="$ac_save_CFLAGS"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Perhaps use strerror_r if available, and strerror_l isn't.
|
2011-03-08 08:04:05 +08:00
|
|
|
ac_save_CFLAGS="$CFLAGS"
|
2007-05-29 01:02:30 +08:00
|
|
|
CFLAGS="-Wimplicit-function-declaration -Werror"
|
|
|
|
AC_TRY_COMPILE([#define _GNU_SOURCE 1
|
|
|
|
#include <string.h>
|
|
|
|
#include <locale.h>],
|
2011-03-08 08:04:05 +08:00
|
|
|
[char s[128]; strerror_r(5, s, 128);],
|
|
|
|
AC_DEFINE(HAVE_STRERROR_R, 1,
|
|
|
|
[Define if strerror_r is available in <string.h>.]),)
|
2007-05-29 01:02:30 +08:00
|
|
|
CFLAGS="$ac_save_CFLAGS"
|
2002-04-02 10:41:50 +08:00
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
# Set configure bits for specified locale package
|
2007-05-29 01:02:30 +08:00
|
|
|
AC_MSG_CHECKING([for C locale to use])
|
2003-08-05 10:00:18 +08:00
|
|
|
case ${enable_clocale_flag} in
|
|
|
|
generic)
|
2001-08-08 10:49:01 +08:00
|
|
|
AC_MSG_RESULT(generic)
|
|
|
|
|
2002-03-09 10:16:36 +08:00
|
|
|
CLOCALE_H=config/locale/generic/c_locale.h
|
|
|
|
CLOCALE_CC=config/locale/generic/c_locale.cc
|
2002-09-11 11:36:45 +08:00
|
|
|
CCODECVT_CC=config/locale/generic/codecvt_members.cc
|
2002-03-09 10:16:36 +08:00
|
|
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
|
|
|
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
|
|
|
CMESSAGES_H=config/locale/generic/messages_members.h
|
|
|
|
CMESSAGES_CC=config/locale/generic/messages_members.cc
|
|
|
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
|
|
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
2003-01-07 05:23:00 +08:00
|
|
|
CTIME_H=config/locale/generic/time_members.h
|
2002-03-09 10:16:36 +08:00
|
|
|
CTIME_CC=config/locale/generic/time_members.cc
|
2002-09-05 15:46:17 +08:00
|
|
|
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
|
2001-08-08 10:49:01 +08:00
|
|
|
;;
|
2004-10-30 09:03:12 +08:00
|
|
|
darwin)
|
2015-11-15 05:17:24 +08:00
|
|
|
AC_MSG_RESULT(darwin)
|
2004-10-30 09:03:12 +08:00
|
|
|
|
|
|
|
CLOCALE_H=config/locale/generic/c_locale.h
|
|
|
|
CLOCALE_CC=config/locale/generic/c_locale.cc
|
|
|
|
CCODECVT_CC=config/locale/generic/codecvt_members.cc
|
|
|
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
|
|
|
CCTYPE_CC=config/locale/darwin/ctype_members.cc
|
|
|
|
CMESSAGES_H=config/locale/generic/messages_members.h
|
|
|
|
CMESSAGES_CC=config/locale/generic/messages_members.cc
|
|
|
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
|
|
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
|
|
|
CTIME_H=config/locale/generic/time_members.h
|
|
|
|
CTIME_CC=config/locale/generic/time_members.cc
|
|
|
|
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
|
|
|
|
;;
|
2011-03-08 08:04:05 +08:00
|
|
|
|
2014-05-21 19:08:58 +08:00
|
|
|
dragonfly)
|
2015-11-15 05:17:24 +08:00
|
|
|
AC_MSG_RESULT(dragonfly or freebsd)
|
2014-05-21 19:08:58 +08:00
|
|
|
|
2015-08-27 20:12:41 +08:00
|
|
|
CLOCALE_H=config/locale/dragonfly/c_locale.h
|
2014-05-21 19:08:58 +08:00
|
|
|
CLOCALE_CC=config/locale/dragonfly/c_locale.cc
|
2015-08-27 20:12:41 +08:00
|
|
|
CCODECVT_CC=config/locale/dragonfly/codecvt_members.cc
|
|
|
|
CCOLLATE_CC=config/locale/dragonfly/collate_members.cc
|
2014-05-21 19:08:58 +08:00
|
|
|
CCTYPE_CC=config/locale/dragonfly/ctype_members.cc
|
|
|
|
CMESSAGES_H=config/locale/generic/messages_members.h
|
|
|
|
CMESSAGES_CC=config/locale/generic/messages_members.cc
|
2015-08-27 20:12:41 +08:00
|
|
|
CMONEY_CC=config/locale/dragonfly/monetary_members.cc
|
|
|
|
CNUMERIC_CC=config/locale/dragonfly/numeric_members.cc
|
|
|
|
CTIME_H=config/locale/dragonfly/time_members.h
|
|
|
|
CTIME_CC=config/locale/dragonfly/time_members.cc
|
2014-05-21 19:08:58 +08:00
|
|
|
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
|
|
|
|
;;
|
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
gnu)
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 17:18:51 +08:00
|
|
|
AC_MSG_RESULT(gnu)
|
2001-08-08 10:49:01 +08:00
|
|
|
|
|
|
|
# Declare intention to use gettext, and add support for specific
|
|
|
|
# languages.
|
2002-05-27 22:55:57 +08:00
|
|
|
# For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
|
2001-08-08 10:49:01 +08:00
|
|
|
ALL_LINGUAS="de fr"
|
2002-04-02 10:41:50 +08:00
|
|
|
|
2002-05-27 22:55:57 +08:00
|
|
|
# Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
|
2002-04-02 10:41:50 +08:00
|
|
|
AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
|
|
|
|
if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
|
2011-03-08 08:04:05 +08:00
|
|
|
USE_NLS=yes
|
2002-04-02 10:41:50 +08:00
|
|
|
fi
|
2001-08-08 10:49:01 +08:00
|
|
|
# Export the build objects.
|
|
|
|
for ling in $ALL_LINGUAS; do \
|
2011-03-08 08:04:05 +08:00
|
|
|
glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
|
|
|
|
glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
|
2001-08-08 10:49:01 +08:00
|
|
|
done
|
2003-07-05 12:05:45 +08:00
|
|
|
AC_SUBST(glibcxx_MOFILES)
|
|
|
|
AC_SUBST(glibcxx_POFILES)
|
2001-08-08 10:49:01 +08:00
|
|
|
|
2002-03-09 10:16:36 +08:00
|
|
|
CLOCALE_H=config/locale/gnu/c_locale.h
|
|
|
|
CLOCALE_CC=config/locale/gnu/c_locale.cc
|
2002-09-11 11:36:45 +08:00
|
|
|
CCODECVT_CC=config/locale/gnu/codecvt_members.cc
|
2002-03-09 10:16:36 +08:00
|
|
|
CCOLLATE_CC=config/locale/gnu/collate_members.cc
|
|
|
|
CCTYPE_CC=config/locale/gnu/ctype_members.cc
|
|
|
|
CMESSAGES_H=config/locale/gnu/messages_members.h
|
|
|
|
CMESSAGES_CC=config/locale/gnu/messages_members.cc
|
|
|
|
CMONEY_CC=config/locale/gnu/monetary_members.cc
|
|
|
|
CNUMERIC_CC=config/locale/gnu/numeric_members.cc
|
2003-01-07 05:23:00 +08:00
|
|
|
CTIME_H=config/locale/gnu/time_members.h
|
2002-03-09 10:16:36 +08:00
|
|
|
CTIME_CC=config/locale/gnu/time_members.cc
|
2002-09-05 15:46:17 +08:00
|
|
|
CLOCALE_INTERNAL_H=config/locale/gnu/c++locale_internal.h
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 17:18:51 +08:00
|
|
|
;;
|
2003-08-05 10:00:18 +08:00
|
|
|
ieee_1003.1-2001)
|
2003-04-30 06:47:03 +08:00
|
|
|
AC_MSG_RESULT(IEEE 1003.1)
|
2001-08-08 10:49:01 +08:00
|
|
|
|
2002-03-09 10:16:36 +08:00
|
|
|
CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h
|
|
|
|
CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc
|
2002-09-11 11:36:45 +08:00
|
|
|
CCODECVT_CC=config/locale/generic/codecvt_members.cc
|
2002-03-09 10:16:36 +08:00
|
|
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
|
|
|
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
|
|
|
CMESSAGES_H=config/locale/ieee_1003.1-2001/messages_members.h
|
|
|
|
CMESSAGES_CC=config/locale/ieee_1003.1-2001/messages_members.cc
|
|
|
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
|
|
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
2003-01-07 05:23:00 +08:00
|
|
|
CTIME_H=config/locale/generic/time_members.h
|
2002-03-09 10:16:36 +08:00
|
|
|
CTIME_CC=config/locale/generic/time_members.cc
|
2002-09-05 15:46:17 +08:00
|
|
|
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 17:18:51 +08:00
|
|
|
;;
|
2011-07-16 06:29:53 +08:00
|
|
|
newlib)
|
|
|
|
AC_MSG_RESULT(newlib)
|
|
|
|
|
|
|
|
CLOCALE_H=config/locale/generic/c_locale.h
|
|
|
|
CLOCALE_CC=config/locale/generic/c_locale.cc
|
|
|
|
CCODECVT_CC=config/locale/generic/codecvt_members.cc
|
|
|
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
|
|
|
CCTYPE_CC=config/locale/newlib/ctype_members.cc
|
|
|
|
CMESSAGES_H=config/locale/generic/messages_members.h
|
|
|
|
CMESSAGES_CC=config/locale/generic/messages_members.cc
|
|
|
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
|
|
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
|
|
|
CTIME_H=config/locale/generic/time_members.h
|
|
|
|
CTIME_CC=config/locale/generic/time_members.cc
|
|
|
|
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
|
|
|
|
;;
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 17:18:51 +08:00
|
|
|
esac
|
|
|
|
|
2001-08-08 10:49:01 +08:00
|
|
|
# This is where the testsuite looks for locale catalogs, using the
|
|
|
|
# -DLOCALEDIR define during testsuite compilation.
|
2003-07-05 12:05:45 +08:00
|
|
|
glibcxx_localedir=${glibcxx_builddir}/po/share/locale
|
|
|
|
AC_SUBST(glibcxx_localedir)
|
2001-08-08 10:49:01 +08:00
|
|
|
|
2003-04-30 06:47:03 +08:00
|
|
|
# A standalone libintl (e.g., GNU libintl) may be in use.
|
|
|
|
if test $USE_NLS = yes; then
|
2003-05-02 10:53:28 +08:00
|
|
|
AC_CHECK_HEADERS([libintl.h], [], USE_NLS=no)
|
|
|
|
AC_SEARCH_LIBS(gettext, intl, [], USE_NLS=no)
|
|
|
|
fi
|
|
|
|
if test $USE_NLS = yes; then
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_USE_NLS, 1,
|
|
|
|
[Define if NLS translations are to be used.])
|
2003-04-30 06:47:03 +08:00
|
|
|
fi
|
|
|
|
|
2001-08-14 09:24:30 +08:00
|
|
|
AC_SUBST(USE_NLS)
|
2001-07-14 00:47:56 +08:00
|
|
|
AC_SUBST(CLOCALE_H)
|
2001-08-08 10:49:01 +08:00
|
|
|
AC_SUBST(CMESSAGES_H)
|
2002-12-17 03:02:01 +08:00
|
|
|
AC_SUBST(CCODECVT_CC)
|
|
|
|
AC_SUBST(CCOLLATE_CC)
|
|
|
|
AC_SUBST(CCTYPE_CC)
|
|
|
|
AC_SUBST(CMESSAGES_CC)
|
|
|
|
AC_SUBST(CMONEY_CC)
|
|
|
|
AC_SUBST(CNUMERIC_CC)
|
2003-01-07 05:23:00 +08:00
|
|
|
AC_SUBST(CTIME_H)
|
2002-12-17 03:02:01 +08:00
|
|
|
AC_SUBST(CTIME_CC)
|
|
|
|
AC_SUBST(CLOCALE_CC)
|
|
|
|
AC_SUBST(CLOCALE_INTERNAL_H)
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 17:18:51 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2004-03-13 14:54:25 +08:00
|
|
|
dnl
|
|
|
|
dnl Check for which std::allocator base class to use. The choice is
|
|
|
|
dnl mapped from a subdirectory of include/ext.
|
|
|
|
dnl
|
|
|
|
dnl Default is new.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_ALLOCATOR], [
|
2005-03-24 13:45:45 +08:00
|
|
|
AC_MSG_CHECKING([for std::allocator base class])
|
2010-10-04 16:49:59 +08:00
|
|
|
GLIBCXX_ENABLE(libstdcxx-allocator,auto,[[[=KIND]]],
|
2004-03-13 14:54:25 +08:00
|
|
|
[use KIND for target std::allocator base],
|
2004-03-22 21:07:13 +08:00
|
|
|
[permit new|malloc|mt|bitmap|pool|yes|no|auto])
|
2004-07-11 15:46:21 +08:00
|
|
|
|
2004-03-13 14:54:25 +08:00
|
|
|
# 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.
|
2004-07-11 15:46:21 +08:00
|
|
|
if test $enable_libstdcxx_allocator = no ||
|
|
|
|
test $enable_libstdcxx_allocator = yes;
|
|
|
|
then
|
2004-03-13 14:54:25 +08:00
|
|
|
enable_libstdcxx_allocator=auto
|
|
|
|
fi
|
|
|
|
|
2004-07-14 14:37:17 +08:00
|
|
|
# Either a known package, or "auto". Auto implies the default choice
|
|
|
|
# for a particular platform.
|
2004-03-13 14:54:25 +08:00
|
|
|
enable_libstdcxx_allocator_flag=$enable_libstdcxx_allocator
|
|
|
|
|
|
|
|
# Probe for host-specific support if no specific model is specified.
|
|
|
|
# Default to "new".
|
|
|
|
if test $enable_libstdcxx_allocator_flag = auto; then
|
|
|
|
case ${target_os} in
|
2004-07-14 14:37:17 +08:00
|
|
|
linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
|
2011-03-08 08:04:05 +08:00
|
|
|
enable_libstdcxx_allocator_flag=new
|
|
|
|
;;
|
2004-03-13 14:54:25 +08:00
|
|
|
*)
|
2011-03-08 08:04:05 +08:00
|
|
|
enable_libstdcxx_allocator_flag=new
|
|
|
|
;;
|
2004-03-13 14:54:25 +08:00
|
|
|
esac
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($enable_libstdcxx_allocator_flag)
|
2011-03-08 08:04:05 +08:00
|
|
|
|
2004-03-13 14:54:25 +08:00
|
|
|
|
|
|
|
# Set configure bits for specified locale package
|
|
|
|
case ${enable_libstdcxx_allocator_flag} in
|
|
|
|
bitmap)
|
|
|
|
ALLOCATOR_H=config/allocator/bitmap_allocator_base.h
|
|
|
|
ALLOCATOR_NAME=__gnu_cxx::bitmap_allocator
|
|
|
|
;;
|
|
|
|
malloc)
|
|
|
|
ALLOCATOR_H=config/allocator/malloc_allocator_base.h
|
|
|
|
ALLOCATOR_NAME=__gnu_cxx::malloc_allocator
|
|
|
|
;;
|
|
|
|
mt)
|
|
|
|
ALLOCATOR_H=config/allocator/mt_allocator_base.h
|
|
|
|
ALLOCATOR_NAME=__gnu_cxx::__mt_alloc
|
|
|
|
;;
|
|
|
|
new)
|
|
|
|
ALLOCATOR_H=config/allocator/new_allocator_base.h
|
|
|
|
ALLOCATOR_NAME=__gnu_cxx::new_allocator
|
|
|
|
;;
|
2004-03-22 21:07:13 +08:00
|
|
|
pool)
|
|
|
|
ALLOCATOR_H=config/allocator/pool_allocator_base.h
|
|
|
|
ALLOCATOR_NAME=__gnu_cxx::__pool_alloc
|
2011-03-08 08:04:05 +08:00
|
|
|
;;
|
2004-03-13 14:54:25 +08:00
|
|
|
esac
|
|
|
|
|
2016-01-16 06:42:41 +08:00
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_ALLOCATOR_NEW,
|
|
|
|
test $enable_libstdcxx_allocator_flag = new)
|
2004-03-13 14:54:25 +08:00
|
|
|
AC_SUBST(ALLOCATOR_H)
|
|
|
|
AC_SUBST(ALLOCATOR_NAME)
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-04-22 04:33:34 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Check for whether the Boost-derived checks should be turned on.
|
|
|
|
dnl
|
|
|
|
dnl --enable-concept-checks turns them on.
|
|
|
|
dnl --disable-concept-checks leaves them off.
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_CONCEPT_CHECKS[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'.
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_CONCEPT_CHECKS], [
|
2003-08-05 10:00:18 +08:00
|
|
|
GLIBCXX_ENABLE(concept-checks,$1,,[use Boost-derived template checks])
|
|
|
|
if test $enable_concept_checks = yes; then
|
acinclude.m4 (_GLIBCXX_USE_LONG_LONG, [...]): Use long form of AC_DEFINE ...
2005-04-06 Kelley Cook <kcook@gcc.gnu.org>
* acinclude.m4 (_GLIBCXX_USE_LONG_LONG,
_GLIBCXX_USE_WCHAR_T, _GLIBCXX_USE_C99, _GLIBCXX_USE_C99_MATH,
_GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_RES_LIMITS, _GLIBCXX_CONCEPT_CHECKS,
_GLIBCXX_SYMVER, _GLIBCXX_USE_LFS, _GLIBCXX_FULLY_DYNAMIC_STRING,
_GLIBCXX_USE_NLS, HAVE_GTHR_DEFAULT, HAVE_MBSTATE_T, HAVE_POLL,
HAVE_S_ISREG, HAVE_S_IFREG, HAVE_WRITEV, HAVE_INT64_T,
HAVE_LC_MESSAGES): Use long form of AC_DEFINE ...
* acconfig.h: ... to eliminate them from here.
(_GLIBCXX_ASM_SYMVER): Move definition below @BOTTOM@.
* config.h.in, configure: Regenerate.
From-SVN: r97685
2005-04-06 09:32:03 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define to use concept checking code from the boost libraries.])
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
2011-03-05 05:51:56 +08:00
|
|
|
dnl
|
|
|
|
dnl Use extern templates.
|
|
|
|
dnl
|
|
|
|
dnl --enable-extern-template defines _GLIBCXX_EXTERN_TEMPLATE to 1
|
|
|
|
dnl --disable-extern-template defines _GLIBCXX_EXTERN_TEMPLATE to 0
|
|
|
|
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_TEMPLATE[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is `yes' or `no'.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_EXTERN_TEMPLATE], [
|
|
|
|
|
|
|
|
GLIBCXX_ENABLE(extern-template,$1,,[enable extern template])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for extern template support])
|
|
|
|
AC_MSG_RESULT([$enable_extern_template])
|
|
|
|
|
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_EXTERN_TEMPLATE, test $enable_extern_template = yes)
|
|
|
|
])
|
|
|
|
|
Commit the vtable verification feature.
Commit the vtable verification feature. This feature is designed to
detect, at run time, if/when the vtable pointer in a C++ object has
been corrupted, before allowing virtual calls through that pointer.
If pointer corruption is detected, execution of the program is halted.
libstdc++-v3 ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* fragment.am: Add XTEMPLATE_FLAGS.
* configure.ac: Add definitions for --enable-vtable-verify.
* acinclude.m4: Add --enable-vtable-verify and
--disable-vtable-verify; define --enable-vtable-verify; define
VTV_CXXFLAGS, VTV_PCH_CXXFLAGS and VTV_CXXLINKFLAGS.
* config/abi/pre/gnu.ver: Export symbols for vtable verification.
* libsupc++/Makefile.am: Define vtv_sources and add it to
libsupc___la_SOURCES and libsupc__convenience_la_SOURCES.
* libsupc++/vtv_stubs.cc: New file.
* include/Makefile.am: Add VTV_PCH_CXXFLAGS to PCHFLAGS.
* src/Makefile.am: Add VTV_CXXFLAGS to AM_CXXFLAGS; add
VTV_CXXLINKFLAGS to CXXLINK.
* src/c++98/Makefile.am: Comment out XTEMPLATE_FLAGS; add VTV_CXXFLAGS
to AM_CXXFLAGS; add VTV_CXXXLINKFLAGS to CXXLINK.
* src/C++11/Makefile.am: Ditto.
* doc/xml/manual/configure.xml: Add entry for --enable-vtable-verify.
* scripts/testsuite_flags.in: Add cxxvtvflags to Usage; cause
cxxvtvflags to use VTV_CXXFLAGS and VTV_CXXLINKFLAGS.
* testsuite/lib/libstdc++.exp: Add cxxvtvflags; add code to locate
libvtv if --enable-vtable-verify was used; set cxxvtvflags; add
cxxvtvflags to cxx_final.
* testsuite/18_support/bad_exception/23591_thread-1.c: Add
-fvtable-verify=none to compiler flags.
* testsuite/17_intro/freestanding.cc: Add -fvtable-verify=none
to compiler flags.
* configure: Regenerated.
* Makefile.in: Regenerated.
* python/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* libsupc++/Makefile.in: Regenerated.
* config.h.in: Regenerated.
* po/Makefile.in: Regenerated.
* src/Makefile.in: Regenerated.
* src/c++98/Makefile.in: Regenerated.
* src/c++11/Makefile.in: Regenerated.
* doc/Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
top level ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* configure.ac: Add target-libvtv to target_libraries; disable libvtv
on non-linux systems; add target-libvtv to noconfigdirs; add
libsupc++/.libs to C++ library search paths.
* configure: Regenerated.
* Makefile.def: Add libvtv to target_modules; make libvtv depend on
libstdc++ and libgcc.
* Makefile.in: Regenerated.
include/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* vtv-change-permission.h: New file.
contrib/ChangeLog:
2013-08-06 Caroline Tice4 <cmtice@google.com>
* gcc_update: Add libvtv files.
libgcc/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
config.host (extra_parts): Add vtv_start.o, vtv_end.o
vtv_start_preinit.o and vtv_end_preinit.o.
configure.ac: Add code to check/set enable_vtable_verify.
Makefile.in: Add rules to build vtv_*.o, if enable_vtable_verify is
true.
vtv_start_preinit.c: New file.
vtv_end_preinit.c: New file.
vtv_start.c: New file.
vtv_end.c: New file.
configure: Regenerated.
gcc/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* gcc.c (VTABLE_VERIFICATION_SPEC): New definition.
(LINK_COMMAND_SPEC): Add VTABLE_VERIFICATION_SPEC.
* tree-pass.h: Add pass_vtable_verify.
* varasm.c (assemble_variable): Add code to properly set the comdat
section and name for the .vtable_map_vars section.
(assemble_vtyv_preinit_initializer): New function.
(default_sectin_type_flags): Make sure .vtable_map_vars section has
LINK_ONCE flag.
* output.h: Add function decl for assemble_vtv_preinit_initializer.
* vtable-verify.c: New file.
* vtable-verify.h: New file.
* flag-types.h (enum vtv_priority): Defintions for flag_vtable_verify
initialiation levels.
* timevar.def (TV_VTABLE_VERIFICATION): New definition.
* passes.def: Insert pass_vtable_verify.
* aclocal.m4: Reorder includes.
* doc/invoke.texi: Add documentation for the flags -fvtable-verify=,
-fvtv-debug and -fvtv-counts.
* config/gnu-user.h (GNU_USER_TARGET_STARTFILE_SPEC): Add vtv_start*.o,
as appropriate, if -fvtable-verify=... is used.
(GNU_USER_TARGET_ENDFILE_SPEC): Add vtv_end*.o as appropriate, if
-fvtable-verify=... is used.
* Makefile.in (OBJS): Add vtable-verify.o to list.
(vtable-verify.o): Add new build rule.
(GTFILES): Add vtable-verify.c to list.
* common.opt (fvtable-verify=): New flag.
(vtv_priority): Values for fvtable-verify= flag.
(fvtv-counts): New flag.
(fvtv-debug): New flag.
* tree.h (save_vtable_map_decl): New extern function decl.
gcc/cp/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* Make-lang.in (*CXX_AND_OBJCXX_OBJS): Add vtable-class-hierarchy.o to
list.
(vtable-class-hierarchy.o): Add build rule.
* cp-tree.h (vtv_start_verification_constructor_init_function): New
extern function decl.
(vtv_finish_verification_constructor_init_function): New extern
function decl.
(build_vtbl_address): New extern function decl.
(get_mangled_vtable_map_var_name): New extern function decl.
(vtv_compute_class_hierarchy_transitive_closure): New extern function
decl.
(vtv_generate_init_routine): New extern function decl.
(vtv_save_class_info): New extern function decl.
(vtv_recover_class_info): New extern function decl.
(vtv_build_vtable_verify_fndecl): New extern function decl.
* class.c (finish_struct_1): Add call to vtv_save_class_info if
flag_vtable_verify is true.
* config-lang.in: Add vtable-class-hierarchy.c to gtfiles list.
* vtable-class-hierarchy.c: New file.
* mangle.c (get_mangled_vtable_map_var_name): New function.
* decl2.c (start_objects): Update function comment.
(cp_write_global_declarations): Call vtv_recover_class_info,
vtv_compute_class_hierarchy_transitive_closure and
vtv_build_vtable_verify_fndecl, before calling
finalize_compilation_unit, and call vtv_generate_init_rount after, IFF
flag_vtable_verify is true.
(vtv_start_verification_constructor_init_function): New function.
(vtv_finish_verification_constructor_init_function): New function.
* init.c (build_vtbl_address): Remove static qualifier from function.
libvtv/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
Initial check-in of new vtable verification feature.
* configure.ac : New file.
* acinclude.m4 : New file.
* Makefile.am : New file.
* aclocal.m4 : New file.
* configure.tgt : New file.
* configure: New file (generated).
* Makefile.in: New file (generated).
* vtv_set.h : New file.
* vtv_utils.cc : New file.
* vtv_utils.h : New file.
* vtv_malloc.cc : New file.
* vtv_rts.cc : New file.
* vtv_malloc.h : New file.
* vtv_rts.h : New file.
* vtv_fail.cc : New file.
* vtv_fail.h : New file.
* vtv_map.h : New file.
* scripts/run-testsuite.sh : New file.
* scripts/sum-vtv-counts.c : New file.
* testsuite/parts-test-main.h : New file.
* testusite/dataentry.cc : New file.
* testsuite/temp_deriv.cc : New file.
* testsuite/register_pair.cc : New file.
* testsuite/virtual_inheritance.cc : New file.
* testsuite/field-test.cc : New file.
* testsuite/nested_vcall_test.cc : New file.
* testsuite/template-list-iostream.cc : New file.
* testsuite/register_pair_inserts.cc : New file.
* testsuite/register_pair_inserts_mt.cc : New file.
* testsuite/event.list : New file.
* testsuite/parts-test-extra-parts-views.cc : New file.
* testsuite/parts-test-extra-parts-views.h : New file.
* testsuite/environment-fail-32.s : New file.
* testsuite/parts-test-extra-parts.h : New file.
* testsuite/temp_deriv2.cc : New file.
* testsuite/dlopen_mt.cc : New file.
* testsuite/event.h : New file.
* testsuite/template-list.cc : New file.
* testsuite/replace-fail.cc : New file.
* testsuite/Makefile.am : New file.
* testsuite/Makefile.in: New file (generated).
* testsuite/mempool_negative.c : New file.
* testsuite/parts-test-main.cc : New file.
* testsuite/event-private.cc : New file.
* testsuite/thunk.cc : New file.
* testsuite/event-defintiions.cc : New file.
* testsuite/event-private.h : New file.
* testsuite/parts-test.list : New file.
* testusite/register_pair_mt.cc : New file.
* testsuite/povray-derived.cc : New file.
* testsuite/event-main.cc : New file.
* testsuite/environment.cc : New file.
* testsuite/template-list2.cc : New file.
* testsuite/thunk_vtable_map_attack.cc : New file.
* testsuite/parts-test-extra-parts.cc : New file.
* testsuite/environment-fail-64.s : New file.
* testsuite/dlopen.cc : New file.
* testsuite/so.cc : New file.
* testsuite/temp_deriv3.cc : New file.
* testsuite/const_vtable.cc : New file.
* testsuite/mempool_positive.c : New file.
* testsuite/dup_name.cc : New file.
From-SVN: r201555
2013-08-07 11:38:59 +08:00
|
|
|
dnl
|
|
|
|
dnl Use vtable verification.
|
|
|
|
dnl
|
|
|
|
dnl --enable-vtable-verify defines _GLIBCXX_VTABLE_VERIFY to 1
|
|
|
|
dnl --disable-vtable-verify defines _GLIBCXX_VTABLE_VERIFY to 0
|
|
|
|
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_VTABLE_VERIFY[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is `yes' or `no'.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [
|
|
|
|
|
|
|
|
GLIBCXX_ENABLE(vtable-verify,$1,,[enable vtable verify])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for vtable verify support])
|
|
|
|
AC_MSG_RESULT([$enable_vtable_verify])
|
|
|
|
|
2015-01-30 02:36:03 +08:00
|
|
|
vtv_cygmin=no
|
Commit the vtable verification feature.
Commit the vtable verification feature. This feature is designed to
detect, at run time, if/when the vtable pointer in a C++ object has
been corrupted, before allowing virtual calls through that pointer.
If pointer corruption is detected, execution of the program is halted.
libstdc++-v3 ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* fragment.am: Add XTEMPLATE_FLAGS.
* configure.ac: Add definitions for --enable-vtable-verify.
* acinclude.m4: Add --enable-vtable-verify and
--disable-vtable-verify; define --enable-vtable-verify; define
VTV_CXXFLAGS, VTV_PCH_CXXFLAGS and VTV_CXXLINKFLAGS.
* config/abi/pre/gnu.ver: Export symbols for vtable verification.
* libsupc++/Makefile.am: Define vtv_sources and add it to
libsupc___la_SOURCES and libsupc__convenience_la_SOURCES.
* libsupc++/vtv_stubs.cc: New file.
* include/Makefile.am: Add VTV_PCH_CXXFLAGS to PCHFLAGS.
* src/Makefile.am: Add VTV_CXXFLAGS to AM_CXXFLAGS; add
VTV_CXXLINKFLAGS to CXXLINK.
* src/c++98/Makefile.am: Comment out XTEMPLATE_FLAGS; add VTV_CXXFLAGS
to AM_CXXFLAGS; add VTV_CXXXLINKFLAGS to CXXLINK.
* src/C++11/Makefile.am: Ditto.
* doc/xml/manual/configure.xml: Add entry for --enable-vtable-verify.
* scripts/testsuite_flags.in: Add cxxvtvflags to Usage; cause
cxxvtvflags to use VTV_CXXFLAGS and VTV_CXXLINKFLAGS.
* testsuite/lib/libstdc++.exp: Add cxxvtvflags; add code to locate
libvtv if --enable-vtable-verify was used; set cxxvtvflags; add
cxxvtvflags to cxx_final.
* testsuite/18_support/bad_exception/23591_thread-1.c: Add
-fvtable-verify=none to compiler flags.
* testsuite/17_intro/freestanding.cc: Add -fvtable-verify=none
to compiler flags.
* configure: Regenerated.
* Makefile.in: Regenerated.
* python/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* libsupc++/Makefile.in: Regenerated.
* config.h.in: Regenerated.
* po/Makefile.in: Regenerated.
* src/Makefile.in: Regenerated.
* src/c++98/Makefile.in: Regenerated.
* src/c++11/Makefile.in: Regenerated.
* doc/Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
top level ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* configure.ac: Add target-libvtv to target_libraries; disable libvtv
on non-linux systems; add target-libvtv to noconfigdirs; add
libsupc++/.libs to C++ library search paths.
* configure: Regenerated.
* Makefile.def: Add libvtv to target_modules; make libvtv depend on
libstdc++ and libgcc.
* Makefile.in: Regenerated.
include/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* vtv-change-permission.h: New file.
contrib/ChangeLog:
2013-08-06 Caroline Tice4 <cmtice@google.com>
* gcc_update: Add libvtv files.
libgcc/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
config.host (extra_parts): Add vtv_start.o, vtv_end.o
vtv_start_preinit.o and vtv_end_preinit.o.
configure.ac: Add code to check/set enable_vtable_verify.
Makefile.in: Add rules to build vtv_*.o, if enable_vtable_verify is
true.
vtv_start_preinit.c: New file.
vtv_end_preinit.c: New file.
vtv_start.c: New file.
vtv_end.c: New file.
configure: Regenerated.
gcc/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* gcc.c (VTABLE_VERIFICATION_SPEC): New definition.
(LINK_COMMAND_SPEC): Add VTABLE_VERIFICATION_SPEC.
* tree-pass.h: Add pass_vtable_verify.
* varasm.c (assemble_variable): Add code to properly set the comdat
section and name for the .vtable_map_vars section.
(assemble_vtyv_preinit_initializer): New function.
(default_sectin_type_flags): Make sure .vtable_map_vars section has
LINK_ONCE flag.
* output.h: Add function decl for assemble_vtv_preinit_initializer.
* vtable-verify.c: New file.
* vtable-verify.h: New file.
* flag-types.h (enum vtv_priority): Defintions for flag_vtable_verify
initialiation levels.
* timevar.def (TV_VTABLE_VERIFICATION): New definition.
* passes.def: Insert pass_vtable_verify.
* aclocal.m4: Reorder includes.
* doc/invoke.texi: Add documentation for the flags -fvtable-verify=,
-fvtv-debug and -fvtv-counts.
* config/gnu-user.h (GNU_USER_TARGET_STARTFILE_SPEC): Add vtv_start*.o,
as appropriate, if -fvtable-verify=... is used.
(GNU_USER_TARGET_ENDFILE_SPEC): Add vtv_end*.o as appropriate, if
-fvtable-verify=... is used.
* Makefile.in (OBJS): Add vtable-verify.o to list.
(vtable-verify.o): Add new build rule.
(GTFILES): Add vtable-verify.c to list.
* common.opt (fvtable-verify=): New flag.
(vtv_priority): Values for fvtable-verify= flag.
(fvtv-counts): New flag.
(fvtv-debug): New flag.
* tree.h (save_vtable_map_decl): New extern function decl.
gcc/cp/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* Make-lang.in (*CXX_AND_OBJCXX_OBJS): Add vtable-class-hierarchy.o to
list.
(vtable-class-hierarchy.o): Add build rule.
* cp-tree.h (vtv_start_verification_constructor_init_function): New
extern function decl.
(vtv_finish_verification_constructor_init_function): New extern
function decl.
(build_vtbl_address): New extern function decl.
(get_mangled_vtable_map_var_name): New extern function decl.
(vtv_compute_class_hierarchy_transitive_closure): New extern function
decl.
(vtv_generate_init_routine): New extern function decl.
(vtv_save_class_info): New extern function decl.
(vtv_recover_class_info): New extern function decl.
(vtv_build_vtable_verify_fndecl): New extern function decl.
* class.c (finish_struct_1): Add call to vtv_save_class_info if
flag_vtable_verify is true.
* config-lang.in: Add vtable-class-hierarchy.c to gtfiles list.
* vtable-class-hierarchy.c: New file.
* mangle.c (get_mangled_vtable_map_var_name): New function.
* decl2.c (start_objects): Update function comment.
(cp_write_global_declarations): Call vtv_recover_class_info,
vtv_compute_class_hierarchy_transitive_closure and
vtv_build_vtable_verify_fndecl, before calling
finalize_compilation_unit, and call vtv_generate_init_rount after, IFF
flag_vtable_verify is true.
(vtv_start_verification_constructor_init_function): New function.
(vtv_finish_verification_constructor_init_function): New function.
* init.c (build_vtbl_address): Remove static qualifier from function.
libvtv/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
Initial check-in of new vtable verification feature.
* configure.ac : New file.
* acinclude.m4 : New file.
* Makefile.am : New file.
* aclocal.m4 : New file.
* configure.tgt : New file.
* configure: New file (generated).
* Makefile.in: New file (generated).
* vtv_set.h : New file.
* vtv_utils.cc : New file.
* vtv_utils.h : New file.
* vtv_malloc.cc : New file.
* vtv_rts.cc : New file.
* vtv_malloc.h : New file.
* vtv_rts.h : New file.
* vtv_fail.cc : New file.
* vtv_fail.h : New file.
* vtv_map.h : New file.
* scripts/run-testsuite.sh : New file.
* scripts/sum-vtv-counts.c : New file.
* testsuite/parts-test-main.h : New file.
* testusite/dataentry.cc : New file.
* testsuite/temp_deriv.cc : New file.
* testsuite/register_pair.cc : New file.
* testsuite/virtual_inheritance.cc : New file.
* testsuite/field-test.cc : New file.
* testsuite/nested_vcall_test.cc : New file.
* testsuite/template-list-iostream.cc : New file.
* testsuite/register_pair_inserts.cc : New file.
* testsuite/register_pair_inserts_mt.cc : New file.
* testsuite/event.list : New file.
* testsuite/parts-test-extra-parts-views.cc : New file.
* testsuite/parts-test-extra-parts-views.h : New file.
* testsuite/environment-fail-32.s : New file.
* testsuite/parts-test-extra-parts.h : New file.
* testsuite/temp_deriv2.cc : New file.
* testsuite/dlopen_mt.cc : New file.
* testsuite/event.h : New file.
* testsuite/template-list.cc : New file.
* testsuite/replace-fail.cc : New file.
* testsuite/Makefile.am : New file.
* testsuite/Makefile.in: New file (generated).
* testsuite/mempool_negative.c : New file.
* testsuite/parts-test-main.cc : New file.
* testsuite/event-private.cc : New file.
* testsuite/thunk.cc : New file.
* testsuite/event-defintiions.cc : New file.
* testsuite/event-private.h : New file.
* testsuite/parts-test.list : New file.
* testusite/register_pair_mt.cc : New file.
* testsuite/povray-derived.cc : New file.
* testsuite/event-main.cc : New file.
* testsuite/environment.cc : New file.
* testsuite/template-list2.cc : New file.
* testsuite/thunk_vtable_map_attack.cc : New file.
* testsuite/parts-test-extra-parts.cc : New file.
* testsuite/environment-fail-64.s : New file.
* testsuite/dlopen.cc : New file.
* testsuite/so.cc : New file.
* testsuite/temp_deriv3.cc : New file.
* testsuite/const_vtable.cc : New file.
* testsuite/mempool_positive.c : New file.
* testsuite/dup_name.cc : New file.
From-SVN: r201555
2013-08-07 11:38:59 +08:00
|
|
|
if test $enable_vtable_verify = yes; then
|
Committing VTV Cygwin patch for Patrick Wollgast
* gcc/config/i386/cygwin.h (STARTFILE_SPEC): Add vtv_start.o,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw-w64.h (STARTFILE_SPEC): Likewise.
* gcc/config/i386/mingw32.h (STARTFILE_SPEC): Likewise.
* gcc/config/i386/cygwin.h (ENDFILE_SPEC): Add vtv_end.o,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw32.h (ENDFILE_SPEC): Likewise.
* gcc/config/i386/cygwin.h (LIB_SPEC): Pass -lvtv and -lpsapi,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw-w64.h (LIB_SPEC): Likewise.
* gcc/config/i386/mingw32.h (LIB_SPEC): Likewise.
* gcc/cp/vtable-class-hierarchy.c (vtv_generate_init_routine): Add
check for not TARGET_PECOFF at the VTV_PREINIT_PRIORITY checks.
* gcc/varasm.c (assemble_variable): Add code to properly set the comdat
section and name for the .vtable_map_vars section in case the
target is PE or COFF.
* libgcc/Makefile.in: Move rules to build vtv_*.o out of the check
for CUSTOM_CRTSTUFF.
* libgcc/config.host (i[34567]86-*-cygwin*, x86_64-*-cygwin*, i[34567]86-*-mingw*)
(x86_64-*-mingw*): Only add vtv_*.o to extra_parts if enable_vtable_verify.
* libstdc++-v3/acinclude.m4: Define VTV_CYGMIN.
* libstdc++-v3/configure: Regenerate.
* libstdc++-v3/libsupc++/Makefile.am: Add vtv_sources only to
libsupc___la_SOURCES and libsupc__convenience_la_SOURCES if VTV_CYGMIN is
not set.
* libstdc++-v3/libsupc++/Makefile.in: Regenerated.
* libstdc++-v3/libsupc++/vtv_stubs.cc: Add none weak declaration of every
function for Cygwin and MinGW.
* libstdc++-v3/src/Makefile.am: Add libvtv.la to toolexeclib_LTLIBRARIES,
if VTV_CYGMIN is set. Define libvtv_la_SOURCES, libvtv_la_LDFLAGS,
libvtv_la_AM_CXXFLAGS and libvtv_la_LINK if VTV_CYGMIN is set.
* libstdc++-v3/src/Makefile.in: Regenerate.
* libvtv/Makefile.am : Add libvtv.la to toolexeclib_LTLIBRARIES, if VTV_CYGMIN
is set. Define libvtv_la_LIBADD, libvtv_la_LDFLAGS, libvtv_stubs_la_LDFLAGS
and libvtv_stubs_la_SOURCES if VTV_CYGMIN is set. Add obstac.c to
libvtv_la_SOURCES if VTV_CYGMIN is set.
* libvtv/Makefile.in : Regenerate.
* libvtv/aclocal.m4 : Regenerate.
* libvtv/configure : Regenerate.
* libvtv/configure.ac : Add ACX_LT_HOST_FLAGS. Define VTV_CYGMIN.
* libvtv/configure.tgt : (x86_64-*-cygwin*, i?86-*-cygwin*, x86_64-*-mingw*)
(i?86-*-mingw*): Add to supported targets.
* libvtv/vtv_fail.cc : Skip inclusion of execinfo.h on Cygwin and MinGW.
(log_error_message): Skip calls to backtrace and backtrace_symbols_fd on Cygwin
and MinGW.
* libvtv/vtv_malloc.cc : Include windows.h and skip sys/mman.h inclusion on
Cygwin and MinGW. Add sysconf port on Cygwin and MinGW.
(obstack_chunk_alloc): Exchange call to mmap with call to VirtualAlloc on Cygwin
and MinGW.
(__vtv_malloc_init): Exchange call to sysconf with call to port of sysconf on
Cygwin and MinGW.
* libvtv/vtv_malloc.h : Declare mprotect and define PROT_READ and PROT_WRITE on
Cygwin and MinGW.
* libvtv/map.h : Include stdint.h on MinGW.
* libvtv/rts.cc : Include windows.h, winternl.h and psapi.h, skip include of
execinfo.h, sys/mman.h and link.h on Cygwin and MinGW.
Add port of __fortify_fail on Cygwin and MinGW.
Change ElfW (Addr) to uintptr_t on Cygwin and MinGW.
(read_section_offset_and_length): Add port for Cygwin and MinGW
(iterate_modules): New function.
(vtv_unprotect_vtable_vars): Use iterate_modules instead of dl_iterate_phdr on
Cygwin and MinGW.
(vtv_protect_vtable_vars): Likewise.
(count_all_pages): Likewise.
(dl_iterate_phdr_count_pages): Don't build on Cygwin and MinGW.
* libvtv/utils.cc : Include windows.h and skip execinfo.h inclusion on
Cygwin and MinGW.
(__vtv_open_log): Exchange call to getuid and getpid with GetCurrentProcessId and
adjust call to snprintf accordingly on Cygwin and MinGW.
Adjust calls to mkdir on MinGW.
Adjust call to open on Cygwin and MinGW.
(__vtv_add_to_log): Adjust call to snprintf on Cygwin and MinGW.
(__vtv_log_verification_failure): Don't generate a backtrace on Cygwin and MinGW.
From-SVN: r220232
2015-01-29 16:03:56 +08:00
|
|
|
case ${target_os} in
|
|
|
|
cygwin*|mingw32*)
|
|
|
|
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-lvtv,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
|
2015-08-12 23:40:11 +08:00
|
|
|
VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs"
|
2015-01-30 02:36:03 +08:00
|
|
|
vtv_cygmin=yes
|
Committing VTV Cygwin patch for Patrick Wollgast
* gcc/config/i386/cygwin.h (STARTFILE_SPEC): Add vtv_start.o,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw-w64.h (STARTFILE_SPEC): Likewise.
* gcc/config/i386/mingw32.h (STARTFILE_SPEC): Likewise.
* gcc/config/i386/cygwin.h (ENDFILE_SPEC): Add vtv_end.o,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw32.h (ENDFILE_SPEC): Likewise.
* gcc/config/i386/cygwin.h (LIB_SPEC): Pass -lvtv and -lpsapi,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw-w64.h (LIB_SPEC): Likewise.
* gcc/config/i386/mingw32.h (LIB_SPEC): Likewise.
* gcc/cp/vtable-class-hierarchy.c (vtv_generate_init_routine): Add
check for not TARGET_PECOFF at the VTV_PREINIT_PRIORITY checks.
* gcc/varasm.c (assemble_variable): Add code to properly set the comdat
section and name for the .vtable_map_vars section in case the
target is PE or COFF.
* libgcc/Makefile.in: Move rules to build vtv_*.o out of the check
for CUSTOM_CRTSTUFF.
* libgcc/config.host (i[34567]86-*-cygwin*, x86_64-*-cygwin*, i[34567]86-*-mingw*)
(x86_64-*-mingw*): Only add vtv_*.o to extra_parts if enable_vtable_verify.
* libstdc++-v3/acinclude.m4: Define VTV_CYGMIN.
* libstdc++-v3/configure: Regenerate.
* libstdc++-v3/libsupc++/Makefile.am: Add vtv_sources only to
libsupc___la_SOURCES and libsupc__convenience_la_SOURCES if VTV_CYGMIN is
not set.
* libstdc++-v3/libsupc++/Makefile.in: Regenerated.
* libstdc++-v3/libsupc++/vtv_stubs.cc: Add none weak declaration of every
function for Cygwin and MinGW.
* libstdc++-v3/src/Makefile.am: Add libvtv.la to toolexeclib_LTLIBRARIES,
if VTV_CYGMIN is set. Define libvtv_la_SOURCES, libvtv_la_LDFLAGS,
libvtv_la_AM_CXXFLAGS and libvtv_la_LINK if VTV_CYGMIN is set.
* libstdc++-v3/src/Makefile.in: Regenerate.
* libvtv/Makefile.am : Add libvtv.la to toolexeclib_LTLIBRARIES, if VTV_CYGMIN
is set. Define libvtv_la_LIBADD, libvtv_la_LDFLAGS, libvtv_stubs_la_LDFLAGS
and libvtv_stubs_la_SOURCES if VTV_CYGMIN is set. Add obstac.c to
libvtv_la_SOURCES if VTV_CYGMIN is set.
* libvtv/Makefile.in : Regenerate.
* libvtv/aclocal.m4 : Regenerate.
* libvtv/configure : Regenerate.
* libvtv/configure.ac : Add ACX_LT_HOST_FLAGS. Define VTV_CYGMIN.
* libvtv/configure.tgt : (x86_64-*-cygwin*, i?86-*-cygwin*, x86_64-*-mingw*)
(i?86-*-mingw*): Add to supported targets.
* libvtv/vtv_fail.cc : Skip inclusion of execinfo.h on Cygwin and MinGW.
(log_error_message): Skip calls to backtrace and backtrace_symbols_fd on Cygwin
and MinGW.
* libvtv/vtv_malloc.cc : Include windows.h and skip sys/mman.h inclusion on
Cygwin and MinGW. Add sysconf port on Cygwin and MinGW.
(obstack_chunk_alloc): Exchange call to mmap with call to VirtualAlloc on Cygwin
and MinGW.
(__vtv_malloc_init): Exchange call to sysconf with call to port of sysconf on
Cygwin and MinGW.
* libvtv/vtv_malloc.h : Declare mprotect and define PROT_READ and PROT_WRITE on
Cygwin and MinGW.
* libvtv/map.h : Include stdint.h on MinGW.
* libvtv/rts.cc : Include windows.h, winternl.h and psapi.h, skip include of
execinfo.h, sys/mman.h and link.h on Cygwin and MinGW.
Add port of __fortify_fail on Cygwin and MinGW.
Change ElfW (Addr) to uintptr_t on Cygwin and MinGW.
(read_section_offset_and_length): Add port for Cygwin and MinGW
(iterate_modules): New function.
(vtv_unprotect_vtable_vars): Use iterate_modules instead of dl_iterate_phdr on
Cygwin and MinGW.
(vtv_protect_vtable_vars): Likewise.
(count_all_pages): Likewise.
(dl_iterate_phdr_count_pages): Don't build on Cygwin and MinGW.
* libvtv/utils.cc : Include windows.h and skip execinfo.h inclusion on
Cygwin and MinGW.
(__vtv_open_log): Exchange call to getuid and getpid with GetCurrentProcessId and
adjust call to snprintf accordingly on Cygwin and MinGW.
Adjust calls to mkdir on MinGW.
Adjust call to open on Cygwin and MinGW.
(__vtv_add_to_log): Adjust call to snprintf on Cygwin and MinGW.
(__vtv_log_verification_failure): Don't generate a backtrace on Cygwin and MinGW.
From-SVN: r220232
2015-01-29 16:03:56 +08:00
|
|
|
;;
|
2015-08-12 23:40:11 +08:00
|
|
|
darwin*)
|
|
|
|
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u,_vtable_map_vars_start -Wl,-u,_vtable_map_vars_end"
|
|
|
|
VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,-rpath,${toplevel_builddir}/libvtv/.libs"
|
|
|
|
;;
|
Port libvtv to Solaris
libstdc++-v3:
* acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY) <solaris2*>: Use
-Wl,-R in VTV_CXXLINKFLAGS.
* configure: Regenerate.
* testsuite/18_support/bad_exception/23591_thread-1.c: Use
-fvtable-verify=none on Solaris 12+.
libgcc:
* Makefile.in (VTV_CFLAGS): New variable.
(vtv_start$(objext), vtv_end$(objext), vtv_end$(objext))
(vtv_start_preinit$(objext), vtv_end_preinit$(objext)): Use it.
* config.host (*-*-solaris2*): Add t-crtstuff-pic to tmake_file.
Add vtv_start.o, vtv_end.o, vtv_start_preinit.o, vtv_end_preinit.o
to extra_parts if $enable_vtable_verify = yes.
libvtv:
* configure.tgt (*-*-solaris2.[1-9]*): Declare supported.
* configure.ac: Call AC_USE_SYSTEM_EXTENSIONS.
<*-*-solaris2*>: Check for init priority support.
Check for getexecname, __fortify_fail, _obstack_begin.
(VTV_NO_OBSTACK): New conditional.
* configure: Regenerate.
* Makefile.am [VTV_NO_OBSTACK] (obstack.c): Use new condition.
Create empty config.h
* Makefile.in: Regenerate.
* vtv_rts.cc [HAVE_GETEXECNAME] (program_invocation_name): New
variable.
(read_section_offset_and_length) [HAVE_GETEXECNAME]: Set it.
(dl_iterate_phdr_callback) [HAVE_GETEXECNAME]: Set it.
(__fortify_fail): Wrap in HAVE___FORTIFY_FAIL
[!HAVE___FORTIFY_FAIL]: Provide non-Cygwin implementation.
(read_section_offset_and_length): Assert sh_size >= VTV_PAGE_SIZE.
(iterate_modules): Fix typo.
Use VTV_PAGE_SIZE.
(dl_iterate_phdr_callback): Fix typo.
Use VTV_PAGE_SIZE.
(__VLTChangePermission): Fix typos.
include:
* vtv-change-permission.h (VTV_PAGE_SIZE) [__sun__ && __svr4__ &&
__sparc__]: Define.
gcc:
* config/sol2.h (SUPPORTS_INIT_PRIORITY): Move up.
(STARTFILE_VTV_SPEC, ENDFILE_VTV_SPEC): Define.
(STARTFILE_SPEC): Use %(startfile_vtv).
(ENDFILE_SPEC): Use %(endfile_vtv).
(SUBTARGET_EXTRA_SPECS): Handle STARTFILE_VTV_SPEC,
ENDFILE_VTV_SPEC.
* gcc.c (LINK_COMMAND_SPEC): Move VTABLE_VERIFICATION_SPEC after %{L*}.
From-SVN: r230865
2015-11-25 18:30:25 +08:00
|
|
|
solaris2*)
|
|
|
|
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
|
|
|
|
VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,-R -Wl,${toplevel_builddir}/libvtv/.libs"
|
|
|
|
;;
|
Committing VTV Cygwin patch for Patrick Wollgast
* gcc/config/i386/cygwin.h (STARTFILE_SPEC): Add vtv_start.o,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw-w64.h (STARTFILE_SPEC): Likewise.
* gcc/config/i386/mingw32.h (STARTFILE_SPEC): Likewise.
* gcc/config/i386/cygwin.h (ENDFILE_SPEC): Add vtv_end.o,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw32.h (ENDFILE_SPEC): Likewise.
* gcc/config/i386/cygwin.h (LIB_SPEC): Pass -lvtv and -lpsapi,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw-w64.h (LIB_SPEC): Likewise.
* gcc/config/i386/mingw32.h (LIB_SPEC): Likewise.
* gcc/cp/vtable-class-hierarchy.c (vtv_generate_init_routine): Add
check for not TARGET_PECOFF at the VTV_PREINIT_PRIORITY checks.
* gcc/varasm.c (assemble_variable): Add code to properly set the comdat
section and name for the .vtable_map_vars section in case the
target is PE or COFF.
* libgcc/Makefile.in: Move rules to build vtv_*.o out of the check
for CUSTOM_CRTSTUFF.
* libgcc/config.host (i[34567]86-*-cygwin*, x86_64-*-cygwin*, i[34567]86-*-mingw*)
(x86_64-*-mingw*): Only add vtv_*.o to extra_parts if enable_vtable_verify.
* libstdc++-v3/acinclude.m4: Define VTV_CYGMIN.
* libstdc++-v3/configure: Regenerate.
* libstdc++-v3/libsupc++/Makefile.am: Add vtv_sources only to
libsupc___la_SOURCES and libsupc__convenience_la_SOURCES if VTV_CYGMIN is
not set.
* libstdc++-v3/libsupc++/Makefile.in: Regenerated.
* libstdc++-v3/libsupc++/vtv_stubs.cc: Add none weak declaration of every
function for Cygwin and MinGW.
* libstdc++-v3/src/Makefile.am: Add libvtv.la to toolexeclib_LTLIBRARIES,
if VTV_CYGMIN is set. Define libvtv_la_SOURCES, libvtv_la_LDFLAGS,
libvtv_la_AM_CXXFLAGS and libvtv_la_LINK if VTV_CYGMIN is set.
* libstdc++-v3/src/Makefile.in: Regenerate.
* libvtv/Makefile.am : Add libvtv.la to toolexeclib_LTLIBRARIES, if VTV_CYGMIN
is set. Define libvtv_la_LIBADD, libvtv_la_LDFLAGS, libvtv_stubs_la_LDFLAGS
and libvtv_stubs_la_SOURCES if VTV_CYGMIN is set. Add obstac.c to
libvtv_la_SOURCES if VTV_CYGMIN is set.
* libvtv/Makefile.in : Regenerate.
* libvtv/aclocal.m4 : Regenerate.
* libvtv/configure : Regenerate.
* libvtv/configure.ac : Add ACX_LT_HOST_FLAGS. Define VTV_CYGMIN.
* libvtv/configure.tgt : (x86_64-*-cygwin*, i?86-*-cygwin*, x86_64-*-mingw*)
(i?86-*-mingw*): Add to supported targets.
* libvtv/vtv_fail.cc : Skip inclusion of execinfo.h on Cygwin and MinGW.
(log_error_message): Skip calls to backtrace and backtrace_symbols_fd on Cygwin
and MinGW.
* libvtv/vtv_malloc.cc : Include windows.h and skip sys/mman.h inclusion on
Cygwin and MinGW. Add sysconf port on Cygwin and MinGW.
(obstack_chunk_alloc): Exchange call to mmap with call to VirtualAlloc on Cygwin
and MinGW.
(__vtv_malloc_init): Exchange call to sysconf with call to port of sysconf on
Cygwin and MinGW.
* libvtv/vtv_malloc.h : Declare mprotect and define PROT_READ and PROT_WRITE on
Cygwin and MinGW.
* libvtv/map.h : Include stdint.h on MinGW.
* libvtv/rts.cc : Include windows.h, winternl.h and psapi.h, skip include of
execinfo.h, sys/mman.h and link.h on Cygwin and MinGW.
Add port of __fortify_fail on Cygwin and MinGW.
Change ElfW (Addr) to uintptr_t on Cygwin and MinGW.
(read_section_offset_and_length): Add port for Cygwin and MinGW
(iterate_modules): New function.
(vtv_unprotect_vtable_vars): Use iterate_modules instead of dl_iterate_phdr on
Cygwin and MinGW.
(vtv_protect_vtable_vars): Likewise.
(count_all_pages): Likewise.
(dl_iterate_phdr_count_pages): Don't build on Cygwin and MinGW.
* libvtv/utils.cc : Include windows.h and skip execinfo.h inclusion on
Cygwin and MinGW.
(__vtv_open_log): Exchange call to getuid and getpid with GetCurrentProcessId and
adjust call to snprintf accordingly on Cygwin and MinGW.
Adjust calls to mkdir on MinGW.
Adjust call to open on Cygwin and MinGW.
(__vtv_add_to_log): Adjust call to snprintf on Cygwin and MinGW.
(__vtv_log_verification_failure): Don't generate a backtrace on Cygwin and MinGW.
From-SVN: r220232
2015-01-29 16:03:56 +08:00
|
|
|
*)
|
|
|
|
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
|
2015-08-12 23:40:11 +08:00
|
|
|
VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs"
|
Committing VTV Cygwin patch for Patrick Wollgast
* gcc/config/i386/cygwin.h (STARTFILE_SPEC): Add vtv_start.o,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw-w64.h (STARTFILE_SPEC): Likewise.
* gcc/config/i386/mingw32.h (STARTFILE_SPEC): Likewise.
* gcc/config/i386/cygwin.h (ENDFILE_SPEC): Add vtv_end.o,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw32.h (ENDFILE_SPEC): Likewise.
* gcc/config/i386/cygwin.h (LIB_SPEC): Pass -lvtv and -lpsapi,
if -fvtable-verify=preinit/std is used.
* gcc/config/i386/mingw-w64.h (LIB_SPEC): Likewise.
* gcc/config/i386/mingw32.h (LIB_SPEC): Likewise.
* gcc/cp/vtable-class-hierarchy.c (vtv_generate_init_routine): Add
check for not TARGET_PECOFF at the VTV_PREINIT_PRIORITY checks.
* gcc/varasm.c (assemble_variable): Add code to properly set the comdat
section and name for the .vtable_map_vars section in case the
target is PE or COFF.
* libgcc/Makefile.in: Move rules to build vtv_*.o out of the check
for CUSTOM_CRTSTUFF.
* libgcc/config.host (i[34567]86-*-cygwin*, x86_64-*-cygwin*, i[34567]86-*-mingw*)
(x86_64-*-mingw*): Only add vtv_*.o to extra_parts if enable_vtable_verify.
* libstdc++-v3/acinclude.m4: Define VTV_CYGMIN.
* libstdc++-v3/configure: Regenerate.
* libstdc++-v3/libsupc++/Makefile.am: Add vtv_sources only to
libsupc___la_SOURCES and libsupc__convenience_la_SOURCES if VTV_CYGMIN is
not set.
* libstdc++-v3/libsupc++/Makefile.in: Regenerated.
* libstdc++-v3/libsupc++/vtv_stubs.cc: Add none weak declaration of every
function for Cygwin and MinGW.
* libstdc++-v3/src/Makefile.am: Add libvtv.la to toolexeclib_LTLIBRARIES,
if VTV_CYGMIN is set. Define libvtv_la_SOURCES, libvtv_la_LDFLAGS,
libvtv_la_AM_CXXFLAGS and libvtv_la_LINK if VTV_CYGMIN is set.
* libstdc++-v3/src/Makefile.in: Regenerate.
* libvtv/Makefile.am : Add libvtv.la to toolexeclib_LTLIBRARIES, if VTV_CYGMIN
is set. Define libvtv_la_LIBADD, libvtv_la_LDFLAGS, libvtv_stubs_la_LDFLAGS
and libvtv_stubs_la_SOURCES if VTV_CYGMIN is set. Add obstac.c to
libvtv_la_SOURCES if VTV_CYGMIN is set.
* libvtv/Makefile.in : Regenerate.
* libvtv/aclocal.m4 : Regenerate.
* libvtv/configure : Regenerate.
* libvtv/configure.ac : Add ACX_LT_HOST_FLAGS. Define VTV_CYGMIN.
* libvtv/configure.tgt : (x86_64-*-cygwin*, i?86-*-cygwin*, x86_64-*-mingw*)
(i?86-*-mingw*): Add to supported targets.
* libvtv/vtv_fail.cc : Skip inclusion of execinfo.h on Cygwin and MinGW.
(log_error_message): Skip calls to backtrace and backtrace_symbols_fd on Cygwin
and MinGW.
* libvtv/vtv_malloc.cc : Include windows.h and skip sys/mman.h inclusion on
Cygwin and MinGW. Add sysconf port on Cygwin and MinGW.
(obstack_chunk_alloc): Exchange call to mmap with call to VirtualAlloc on Cygwin
and MinGW.
(__vtv_malloc_init): Exchange call to sysconf with call to port of sysconf on
Cygwin and MinGW.
* libvtv/vtv_malloc.h : Declare mprotect and define PROT_READ and PROT_WRITE on
Cygwin and MinGW.
* libvtv/map.h : Include stdint.h on MinGW.
* libvtv/rts.cc : Include windows.h, winternl.h and psapi.h, skip include of
execinfo.h, sys/mman.h and link.h on Cygwin and MinGW.
Add port of __fortify_fail on Cygwin and MinGW.
Change ElfW (Addr) to uintptr_t on Cygwin and MinGW.
(read_section_offset_and_length): Add port for Cygwin and MinGW
(iterate_modules): New function.
(vtv_unprotect_vtable_vars): Use iterate_modules instead of dl_iterate_phdr on
Cygwin and MinGW.
(vtv_protect_vtable_vars): Likewise.
(count_all_pages): Likewise.
(dl_iterate_phdr_count_pages): Don't build on Cygwin and MinGW.
* libvtv/utils.cc : Include windows.h and skip execinfo.h inclusion on
Cygwin and MinGW.
(__vtv_open_log): Exchange call to getuid and getpid with GetCurrentProcessId and
adjust call to snprintf accordingly on Cygwin and MinGW.
Adjust calls to mkdir on MinGW.
Adjust call to open on Cygwin and MinGW.
(__vtv_add_to_log): Adjust call to snprintf on Cygwin and MinGW.
(__vtv_log_verification_failure): Don't generate a backtrace on Cygwin and MinGW.
From-SVN: r220232
2015-01-29 16:03:56 +08:00
|
|
|
;;
|
|
|
|
esac
|
Commit the vtable verification feature.
Commit the vtable verification feature. This feature is designed to
detect, at run time, if/when the vtable pointer in a C++ object has
been corrupted, before allowing virtual calls through that pointer.
If pointer corruption is detected, execution of the program is halted.
libstdc++-v3 ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* fragment.am: Add XTEMPLATE_FLAGS.
* configure.ac: Add definitions for --enable-vtable-verify.
* acinclude.m4: Add --enable-vtable-verify and
--disable-vtable-verify; define --enable-vtable-verify; define
VTV_CXXFLAGS, VTV_PCH_CXXFLAGS and VTV_CXXLINKFLAGS.
* config/abi/pre/gnu.ver: Export symbols for vtable verification.
* libsupc++/Makefile.am: Define vtv_sources and add it to
libsupc___la_SOURCES and libsupc__convenience_la_SOURCES.
* libsupc++/vtv_stubs.cc: New file.
* include/Makefile.am: Add VTV_PCH_CXXFLAGS to PCHFLAGS.
* src/Makefile.am: Add VTV_CXXFLAGS to AM_CXXFLAGS; add
VTV_CXXLINKFLAGS to CXXLINK.
* src/c++98/Makefile.am: Comment out XTEMPLATE_FLAGS; add VTV_CXXFLAGS
to AM_CXXFLAGS; add VTV_CXXXLINKFLAGS to CXXLINK.
* src/C++11/Makefile.am: Ditto.
* doc/xml/manual/configure.xml: Add entry for --enable-vtable-verify.
* scripts/testsuite_flags.in: Add cxxvtvflags to Usage; cause
cxxvtvflags to use VTV_CXXFLAGS and VTV_CXXLINKFLAGS.
* testsuite/lib/libstdc++.exp: Add cxxvtvflags; add code to locate
libvtv if --enable-vtable-verify was used; set cxxvtvflags; add
cxxvtvflags to cxx_final.
* testsuite/18_support/bad_exception/23591_thread-1.c: Add
-fvtable-verify=none to compiler flags.
* testsuite/17_intro/freestanding.cc: Add -fvtable-verify=none
to compiler flags.
* configure: Regenerated.
* Makefile.in: Regenerated.
* python/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* libsupc++/Makefile.in: Regenerated.
* config.h.in: Regenerated.
* po/Makefile.in: Regenerated.
* src/Makefile.in: Regenerated.
* src/c++98/Makefile.in: Regenerated.
* src/c++11/Makefile.in: Regenerated.
* doc/Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
top level ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* configure.ac: Add target-libvtv to target_libraries; disable libvtv
on non-linux systems; add target-libvtv to noconfigdirs; add
libsupc++/.libs to C++ library search paths.
* configure: Regenerated.
* Makefile.def: Add libvtv to target_modules; make libvtv depend on
libstdc++ and libgcc.
* Makefile.in: Regenerated.
include/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* vtv-change-permission.h: New file.
contrib/ChangeLog:
2013-08-06 Caroline Tice4 <cmtice@google.com>
* gcc_update: Add libvtv files.
libgcc/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
config.host (extra_parts): Add vtv_start.o, vtv_end.o
vtv_start_preinit.o and vtv_end_preinit.o.
configure.ac: Add code to check/set enable_vtable_verify.
Makefile.in: Add rules to build vtv_*.o, if enable_vtable_verify is
true.
vtv_start_preinit.c: New file.
vtv_end_preinit.c: New file.
vtv_start.c: New file.
vtv_end.c: New file.
configure: Regenerated.
gcc/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* gcc.c (VTABLE_VERIFICATION_SPEC): New definition.
(LINK_COMMAND_SPEC): Add VTABLE_VERIFICATION_SPEC.
* tree-pass.h: Add pass_vtable_verify.
* varasm.c (assemble_variable): Add code to properly set the comdat
section and name for the .vtable_map_vars section.
(assemble_vtyv_preinit_initializer): New function.
(default_sectin_type_flags): Make sure .vtable_map_vars section has
LINK_ONCE flag.
* output.h: Add function decl for assemble_vtv_preinit_initializer.
* vtable-verify.c: New file.
* vtable-verify.h: New file.
* flag-types.h (enum vtv_priority): Defintions for flag_vtable_verify
initialiation levels.
* timevar.def (TV_VTABLE_VERIFICATION): New definition.
* passes.def: Insert pass_vtable_verify.
* aclocal.m4: Reorder includes.
* doc/invoke.texi: Add documentation for the flags -fvtable-verify=,
-fvtv-debug and -fvtv-counts.
* config/gnu-user.h (GNU_USER_TARGET_STARTFILE_SPEC): Add vtv_start*.o,
as appropriate, if -fvtable-verify=... is used.
(GNU_USER_TARGET_ENDFILE_SPEC): Add vtv_end*.o as appropriate, if
-fvtable-verify=... is used.
* Makefile.in (OBJS): Add vtable-verify.o to list.
(vtable-verify.o): Add new build rule.
(GTFILES): Add vtable-verify.c to list.
* common.opt (fvtable-verify=): New flag.
(vtv_priority): Values for fvtable-verify= flag.
(fvtv-counts): New flag.
(fvtv-debug): New flag.
* tree.h (save_vtable_map_decl): New extern function decl.
gcc/cp/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* Make-lang.in (*CXX_AND_OBJCXX_OBJS): Add vtable-class-hierarchy.o to
list.
(vtable-class-hierarchy.o): Add build rule.
* cp-tree.h (vtv_start_verification_constructor_init_function): New
extern function decl.
(vtv_finish_verification_constructor_init_function): New extern
function decl.
(build_vtbl_address): New extern function decl.
(get_mangled_vtable_map_var_name): New extern function decl.
(vtv_compute_class_hierarchy_transitive_closure): New extern function
decl.
(vtv_generate_init_routine): New extern function decl.
(vtv_save_class_info): New extern function decl.
(vtv_recover_class_info): New extern function decl.
(vtv_build_vtable_verify_fndecl): New extern function decl.
* class.c (finish_struct_1): Add call to vtv_save_class_info if
flag_vtable_verify is true.
* config-lang.in: Add vtable-class-hierarchy.c to gtfiles list.
* vtable-class-hierarchy.c: New file.
* mangle.c (get_mangled_vtable_map_var_name): New function.
* decl2.c (start_objects): Update function comment.
(cp_write_global_declarations): Call vtv_recover_class_info,
vtv_compute_class_hierarchy_transitive_closure and
vtv_build_vtable_verify_fndecl, before calling
finalize_compilation_unit, and call vtv_generate_init_rount after, IFF
flag_vtable_verify is true.
(vtv_start_verification_constructor_init_function): New function.
(vtv_finish_verification_constructor_init_function): New function.
* init.c (build_vtbl_address): Remove static qualifier from function.
libvtv/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
Initial check-in of new vtable verification feature.
* configure.ac : New file.
* acinclude.m4 : New file.
* Makefile.am : New file.
* aclocal.m4 : New file.
* configure.tgt : New file.
* configure: New file (generated).
* Makefile.in: New file (generated).
* vtv_set.h : New file.
* vtv_utils.cc : New file.
* vtv_utils.h : New file.
* vtv_malloc.cc : New file.
* vtv_rts.cc : New file.
* vtv_malloc.h : New file.
* vtv_rts.h : New file.
* vtv_fail.cc : New file.
* vtv_fail.h : New file.
* vtv_map.h : New file.
* scripts/run-testsuite.sh : New file.
* scripts/sum-vtv-counts.c : New file.
* testsuite/parts-test-main.h : New file.
* testusite/dataentry.cc : New file.
* testsuite/temp_deriv.cc : New file.
* testsuite/register_pair.cc : New file.
* testsuite/virtual_inheritance.cc : New file.
* testsuite/field-test.cc : New file.
* testsuite/nested_vcall_test.cc : New file.
* testsuite/template-list-iostream.cc : New file.
* testsuite/register_pair_inserts.cc : New file.
* testsuite/register_pair_inserts_mt.cc : New file.
* testsuite/event.list : New file.
* testsuite/parts-test-extra-parts-views.cc : New file.
* testsuite/parts-test-extra-parts-views.h : New file.
* testsuite/environment-fail-32.s : New file.
* testsuite/parts-test-extra-parts.h : New file.
* testsuite/temp_deriv2.cc : New file.
* testsuite/dlopen_mt.cc : New file.
* testsuite/event.h : New file.
* testsuite/template-list.cc : New file.
* testsuite/replace-fail.cc : New file.
* testsuite/Makefile.am : New file.
* testsuite/Makefile.in: New file (generated).
* testsuite/mempool_negative.c : New file.
* testsuite/parts-test-main.cc : New file.
* testsuite/event-private.cc : New file.
* testsuite/thunk.cc : New file.
* testsuite/event-defintiions.cc : New file.
* testsuite/event-private.h : New file.
* testsuite/parts-test.list : New file.
* testusite/register_pair_mt.cc : New file.
* testsuite/povray-derived.cc : New file.
* testsuite/event-main.cc : New file.
* testsuite/environment.cc : New file.
* testsuite/template-list2.cc : New file.
* testsuite/thunk_vtable_map_attack.cc : New file.
* testsuite/parts-test-extra-parts.cc : New file.
* testsuite/environment-fail-64.s : New file.
* testsuite/dlopen.cc : New file.
* testsuite/so.cc : New file.
* testsuite/temp_deriv3.cc : New file.
* testsuite/const_vtable.cc : New file.
* testsuite/mempool_positive.c : New file.
* testsuite/dup_name.cc : New file.
From-SVN: r201555
2013-08-07 11:38:59 +08:00
|
|
|
VTV_PCH_CXXFLAGS="-fvtable-verify=std"
|
|
|
|
else
|
|
|
|
VTV_CXXFLAGS=
|
|
|
|
VTV_PCH_CXXFLAGS=
|
|
|
|
VTV_CXXLINKFLAGS=
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_SUBST(VTV_CXXFLAGS)
|
|
|
|
AC_SUBST(VTV_PCH_CXXFLAGS)
|
|
|
|
AC_SUBST(VTV_CXXLINKFLAGS)
|
2015-01-30 02:36:03 +08:00
|
|
|
AM_CONDITIONAL(VTV_CYGMIN, test x$vtv_cygmin = xyes)
|
Commit the vtable verification feature.
Commit the vtable verification feature. This feature is designed to
detect, at run time, if/when the vtable pointer in a C++ object has
been corrupted, before allowing virtual calls through that pointer.
If pointer corruption is detected, execution of the program is halted.
libstdc++-v3 ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* fragment.am: Add XTEMPLATE_FLAGS.
* configure.ac: Add definitions for --enable-vtable-verify.
* acinclude.m4: Add --enable-vtable-verify and
--disable-vtable-verify; define --enable-vtable-verify; define
VTV_CXXFLAGS, VTV_PCH_CXXFLAGS and VTV_CXXLINKFLAGS.
* config/abi/pre/gnu.ver: Export symbols for vtable verification.
* libsupc++/Makefile.am: Define vtv_sources and add it to
libsupc___la_SOURCES and libsupc__convenience_la_SOURCES.
* libsupc++/vtv_stubs.cc: New file.
* include/Makefile.am: Add VTV_PCH_CXXFLAGS to PCHFLAGS.
* src/Makefile.am: Add VTV_CXXFLAGS to AM_CXXFLAGS; add
VTV_CXXLINKFLAGS to CXXLINK.
* src/c++98/Makefile.am: Comment out XTEMPLATE_FLAGS; add VTV_CXXFLAGS
to AM_CXXFLAGS; add VTV_CXXXLINKFLAGS to CXXLINK.
* src/C++11/Makefile.am: Ditto.
* doc/xml/manual/configure.xml: Add entry for --enable-vtable-verify.
* scripts/testsuite_flags.in: Add cxxvtvflags to Usage; cause
cxxvtvflags to use VTV_CXXFLAGS and VTV_CXXLINKFLAGS.
* testsuite/lib/libstdc++.exp: Add cxxvtvflags; add code to locate
libvtv if --enable-vtable-verify was used; set cxxvtvflags; add
cxxvtvflags to cxx_final.
* testsuite/18_support/bad_exception/23591_thread-1.c: Add
-fvtable-verify=none to compiler flags.
* testsuite/17_intro/freestanding.cc: Add -fvtable-verify=none
to compiler flags.
* configure: Regenerated.
* Makefile.in: Regenerated.
* python/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* libsupc++/Makefile.in: Regenerated.
* config.h.in: Regenerated.
* po/Makefile.in: Regenerated.
* src/Makefile.in: Regenerated.
* src/c++98/Makefile.in: Regenerated.
* src/c++11/Makefile.in: Regenerated.
* doc/Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
top level ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* configure.ac: Add target-libvtv to target_libraries; disable libvtv
on non-linux systems; add target-libvtv to noconfigdirs; add
libsupc++/.libs to C++ library search paths.
* configure: Regenerated.
* Makefile.def: Add libvtv to target_modules; make libvtv depend on
libstdc++ and libgcc.
* Makefile.in: Regenerated.
include/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* vtv-change-permission.h: New file.
contrib/ChangeLog:
2013-08-06 Caroline Tice4 <cmtice@google.com>
* gcc_update: Add libvtv files.
libgcc/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
config.host (extra_parts): Add vtv_start.o, vtv_end.o
vtv_start_preinit.o and vtv_end_preinit.o.
configure.ac: Add code to check/set enable_vtable_verify.
Makefile.in: Add rules to build vtv_*.o, if enable_vtable_verify is
true.
vtv_start_preinit.c: New file.
vtv_end_preinit.c: New file.
vtv_start.c: New file.
vtv_end.c: New file.
configure: Regenerated.
gcc/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* gcc.c (VTABLE_VERIFICATION_SPEC): New definition.
(LINK_COMMAND_SPEC): Add VTABLE_VERIFICATION_SPEC.
* tree-pass.h: Add pass_vtable_verify.
* varasm.c (assemble_variable): Add code to properly set the comdat
section and name for the .vtable_map_vars section.
(assemble_vtyv_preinit_initializer): New function.
(default_sectin_type_flags): Make sure .vtable_map_vars section has
LINK_ONCE flag.
* output.h: Add function decl for assemble_vtv_preinit_initializer.
* vtable-verify.c: New file.
* vtable-verify.h: New file.
* flag-types.h (enum vtv_priority): Defintions for flag_vtable_verify
initialiation levels.
* timevar.def (TV_VTABLE_VERIFICATION): New definition.
* passes.def: Insert pass_vtable_verify.
* aclocal.m4: Reorder includes.
* doc/invoke.texi: Add documentation for the flags -fvtable-verify=,
-fvtv-debug and -fvtv-counts.
* config/gnu-user.h (GNU_USER_TARGET_STARTFILE_SPEC): Add vtv_start*.o,
as appropriate, if -fvtable-verify=... is used.
(GNU_USER_TARGET_ENDFILE_SPEC): Add vtv_end*.o as appropriate, if
-fvtable-verify=... is used.
* Makefile.in (OBJS): Add vtable-verify.o to list.
(vtable-verify.o): Add new build rule.
(GTFILES): Add vtable-verify.c to list.
* common.opt (fvtable-verify=): New flag.
(vtv_priority): Values for fvtable-verify= flag.
(fvtv-counts): New flag.
(fvtv-debug): New flag.
* tree.h (save_vtable_map_decl): New extern function decl.
gcc/cp/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
* Make-lang.in (*CXX_AND_OBJCXX_OBJS): Add vtable-class-hierarchy.o to
list.
(vtable-class-hierarchy.o): Add build rule.
* cp-tree.h (vtv_start_verification_constructor_init_function): New
extern function decl.
(vtv_finish_verification_constructor_init_function): New extern
function decl.
(build_vtbl_address): New extern function decl.
(get_mangled_vtable_map_var_name): New extern function decl.
(vtv_compute_class_hierarchy_transitive_closure): New extern function
decl.
(vtv_generate_init_routine): New extern function decl.
(vtv_save_class_info): New extern function decl.
(vtv_recover_class_info): New extern function decl.
(vtv_build_vtable_verify_fndecl): New extern function decl.
* class.c (finish_struct_1): Add call to vtv_save_class_info if
flag_vtable_verify is true.
* config-lang.in: Add vtable-class-hierarchy.c to gtfiles list.
* vtable-class-hierarchy.c: New file.
* mangle.c (get_mangled_vtable_map_var_name): New function.
* decl2.c (start_objects): Update function comment.
(cp_write_global_declarations): Call vtv_recover_class_info,
vtv_compute_class_hierarchy_transitive_closure and
vtv_build_vtable_verify_fndecl, before calling
finalize_compilation_unit, and call vtv_generate_init_rount after, IFF
flag_vtable_verify is true.
(vtv_start_verification_constructor_init_function): New function.
(vtv_finish_verification_constructor_init_function): New function.
* init.c (build_vtbl_address): Remove static qualifier from function.
libvtv/ChangeLog:
2013-08-06 Caroline Tice <cmtice@google.com>
Initial check-in of new vtable verification feature.
* configure.ac : New file.
* acinclude.m4 : New file.
* Makefile.am : New file.
* aclocal.m4 : New file.
* configure.tgt : New file.
* configure: New file (generated).
* Makefile.in: New file (generated).
* vtv_set.h : New file.
* vtv_utils.cc : New file.
* vtv_utils.h : New file.
* vtv_malloc.cc : New file.
* vtv_rts.cc : New file.
* vtv_malloc.h : New file.
* vtv_rts.h : New file.
* vtv_fail.cc : New file.
* vtv_fail.h : New file.
* vtv_map.h : New file.
* scripts/run-testsuite.sh : New file.
* scripts/sum-vtv-counts.c : New file.
* testsuite/parts-test-main.h : New file.
* testusite/dataentry.cc : New file.
* testsuite/temp_deriv.cc : New file.
* testsuite/register_pair.cc : New file.
* testsuite/virtual_inheritance.cc : New file.
* testsuite/field-test.cc : New file.
* testsuite/nested_vcall_test.cc : New file.
* testsuite/template-list-iostream.cc : New file.
* testsuite/register_pair_inserts.cc : New file.
* testsuite/register_pair_inserts_mt.cc : New file.
* testsuite/event.list : New file.
* testsuite/parts-test-extra-parts-views.cc : New file.
* testsuite/parts-test-extra-parts-views.h : New file.
* testsuite/environment-fail-32.s : New file.
* testsuite/parts-test-extra-parts.h : New file.
* testsuite/temp_deriv2.cc : New file.
* testsuite/dlopen_mt.cc : New file.
* testsuite/event.h : New file.
* testsuite/template-list.cc : New file.
* testsuite/replace-fail.cc : New file.
* testsuite/Makefile.am : New file.
* testsuite/Makefile.in: New file (generated).
* testsuite/mempool_negative.c : New file.
* testsuite/parts-test-main.cc : New file.
* testsuite/event-private.cc : New file.
* testsuite/thunk.cc : New file.
* testsuite/event-defintiions.cc : New file.
* testsuite/event-private.h : New file.
* testsuite/parts-test.list : New file.
* testusite/register_pair_mt.cc : New file.
* testsuite/povray-derived.cc : New file.
* testsuite/event-main.cc : New file.
* testsuite/environment.cc : New file.
* testsuite/template-list2.cc : New file.
* testsuite/thunk_vtable_map_attack.cc : New file.
* testsuite/parts-test-extra-parts.cc : New file.
* testsuite/environment-fail-64.s : New file.
* testsuite/dlopen.cc : New file.
* testsuite/so.cc : New file.
* testsuite/temp_deriv3.cc : New file.
* testsuite/const_vtable.cc : New file.
* testsuite/mempool_positive.c : New file.
* testsuite/dup_name.cc : New file.
From-SVN: r201555
2013-08-07 11:38:59 +08:00
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_VTABLE_VERIFY, test $enable_vtable_verify = yes)
|
|
|
|
])
|
|
|
|
|
2007-09-12 06:32:51 +08:00
|
|
|
dnl
|
|
|
|
dnl Check for parallel mode pre-requisites, including OpenMP support.
|
|
|
|
dnl
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_PARALLEL
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_PARALLEL], [
|
|
|
|
|
|
|
|
enable_parallel=no;
|
2008-04-25 07:30:10 +08:00
|
|
|
|
2008-04-29 12:40:08 +08:00
|
|
|
# See if configured libgomp/omp.h exists. (libgomp may be in
|
|
|
|
# noconfigdirs but not explicitly disabled.)
|
2010-01-22 21:35:38 +08:00
|
|
|
if echo " ${TARGET_CONFIGDIRS} " | grep " libgomp " > /dev/null 2>&1 ; then
|
2008-04-29 12:40:08 +08:00
|
|
|
enable_parallel=yes;
|
|
|
|
else
|
2010-01-22 21:35:38 +08:00
|
|
|
AC_MSG_NOTICE([target-libgomp not built])
|
2007-09-12 06:32:51 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for parallel mode support])
|
|
|
|
AC_MSG_RESULT([$enable_parallel])
|
|
|
|
])
|
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
|
2000-04-22 04:33:34 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Check for which I/O library to use: stdio, or something specific.
|
2002-12-30 22:54:45 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Default is stdio.
|
2000-04-22 04:33:34 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_CSTDIO], [
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_MSG_CHECKING([for underlying I/O to use])
|
2010-10-04 16:49:59 +08:00
|
|
|
GLIBCXX_ENABLE(cstdio,stdio,[[[=PACKAGE]]],
|
2003-08-05 10:00:18 +08:00
|
|
|
[use target-specific I/O package], [permit stdio])
|
|
|
|
|
|
|
|
# Now that libio has been removed, you can have any color you want as long
|
|
|
|
# as it's black. This is one big no-op until other packages are added, but
|
|
|
|
# showing the framework never hurts.
|
|
|
|
case ${enable_cstdio} in
|
|
|
|
stdio)
|
2001-08-08 10:49:01 +08:00
|
|
|
CSTDIO_H=config/io/c_io_stdio.h
|
|
|
|
BASIC_FILE_H=config/io/basic_file_stdio.h
|
|
|
|
BASIC_FILE_CC=config/io/basic_file_stdio.cc
|
2000-11-02 05:38:32 +08:00
|
|
|
AC_MSG_RESULT(stdio)
|
2000-07-19 08:57:38 +08:00
|
|
|
;;
|
2000-04-22 04:33:34 +08:00
|
|
|
esac
|
2003-07-04 15:14:54 +08:00
|
|
|
|
2001-07-14 00:47:56 +08:00
|
|
|
AC_SUBST(CSTDIO_H)
|
|
|
|
AC_SUBST(BASIC_FILE_H)
|
2002-12-17 03:02:01 +08:00
|
|
|
AC_SUBST(BASIC_FILE_CC)
|
2000-04-22 04:33:34 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2003-04-17 11:27:05 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Check for "unusual" flags to pass to the compiler while building.
|
2003-04-17 11:27:05 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl --enable-cxx-flags='-foo -bar -baz' is a general method for passing
|
|
|
|
dnl experimental flags such as -fpch, -fIMI, -Dfloat=char, etc.
|
|
|
|
dnl --disable-cxx-flags passes nothing.
|
|
|
|
dnl + See http://gcc.gnu.org/ml/libstdc++/2000-q2/msg00131.html
|
|
|
|
dnl http://gcc.gnu.org/ml/libstdc++/2000-q2/msg00284.html
|
|
|
|
dnl http://gcc.gnu.org/ml/libstdc++/2000-q1/msg00035.html
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_CXX_FLAGS(default flags)
|
|
|
|
dnl If "default flags" is an empty string, the effect is the same
|
|
|
|
dnl as --disable or --enable=no.
|
2003-07-01 01:40:13 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_CXX_FLAGS], [dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_MSG_CHECKING([for extra compiler flags for building])
|
|
|
|
GLIBCXX_ENABLE(cxx-flags,$1,[=FLAGS],
|
|
|
|
[pass compiler FLAGS when building library],
|
|
|
|
[case "x$enable_cxx_flags" in
|
|
|
|
xno | x) enable_cxx_flags= ;;
|
|
|
|
x-*) ;;
|
|
|
|
*) AC_MSG_ERROR(_g_switch needs compiler flags as arguments) ;;
|
|
|
|
esac])
|
|
|
|
|
|
|
|
# Run through flags (either default or command-line) and set anything
|
|
|
|
# extra (e.g., #defines) that must accompany particular g++ options.
|
|
|
|
if test -n "$enable_cxx_flags"; then
|
|
|
|
for f in $enable_cxx_flags; do
|
|
|
|
case "$f" in
|
2011-03-08 08:04:05 +08:00
|
|
|
-fhonor-std) ;;
|
|
|
|
-*) ;;
|
|
|
|
*) # and we're trying to pass /what/ exactly?
|
|
|
|
AC_MSG_ERROR([compiler flags start with a -]) ;;
|
2003-08-05 10:00:18 +08:00
|
|
|
esac
|
|
|
|
done
|
2003-07-01 01:40:13 +08:00
|
|
|
fi
|
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
EXTRA_CXX_FLAGS="$enable_cxx_flags"
|
|
|
|
AC_MSG_RESULT($EXTRA_CXX_FLAGS)
|
|
|
|
AC_SUBST(EXTRA_CXX_FLAGS)
|
2003-04-17 11:27:05 +08:00
|
|
|
])
|
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check to see if debugging libraries are to be built.
|
|
|
|
dnl
|
|
|
|
dnl --enable-libstdcxx-debug
|
|
|
|
dnl builds a separate set of debugging libraries in addition to the
|
|
|
|
dnl normal (shared, static) libstdc++ binaries.
|
|
|
|
dnl
|
|
|
|
dnl --disable-libstdcxx-debug
|
|
|
|
dnl builds only one (non-debug) version of libstdc++.
|
|
|
|
dnl
|
|
|
|
dnl --enable-libstdcxx-debug-flags=FLAGS
|
|
|
|
dnl iff --enable-debug == yes, then use FLAGS to build the debug library.
|
|
|
|
dnl
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_DEBUG[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'.
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_DEBUG], [
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_MSG_CHECKING([for additional debug build])
|
2019-06-20 22:17:57 +08:00
|
|
|
skip_debug_build=
|
2003-08-05 10:00:18 +08:00
|
|
|
GLIBCXX_ENABLE(libstdcxx-debug,$1,,[build extra debug library])
|
2019-06-20 22:17:57 +08:00
|
|
|
if test x$enable_libstdcxx_debug = xyes; then
|
|
|
|
if test -f $toplevel_builddir/../stage_final \
|
|
|
|
&& test -f $toplevel_builddir/../stage_current; then
|
|
|
|
stage_final=`cat $toplevel_builddir/../stage_final`
|
|
|
|
stage_current=`cat $toplevel_builddir/../stage_current`
|
|
|
|
if test x$stage_current != x$stage_final ; then
|
|
|
|
skip_debug_build=" (skipped for bootstrap stage $stage_current)"
|
|
|
|
enable_libstdcxx_debug=no
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($enable_libstdcxx_debug$skip_debug_build)
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_BUILD_DEBUG, test $enable_libstdcxx_debug = yes)
|
2000-04-22 04:33:34 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2001-03-28 19:04:51 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Check for explicit debug flags.
|
2001-03-28 19:04:51 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl --enable-libstdcxx-debug-flags='-O1'
|
|
|
|
dnl is a general method for passing flags to be used when
|
2015-10-03 05:47:38 +08:00
|
|
|
dnl building debug libraries with --enable-libstdcxx-debug.
|
2001-03-28 19:04:51 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl --disable-libstdcxx-debug-flags does nothing.
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_DEBUG_FLAGS(default flags)
|
|
|
|
dnl If "default flags" is an empty string, the effect is the same
|
|
|
|
dnl as --disable or --enable=no.
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_DEBUG_FLAGS], [
|
2003-08-05 10:00:18 +08:00
|
|
|
GLIBCXX_ENABLE(libstdcxx-debug-flags,[$1],[=FLAGS],
|
|
|
|
[pass compiler FLAGS when building debug library],
|
|
|
|
[case "x$enable_libstdcxx_debug_flags" in
|
|
|
|
xno | x) enable_libstdcxx_debug_flags= ;;
|
|
|
|
x-*) ;;
|
|
|
|
*) AC_MSG_ERROR(_g_switch needs compiler flags as arguments) ;;
|
|
|
|
esac])
|
|
|
|
|
|
|
|
# Option parsed, now set things appropriately
|
|
|
|
DEBUG_FLAGS="$enable_libstdcxx_debug_flags"
|
|
|
|
AC_SUBST(DEBUG_FLAGS)
|
|
|
|
|
|
|
|
AC_MSG_NOTICE([Debug build flags set to $DEBUG_FLAGS])
|
2001-03-28 19:04:51 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
dnl
|
|
|
|
dnl Check if the user only wants a freestanding library implementation.
|
|
|
|
dnl
|
|
|
|
dnl --disable-hosted-libstdcxx will turn off most of the library build,
|
|
|
|
dnl installing only the headers required by [17.4.1.3] and the language
|
|
|
|
dnl support library. More than that will be built (to keep the Makefiles
|
|
|
|
dnl conveniently clean), but not installed.
|
|
|
|
dnl
|
|
|
|
dnl Sets:
|
|
|
|
dnl is_hosted (yes/no)
|
|
|
|
dnl
|
2003-09-03 02:46:54 +08:00
|
|
|
dnl Defines:
|
|
|
|
dnl _GLIBCXX_HOSTED (always defined, either to 1 or 0)
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_HOSTED], [
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
AC_ARG_ENABLE([hosted-libstdcxx],
|
|
|
|
AC_HELP_STRING([--disable-hosted-libstdcxx],
|
2011-03-08 08:04:05 +08:00
|
|
|
[only build freestanding C++ runtime support]),,
|
2004-08-03 04:28:22 +08:00
|
|
|
[case "$host" in
|
2011-03-08 08:04:05 +08:00
|
|
|
arm*-*-symbianelf*)
|
2004-08-03 04:28:22 +08:00
|
|
|
enable_hosted_libstdcxx=no
|
|
|
|
;;
|
2011-03-08 08:04:05 +08:00
|
|
|
*)
|
2004-08-03 04:28:22 +08:00
|
|
|
enable_hosted_libstdcxx=yes
|
|
|
|
;;
|
|
|
|
esac])
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
if test "$enable_hosted_libstdcxx" = no; then
|
|
|
|
AC_MSG_NOTICE([Only freestanding libraries will be built])
|
|
|
|
is_hosted=no
|
2003-09-03 02:46:54 +08:00
|
|
|
hosted_define=0
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
enable_abi_check=no
|
|
|
|
enable_libstdcxx_pch=no
|
|
|
|
else
|
|
|
|
is_hosted=yes
|
2003-09-03 02:46:54 +08:00
|
|
|
hosted_define=1
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
fi
|
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_HOSTED, test $is_hosted = yes)
|
2003-09-03 02:46:54 +08:00
|
|
|
AC_DEFINE_UNQUOTED(_GLIBCXX_HOSTED, $hosted_define,
|
|
|
|
[Define to 1 if a full hosted library is built, or 0 if freestanding.])
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2012-09-10 07:08:48 +08:00
|
|
|
dnl
|
|
|
|
dnl Check if the user wants a non-verbose library implementation.
|
|
|
|
dnl
|
|
|
|
dnl --disable-libstdcxx-verbose will turn off descriptive messages to
|
|
|
|
dnl standard error on termination.
|
|
|
|
dnl
|
|
|
|
dnl Defines:
|
|
|
|
dnl _GLIBCXX_VERBOSE (always defined, either to 1 or 0)
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_VERBOSE], [
|
|
|
|
AC_ARG_ENABLE([libstdcxx-verbose],
|
|
|
|
AC_HELP_STRING([--disable-libstdcxx-verbose],
|
|
|
|
[disable termination messages to standard error]),,
|
|
|
|
[enable_libstdcxx_verbose=yes])
|
|
|
|
if test x"$enable_libstdcxx_verbose" = xyes; then
|
|
|
|
verbose_define=1
|
|
|
|
else
|
|
|
|
AC_MSG_NOTICE([verbose termination messages are disabled])
|
|
|
|
verbose_define=0
|
|
|
|
fi
|
|
|
|
AC_DEFINE_UNQUOTED(_GLIBCXX_VERBOSE, $verbose_define,
|
|
|
|
[Define to 1 if a verbose library is built, or 0 otherwise.])
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2001-04-21 06:26:55 +08:00
|
|
|
dnl
|
2005-03-24 13:45:45 +08:00
|
|
|
dnl Check for template specializations for the 'long long' type.
|
2001-11-03 06:31:03 +08:00
|
|
|
dnl The result determines only whether 'long long' I/O is enabled; things
|
|
|
|
dnl like numeric_limits<> specializations are always available.
|
2001-04-21 06:26:55 +08:00
|
|
|
dnl
|
2003-07-05 12:05:45 +08:00
|
|
|
dnl --enable-long-long defines _GLIBCXX_USE_LONG_LONG
|
|
|
|
dnl --disable-long-long leaves _GLIBCXX_USE_LONG_LONG undefined
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_LONG_LONG[(DEFAULT)]
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Where DEFAULT is either `yes' or `no'.
|
2001-04-21 06:26:55 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_LONG_LONG], [
|
2005-03-24 13:45:45 +08:00
|
|
|
GLIBCXX_ENABLE(long-long,$1,,[enable template specializations for 'long long'])
|
2003-08-05 10:00:18 +08:00
|
|
|
if test $enable_long_long = yes; then
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_USE_LONG_LONG, 1,
|
|
|
|
[Define if code specialized for long long should be used.])
|
2001-04-21 06:26:55 +08:00
|
|
|
fi
|
2005-03-24 13:45:45 +08:00
|
|
|
AC_MSG_CHECKING([for enabled long long specializations])
|
|
|
|
AC_MSG_RESULT([$enable_long_long])
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2009-10-06 01:42:00 +08:00
|
|
|
dnl
|
|
|
|
dnl Check for decimal floating point.
|
|
|
|
dnl See:
|
|
|
|
dnl http://gcc.gnu.org/onlinedocs/gcc/Decimal-Float.html#Decimal-Float
|
|
|
|
dnl
|
|
|
|
dnl This checks to see if the host supports decimal floating point types.
|
|
|
|
dnl
|
|
|
|
dnl Defines:
|
|
|
|
dnl _GLIBCXX_USE_DECIMAL_FLOAT
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_DECIMAL_FLOAT], [
|
|
|
|
|
|
|
|
# Fake what AC_TRY_COMPILE does, without linking as this is
|
|
|
|
# unnecessary for this test.
|
|
|
|
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
[#]line __oline__ "configure"
|
|
|
|
int main()
|
|
|
|
{
|
|
|
|
_Decimal32 d1;
|
|
|
|
_Decimal64 d2;
|
|
|
|
_Decimal128 d3;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for ISO/IEC TR 24733 ])
|
|
|
|
if AC_TRY_EVAL(ac_compile); then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_DECIMAL_FLOAT, 1,
|
|
|
|
[Define if ISO/IEC TR 24733 decimal floating point types are supported on this host.])
|
|
|
|
enable_dfp=yes
|
|
|
|
else
|
|
|
|
enable_dfp=no
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($enable_dfp)
|
|
|
|
rm -f conftest*
|
|
|
|
])
|
|
|
|
|
2011-09-18 07:53:26 +08:00
|
|
|
dnl
|
|
|
|
dnl Check for GNU 128-bit integer and floating point types.
|
|
|
|
dnl
|
|
|
|
dnl Note: also checks that the types aren't standard types.
|
|
|
|
dnl
|
|
|
|
dnl Defines:
|
|
|
|
dnl _GLIBCXX_USE_INT128
|
2018-05-02 06:47:33 +08:00
|
|
|
dnl ENABLE_FLOAT128
|
2011-09-18 07:53:26 +08:00
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_INT128_FLOAT128], [
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
|
|
|
|
# Fake what AC_TRY_COMPILE does, without linking as this is
|
|
|
|
# unnecessary for this test.
|
|
|
|
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
[#]line __oline__ "configure"
|
|
|
|
template<typename T1, typename T2>
|
|
|
|
struct same
|
|
|
|
{ typedef T2 type; };
|
|
|
|
|
|
|
|
template<typename T>
|
|
|
|
struct same<T, T>;
|
|
|
|
|
|
|
|
int main()
|
|
|
|
{
|
2011-09-21 19:23:11 +08:00
|
|
|
typename same<long, __int128>::type i1;
|
|
|
|
typename same<long long, __int128>::type i2;
|
2011-09-18 07:53:26 +08:00
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2011-09-21 19:23:11 +08:00
|
|
|
AC_MSG_CHECKING([for __int128])
|
2011-09-18 07:53:26 +08:00
|
|
|
if AC_TRY_EVAL(ac_compile); then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_INT128, 1,
|
2011-09-21 19:23:11 +08:00
|
|
|
[Define if __int128 is supported on this host.])
|
2011-09-18 07:53:26 +08:00
|
|
|
enable_int128=yes
|
|
|
|
else
|
|
|
|
enable_int128=no
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($enable_int128)
|
|
|
|
rm -f conftest*
|
|
|
|
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
[#]line __oline__ "configure"
|
|
|
|
template<typename T1, typename T2>
|
|
|
|
struct same
|
|
|
|
{ typedef T2 type; };
|
|
|
|
|
|
|
|
template<typename T>
|
|
|
|
struct same<T, T>;
|
|
|
|
|
|
|
|
int main()
|
|
|
|
{
|
2012-02-16 03:56:07 +08:00
|
|
|
typename same<double, __float128>::type f1;
|
2011-09-18 07:53:26 +08:00
|
|
|
typename same<long double, __float128>::type f2;
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for __float128])
|
|
|
|
if AC_TRY_EVAL(ac_compile); then
|
|
|
|
enable_float128=yes
|
|
|
|
else
|
|
|
|
enable_float128=no
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($enable_float128)
|
2018-05-02 06:47:33 +08:00
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_FLOAT128, test $enable_float128 = yes)
|
2011-09-18 07:53:26 +08:00
|
|
|
rm -f conftest*
|
|
|
|
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
2005-03-24 13:45:45 +08:00
|
|
|
dnl
|
|
|
|
dnl Check for template specializations for the 'wchar_t' type.
|
|
|
|
dnl
|
|
|
|
dnl --enable-wchar_t defines _GLIBCXX_USE_WCHAR_T
|
|
|
|
dnl --disable-wchar_t leaves _GLIBCXX_USE_WCHAR_T undefined
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_WCHAR_T[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'.
|
|
|
|
dnl
|
2006-04-16 17:06:46 +08:00
|
|
|
dnl Necessary support must also be present.
|
2005-03-24 13:45:45 +08:00
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_WCHAR_T], [
|
|
|
|
GLIBCXX_ENABLE(wchar_t,$1,,[enable template specializations for 'wchar_t'])
|
2006-04-16 17:06:46 +08:00
|
|
|
|
|
|
|
# Test wchar.h for mbstate_t, which is needed for char_traits and fpos.
|
|
|
|
AC_CHECK_HEADERS(wchar.h, ac_has_wchar_h=yes, ac_has_wchar_h=no)
|
|
|
|
AC_MSG_CHECKING([for mbstate_t])
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>],
|
|
|
|
[mbstate_t teststate;],
|
|
|
|
have_mbstate_t=yes, have_mbstate_t=no)
|
|
|
|
AC_MSG_RESULT($have_mbstate_t)
|
|
|
|
if test x"$have_mbstate_t" = xyes; then
|
|
|
|
AC_DEFINE(HAVE_MBSTATE_T,1,[Define if mbstate_t exists in wchar.h.])
|
|
|
|
fi
|
|
|
|
|
2006-05-01 23:00:04 +08:00
|
|
|
# Test it always, for use in GLIBCXX_ENABLE_C99, together with
|
|
|
|
# ac_has_wchar_h.
|
|
|
|
AC_CHECK_HEADERS(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no)
|
2011-03-08 08:04:05 +08:00
|
|
|
|
2006-04-16 17:06:46 +08:00
|
|
|
if test x"$enable_wchar_t" = x"yes"; then
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
2011-03-08 08:04:05 +08:00
|
|
|
|
2006-04-16 17:06:46 +08:00
|
|
|
if test x"$ac_has_wchar_h" = xyes &&
|
|
|
|
test x"$ac_has_wctype_h" = xyes; then
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>
|
2011-03-08 08:04:05 +08:00
|
|
|
#include <stddef.h>
|
|
|
|
wint_t i;
|
2006-04-16 17:06:46 +08:00
|
|
|
long l = WEOF;
|
|
|
|
long j = WCHAR_MIN;
|
|
|
|
long k = WCHAR_MAX;
|
2011-03-08 08:04:05 +08:00
|
|
|
namespace test
|
|
|
|
{
|
2006-04-16 17:06:46 +08:00
|
|
|
using ::btowc;
|
|
|
|
using ::fgetwc;
|
|
|
|
using ::fgetws;
|
|
|
|
using ::fputwc;
|
|
|
|
using ::fputws;
|
|
|
|
using ::fwide;
|
2011-03-08 08:04:05 +08:00
|
|
|
using ::fwprintf;
|
2006-04-16 17:06:46 +08:00
|
|
|
using ::fwscanf;
|
|
|
|
using ::getwc;
|
|
|
|
using ::getwchar;
|
2011-03-08 08:04:05 +08:00
|
|
|
using ::mbrlen;
|
|
|
|
using ::mbrtowc;
|
|
|
|
using ::mbsinit;
|
|
|
|
using ::mbsrtowcs;
|
2006-04-16 17:06:46 +08:00
|
|
|
using ::putwc;
|
|
|
|
using ::putwchar;
|
2011-03-08 08:04:05 +08:00
|
|
|
using ::swprintf;
|
|
|
|
using ::swscanf;
|
2006-04-16 17:06:46 +08:00
|
|
|
using ::ungetwc;
|
2011-03-08 08:04:05 +08:00
|
|
|
using ::vfwprintf;
|
|
|
|
using ::vswprintf;
|
|
|
|
using ::vwprintf;
|
|
|
|
using ::wcrtomb;
|
|
|
|
using ::wcscat;
|
|
|
|
using ::wcschr;
|
|
|
|
using ::wcscmp;
|
|
|
|
using ::wcscoll;
|
|
|
|
using ::wcscpy;
|
|
|
|
using ::wcscspn;
|
|
|
|
using ::wcsftime;
|
2006-04-16 17:06:46 +08:00
|
|
|
using ::wcslen;
|
2011-03-08 08:04:05 +08:00
|
|
|
using ::wcsncat;
|
|
|
|
using ::wcsncmp;
|
|
|
|
using ::wcsncpy;
|
2006-04-16 17:06:46 +08:00
|
|
|
using ::wcspbrk;
|
2011-03-08 08:04:05 +08:00
|
|
|
using ::wcsrchr;
|
|
|
|
using ::wcsrtombs;
|
|
|
|
using ::wcsspn;
|
2006-04-16 17:06:46 +08:00
|
|
|
using ::wcsstr;
|
2011-03-08 08:04:05 +08:00
|
|
|
using ::wcstod;
|
|
|
|
using ::wcstok;
|
2006-04-16 17:06:46 +08:00
|
|
|
using ::wcstol;
|
2011-03-08 08:04:05 +08:00
|
|
|
using ::wcstoul;
|
|
|
|
using ::wcsxfrm;
|
|
|
|
using ::wctob;
|
2006-04-16 17:06:46 +08:00
|
|
|
using ::wmemchr;
|
|
|
|
using ::wmemcmp;
|
|
|
|
using ::wmemcpy;
|
|
|
|
using ::wmemmove;
|
|
|
|
using ::wmemset;
|
2011-03-08 08:04:05 +08:00
|
|
|
using ::wprintf;
|
|
|
|
using ::wscanf;
|
2006-04-16 17:06:46 +08:00
|
|
|
}
|
|
|
|
],[],[], [enable_wchar_t=no])
|
|
|
|
else
|
|
|
|
enable_wchar_t=no
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test x"$enable_wchar_t" = x"yes"; then
|
acinclude.m4 (_GLIBCXX_USE_LONG_LONG, [...]): Use long form of AC_DEFINE ...
2005-04-06 Kelley Cook <kcook@gcc.gnu.org>
* acinclude.m4 (_GLIBCXX_USE_LONG_LONG,
_GLIBCXX_USE_WCHAR_T, _GLIBCXX_USE_C99, _GLIBCXX_USE_C99_MATH,
_GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_RES_LIMITS, _GLIBCXX_CONCEPT_CHECKS,
_GLIBCXX_SYMVER, _GLIBCXX_USE_LFS, _GLIBCXX_FULLY_DYNAMIC_STRING,
_GLIBCXX_USE_NLS, HAVE_GTHR_DEFAULT, HAVE_MBSTATE_T, HAVE_POLL,
HAVE_S_ISREG, HAVE_S_IFREG, HAVE_WRITEV, HAVE_INT64_T,
HAVE_LC_MESSAGES): Use long form of AC_DEFINE ...
* acconfig.h: ... to eliminate them from here.
(_GLIBCXX_ASM_SYMVER): Move definition below @BOTTOM@.
* config.h.in, configure: Regenerate.
From-SVN: r97685
2005-04-06 09:32:03 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_USE_WCHAR_T, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if code specialized for wchar_t should be used.])
|
2005-03-24 13:45:45 +08:00
|
|
|
fi
|
2006-04-16 17:06:46 +08:00
|
|
|
|
2005-03-24 13:45:45 +08:00
|
|
|
AC_MSG_CHECKING([for enabled wchar_t specializations])
|
|
|
|
AC_MSG_RESULT([$enable_wchar_t])
|
2001-04-21 06:26:55 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-05-17 01:06:39 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Check to see if building and using a C++ precompiled header can be done.
|
2001-02-07 09:54:21 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl --enable-libstdcxx-pch=yes
|
|
|
|
dnl default, this shows intent to use stdc++.h.gch If it looks like it
|
|
|
|
dnl may work, after some light-hearted attempts to puzzle out compiler
|
|
|
|
dnl support, flip bits on in include/Makefile.am
|
2001-02-06 14:32:01 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl --disable-libstdcxx-pch
|
|
|
|
dnl turns off attempts to use or build stdc++.h.gch.
|
2001-08-07 11:38:33 +08:00
|
|
|
dnl
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Substs:
|
|
|
|
dnl glibcxx_PCHFLAGS
|
2001-08-07 11:38:33 +08:00
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_PCH], [
|
2003-08-05 10:00:18 +08:00
|
|
|
GLIBCXX_ENABLE(libstdcxx-pch,$1,,[build pre-compiled libstdc++ headers])
|
|
|
|
if test $enable_libstdcxx_pch = yes; then
|
|
|
|
AC_CACHE_CHECK([for compiler with PCH support],
|
|
|
|
[glibcxx_cv_prog_CXX_pch],
|
|
|
|
[ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -Werror -Winvalid-pch -Wno-deprecated"
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
echo '#include <math.h>' > conftest.h
|
|
|
|
if $CXX $CXXFLAGS $CPPFLAGS -x c++-header conftest.h \
|
2011-03-08 08:04:05 +08:00
|
|
|
-o conftest.h.gch 1>&5 2>&1 &&
|
|
|
|
echo '#error "pch failed"' > conftest.h &&
|
|
|
|
echo '#include "conftest.h"' > conftest.cc &&
|
2003-08-05 10:00:18 +08:00
|
|
|
$CXX -c $CXXFLAGS $CPPFLAGS conftest.cc 1>&5 2>&1 ;
|
|
|
|
then
|
2011-03-08 08:04:05 +08:00
|
|
|
glibcxx_cv_prog_CXX_pch=yes
|
2003-08-05 10:00:18 +08:00
|
|
|
else
|
2011-03-08 08:04:05 +08:00
|
|
|
glibcxx_cv_prog_CXX_pch=no
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
|
|
|
rm -f conftest*
|
|
|
|
CXXFLAGS=$ac_save_CXXFLAGS
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
enable_libstdcxx_pch=$glibcxx_cv_prog_CXX_pch
|
2003-06-17 13:46:01 +08:00
|
|
|
fi
|
2002-08-23 04:06:01 +08:00
|
|
|
|
2005-11-09 07:07:02 +08:00
|
|
|
AC_MSG_CHECKING([for enabled PCH])
|
|
|
|
AC_MSG_RESULT([$enable_libstdcxx_pch])
|
|
|
|
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-28 03:06:56 +08:00
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_BUILD_PCH, test $enable_libstdcxx_pch = yes)
|
2003-08-05 10:00:18 +08:00
|
|
|
if test $enable_libstdcxx_pch = yes; then
|
2007-09-12 06:32:51 +08:00
|
|
|
glibcxx_PCHFLAGS="-include bits/stdc++.h"
|
2003-06-17 13:46:01 +08:00
|
|
|
else
|
2003-08-05 10:00:18 +08:00
|
|
|
glibcxx_PCHFLAGS=""
|
2003-03-29 02:28:47 +08:00
|
|
|
fi
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_SUBST(glibcxx_PCHFLAGS)
|
2003-03-29 02:28:47 +08:00
|
|
|
])
|
|
|
|
|
2001-04-20 16:59:25 +08:00
|
|
|
|
2006-07-15 06:41:43 +08:00
|
|
|
dnl
|
|
|
|
dnl Check for atomic builtins.
|
|
|
|
dnl See:
|
2012-02-11 02:20:43 +08:00
|
|
|
dnl http://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html
|
2006-07-15 06:41:43 +08:00
|
|
|
dnl
|
|
|
|
dnl This checks to see if the host supports the compiler-generated
|
2011-03-08 08:04:05 +08:00
|
|
|
dnl builtins for atomic operations for various integral sizes. Note, this
|
2008-04-24 22:40:29 +08:00
|
|
|
dnl is intended to be an all-or-nothing switch, so all the atomic operations
|
|
|
|
dnl that are used should be checked.
|
2006-07-15 06:41:43 +08:00
|
|
|
dnl
|
|
|
|
dnl Note:
|
2009-12-14 07:45:12 +08:00
|
|
|
dnl libgomp and libgfortran use a link test, see CHECK_SYNC_FETCH_AND_ADD.
|
2006-07-15 06:41:43 +08:00
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_ATOMIC_BUILTINS], [
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
2008-04-24 22:40:29 +08:00
|
|
|
old_CXXFLAGS="$CXXFLAGS"
|
2009-12-14 07:45:12 +08:00
|
|
|
|
|
|
|
# Do link tests if possible, instead asm tests, limited to some platforms
|
|
|
|
# see discussion in PR target/40134, PR libstdc++/40133 and the thread
|
|
|
|
# starting at http://gcc.gnu.org/ml/gcc-patches/2009-07/msg00322.html
|
|
|
|
atomic_builtins_link_tests=no
|
|
|
|
if test x$gcc_no_link != xyes; then
|
|
|
|
# Can do link tests. Limit to some tested platforms
|
|
|
|
case "$host" in
|
|
|
|
*-*-linux* | *-*-uclinux* | *-*-kfreebsd*-gnu | *-*-gnu*)
|
|
|
|
atomic_builtins_link_tests=yes
|
2011-03-08 08:04:05 +08:00
|
|
|
;;
|
2009-12-14 07:45:12 +08:00
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test x$atomic_builtins_link_tests = xyes; then
|
|
|
|
|
|
|
|
# Do link tests.
|
|
|
|
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for atomic builtins for bool])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_atomic_bool, [
|
|
|
|
AC_TRY_LINK(
|
|
|
|
[ ],
|
|
|
|
[typedef bool atomic_type;
|
|
|
|
atomic_type c1;
|
|
|
|
atomic_type c2;
|
2012-02-11 02:20:43 +08:00
|
|
|
atomic_type c3(0);
|
2016-04-06 03:03:46 +08:00
|
|
|
// N.B. __atomic_fetch_add is not supported for bool.
|
2012-02-11 02:20:43 +08:00
|
|
|
__atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL,
|
2012-02-16 03:56:07 +08:00
|
|
|
__ATOMIC_RELAXED);
|
2012-02-11 02:20:43 +08:00
|
|
|
__atomic_test_and_set(&c1, __ATOMIC_RELAXED);
|
|
|
|
__atomic_load_n(&c1, __ATOMIC_RELAXED);
|
|
|
|
],
|
2009-12-14 07:45:12 +08:00
|
|
|
[glibcxx_cv_atomic_bool=yes],
|
|
|
|
[glibcxx_cv_atomic_bool=no])
|
2011-03-08 08:04:05 +08:00
|
|
|
])
|
2009-12-14 07:45:12 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_atomic_bool)
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for atomic builtins for short])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_atomic_short, [
|
|
|
|
AC_TRY_LINK(
|
|
|
|
[ ],
|
|
|
|
[typedef short atomic_type;
|
|
|
|
atomic_type c1;
|
|
|
|
atomic_type c2;
|
2012-02-11 02:20:43 +08:00
|
|
|
atomic_type c3(0);
|
|
|
|
__atomic_fetch_add(&c1, c2, __ATOMIC_RELAXED);
|
|
|
|
__atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL,
|
2012-02-16 03:56:07 +08:00
|
|
|
__ATOMIC_RELAXED);
|
2012-02-11 02:20:43 +08:00
|
|
|
__atomic_test_and_set(&c1, __ATOMIC_RELAXED);
|
|
|
|
__atomic_load_n(&c1, __ATOMIC_RELAXED);
|
|
|
|
],
|
2009-12-14 07:45:12 +08:00
|
|
|
[glibcxx_cv_atomic_short=yes],
|
|
|
|
[glibcxx_cv_atomic_short=no])
|
2011-03-08 08:04:05 +08:00
|
|
|
])
|
2009-12-14 07:45:12 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_atomic_short)
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for atomic builtins for int])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_atomic_int, [
|
|
|
|
AC_TRY_LINK(
|
|
|
|
[ ],
|
|
|
|
[typedef int atomic_type;
|
|
|
|
atomic_type c1;
|
|
|
|
atomic_type c2;
|
2012-02-11 02:20:43 +08:00
|
|
|
atomic_type c3(0);
|
|
|
|
__atomic_fetch_add(&c1, c2, __ATOMIC_RELAXED);
|
|
|
|
__atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL,
|
2012-02-16 03:56:07 +08:00
|
|
|
__ATOMIC_RELAXED);
|
2012-02-11 02:20:43 +08:00
|
|
|
__atomic_test_and_set(&c1, __ATOMIC_RELAXED);
|
|
|
|
__atomic_load_n(&c1, __ATOMIC_RELAXED);
|
|
|
|
],
|
2009-12-14 07:45:12 +08:00
|
|
|
[glibcxx_cv_atomic_int=yes],
|
|
|
|
[glibcxx_cv_atomic_int=no])
|
2011-03-08 08:04:05 +08:00
|
|
|
])
|
2009-12-14 07:45:12 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_atomic_int)
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for atomic builtins for long long])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_atomic_long_long, [
|
|
|
|
AC_TRY_LINK(
|
|
|
|
[ ],
|
|
|
|
[typedef long long atomic_type;
|
|
|
|
atomic_type c1;
|
|
|
|
atomic_type c2;
|
2012-02-11 02:20:43 +08:00
|
|
|
atomic_type c3(0);
|
|
|
|
__atomic_fetch_add(&c1, c2, __ATOMIC_RELAXED);
|
|
|
|
__atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL,
|
2012-02-16 03:56:07 +08:00
|
|
|
__ATOMIC_RELAXED);
|
2012-02-11 02:20:43 +08:00
|
|
|
__atomic_test_and_set(&c1, __ATOMIC_RELAXED);
|
|
|
|
__atomic_load_n(&c1, __ATOMIC_RELAXED);
|
|
|
|
],
|
2009-12-14 07:45:12 +08:00
|
|
|
[glibcxx_cv_atomic_long_long=yes],
|
|
|
|
[glibcxx_cv_atomic_long_long=no])
|
2011-03-08 08:04:05 +08:00
|
|
|
])
|
2009-12-14 07:45:12 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_atomic_long_long)
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
# Do asm tests.
|
|
|
|
|
2008-04-24 22:40:29 +08:00
|
|
|
# Compile unoptimized.
|
|
|
|
CXXFLAGS='-O0 -S'
|
|
|
|
|
2009-12-14 07:45:12 +08:00
|
|
|
# Fake what AC_TRY_COMPILE does.
|
2006-07-15 06:41:43 +08:00
|
|
|
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
[#]line __oline__ "configure"
|
|
|
|
int main()
|
2008-12-13 01:10:16 +08:00
|
|
|
{
|
|
|
|
typedef bool atomic_type;
|
|
|
|
atomic_type c1;
|
|
|
|
atomic_type c2;
|
2012-02-11 02:20:43 +08:00
|
|
|
atomic_type c3(0);
|
2016-04-06 03:03:46 +08:00
|
|
|
// N.B. __atomic_fetch_add is not supported for bool.
|
2012-02-11 02:20:43 +08:00
|
|
|
__atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL,
|
2012-02-16 03:56:07 +08:00
|
|
|
__ATOMIC_RELAXED);
|
2012-02-11 02:20:43 +08:00
|
|
|
__atomic_test_and_set(&c1, __ATOMIC_RELAXED);
|
|
|
|
__atomic_load_n(&c1, __ATOMIC_RELAXED);
|
2012-02-16 03:56:07 +08:00
|
|
|
|
2008-12-13 01:10:16 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for atomic builtins for bool])
|
|
|
|
if AC_TRY_EVAL(ac_compile); then
|
2012-02-18 04:51:58 +08:00
|
|
|
if grep __atomic_ conftest.s >/dev/null 2>&1 ; then
|
2011-03-08 08:04:05 +08:00
|
|
|
glibcxx_cv_atomic_bool=no
|
2008-12-13 01:10:16 +08:00
|
|
|
else
|
2011-03-08 08:04:05 +08:00
|
|
|
glibcxx_cv_atomic_bool=yes
|
2008-12-13 01:10:16 +08:00
|
|
|
fi
|
|
|
|
fi
|
2009-12-14 07:45:12 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_atomic_bool)
|
2008-12-13 01:10:16 +08:00
|
|
|
rm -f conftest*
|
|
|
|
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
[#]line __oline__ "configure"
|
|
|
|
int main()
|
|
|
|
{
|
|
|
|
typedef short atomic_type;
|
|
|
|
atomic_type c1;
|
|
|
|
atomic_type c2;
|
2012-02-11 02:20:43 +08:00
|
|
|
atomic_type c3(0);
|
|
|
|
__atomic_fetch_add(&c1, c2, __ATOMIC_RELAXED);
|
|
|
|
__atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL,
|
2012-02-16 03:56:07 +08:00
|
|
|
__ATOMIC_RELAXED);
|
2012-02-11 02:20:43 +08:00
|
|
|
__atomic_test_and_set(&c1, __ATOMIC_RELAXED);
|
|
|
|
__atomic_load_n(&c1, __ATOMIC_RELAXED);
|
|
|
|
|
2008-12-13 01:10:16 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for atomic builtins for short])
|
|
|
|
if AC_TRY_EVAL(ac_compile); then
|
2012-02-18 04:51:58 +08:00
|
|
|
if grep __atomic_ conftest.s >/dev/null 2>&1 ; then
|
2011-03-08 08:04:05 +08:00
|
|
|
glibcxx_cv_atomic_short=no
|
2008-12-13 01:10:16 +08:00
|
|
|
else
|
2011-03-08 08:04:05 +08:00
|
|
|
glibcxx_cv_atomic_short=yes
|
2008-12-13 01:10:16 +08:00
|
|
|
fi
|
|
|
|
fi
|
2009-12-14 07:45:12 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_atomic_short)
|
2008-12-13 01:10:16 +08:00
|
|
|
rm -f conftest*
|
|
|
|
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
[#]line __oline__ "configure"
|
|
|
|
int main()
|
2006-07-15 06:41:43 +08:00
|
|
|
{
|
2011-03-08 08:04:05 +08:00
|
|
|
// NB: _Atomic_word not necessarily int.
|
2006-07-15 06:41:43 +08:00
|
|
|
typedef int atomic_type;
|
|
|
|
atomic_type c1;
|
|
|
|
atomic_type c2;
|
2012-02-11 02:20:43 +08:00
|
|
|
atomic_type c3(0);
|
|
|
|
__atomic_fetch_add(&c1, c2, __ATOMIC_RELAXED);
|
|
|
|
__atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL,
|
2012-02-16 03:56:07 +08:00
|
|
|
__ATOMIC_RELAXED);
|
2012-02-11 02:20:43 +08:00
|
|
|
__atomic_test_and_set(&c1, __ATOMIC_RELAXED);
|
|
|
|
__atomic_load_n(&c1, __ATOMIC_RELAXED);
|
|
|
|
|
2008-04-24 22:40:29 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for atomic builtins for int])
|
|
|
|
if AC_TRY_EVAL(ac_compile); then
|
2012-02-18 04:51:58 +08:00
|
|
|
if grep __atomic_ conftest.s >/dev/null 2>&1 ; then
|
2011-03-08 08:04:05 +08:00
|
|
|
glibcxx_cv_atomic_int=no
|
2008-04-24 22:40:29 +08:00
|
|
|
else
|
2011-03-08 08:04:05 +08:00
|
|
|
glibcxx_cv_atomic_int=yes
|
2008-04-24 22:40:29 +08:00
|
|
|
fi
|
|
|
|
fi
|
2009-12-14 07:45:12 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_atomic_int)
|
2008-04-24 22:40:29 +08:00
|
|
|
rm -f conftest*
|
|
|
|
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
[#]line __oline__ "configure"
|
|
|
|
int main()
|
|
|
|
{
|
2008-12-13 01:10:16 +08:00
|
|
|
typedef long long atomic_type;
|
2008-04-24 22:40:29 +08:00
|
|
|
atomic_type c1;
|
|
|
|
atomic_type c2;
|
2012-02-11 02:20:43 +08:00
|
|
|
atomic_type c3(0);
|
|
|
|
__atomic_fetch_add(&c1, c2, __ATOMIC_RELAXED);
|
|
|
|
__atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL,
|
2012-02-16 03:56:07 +08:00
|
|
|
__ATOMIC_RELAXED);
|
2012-02-11 02:20:43 +08:00
|
|
|
__atomic_test_and_set(&c1, __ATOMIC_RELAXED);
|
|
|
|
__atomic_load_n(&c1, __ATOMIC_RELAXED);
|
|
|
|
|
2008-04-24 22:40:29 +08:00
|
|
|
return 0;
|
2006-07-15 06:41:43 +08:00
|
|
|
}
|
|
|
|
EOF
|
2008-04-24 22:40:29 +08:00
|
|
|
|
2008-12-13 01:10:16 +08:00
|
|
|
AC_MSG_CHECKING([for atomic builtins for long long])
|
2006-07-15 06:41:43 +08:00
|
|
|
if AC_TRY_EVAL(ac_compile); then
|
2012-02-18 04:51:58 +08:00
|
|
|
if grep __atomic_ conftest.s >/dev/null 2>&1 ; then
|
2011-03-08 08:04:05 +08:00
|
|
|
glibcxx_cv_atomic_long_long=no
|
2006-07-15 06:41:43 +08:00
|
|
|
else
|
2011-03-08 08:04:05 +08:00
|
|
|
glibcxx_cv_atomic_long_long=yes
|
2006-07-15 06:41:43 +08:00
|
|
|
fi
|
|
|
|
fi
|
2009-12-14 07:45:12 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_cv_atomic_long_long)
|
2006-07-15 06:41:43 +08:00
|
|
|
rm -f conftest*
|
|
|
|
|
2009-12-14 07:45:12 +08:00
|
|
|
fi
|
2008-12-13 01:10:16 +08:00
|
|
|
|
2008-04-24 22:40:29 +08:00
|
|
|
CXXFLAGS="$old_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
|
2016-09-23 14:58:00 +08:00
|
|
|
# Set atomicity_dir to builtins if all but the long long test above passes,
|
|
|
|
# or if the builtins were already chosen (e.g. by configure.host).
|
|
|
|
if { test "$glibcxx_cv_atomic_bool" = yes \
|
2016-01-16 07:00:30 +08:00
|
|
|
&& test "$glibcxx_cv_atomic_short" = yes \
|
2016-09-23 14:58:00 +08:00
|
|
|
&& test "$glibcxx_cv_atomic_int" = yes; } \
|
|
|
|
|| test "$atomicity_dir" = "cpu/generic/atomicity_builtins"; then
|
2011-12-01 10:20:32 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_ATOMIC_BUILTINS, 1,
|
|
|
|
[Define if the compiler supports C++11 atomics.])
|
2008-04-24 22:40:29 +08:00
|
|
|
atomicity_dir=cpu/generic/atomicity_builtins
|
|
|
|
fi
|
|
|
|
|
|
|
|
# If still generic, set to mutex.
|
2006-07-15 06:41:43 +08:00
|
|
|
if test $atomicity_dir = "cpu/generic" ; then
|
2008-04-24 22:40:29 +08:00
|
|
|
atomicity_dir=cpu/generic/atomicity_mutex
|
2008-04-25 07:30:10 +08:00
|
|
|
AC_MSG_WARN([No native atomic operations are provided for this platform.])
|
2008-12-19 17:18:41 +08:00
|
|
|
if test "x$target_thread_file" = xsingle; then
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_MSG_WARN([They cannot be faked when thread support is disabled.])
|
|
|
|
AC_MSG_WARN([Thread-safety of certain classes is not guaranteed.])
|
2008-04-25 07:30:10 +08:00
|
|
|
else
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_MSG_WARN([They will be faked using a mutex.])
|
|
|
|
AC_MSG_WARN([Performance of certain classes will degrade as a result.])
|
2008-04-25 07:30:10 +08:00
|
|
|
fi
|
2006-07-15 06:41:43 +08:00
|
|
|
fi
|
2008-04-24 22:40:29 +08:00
|
|
|
|
2006-07-15 06:41:43 +08:00
|
|
|
])
|
|
|
|
|
PR libstdc++/67843 set shared_ptr lock policy at build-time
This resolves a longstanding issue where the lock policy for shared_ptr
reference counting depends on compilation options when the header is
included, so that different -march options can cause ABI changes. For
example, objects compiled with -march=armv7 will use atomics to
synchronize reference counts, and objects compiled with -march=armv5t
will use a mutex. That means the shared_ptr control block will have a
different layout in different objects, causing ODR violations and
undefined behaviour. This was the root cause of PR libstdc++/42734 as
well as PR libstdc++/67843.
The solution is to decide on the lock policy at build time, when
libstdc++ is configured. The configure script checks for the
availability of the necessary atomic built-ins for the target and fixes
that choice permanently. Different -march flags used to compile user
code will not cause changes to the lock policy. This results in an ABI
change for certain compilations, but only where there was already an ABI
incompatibility between the libstdc++.so library and objects built with
an incompatible -march option. In general, this means a more stable ABI
that isn't silently altered when -march flags make addition atomic ops
available.
To force a target to use "atomic" or "mutex" the new configure option
--with-libstdcxx-lock-policy can be used.
In order to turn ODR violations into linker errors, the uses of
shared_ptr in filesystem directory iterators have been replaced
with __shared_ptr, and explicit instantiations are declared. This
ensures that object files using those types cannot link to libstdc++
libs unless they use the same lock policy.
PR libstdc++/67843
* acinclude.m4 (GLIBCXX_ENABLE_LOCK_POLICY): Add new macro
that defines _GLIBCXX_HAVE_ATOMIC_LOCK_POLICY.
* config.h.in: Regenerate.
* configure: Regenerate.
* configure.ac: Use GLIBCXX_ENABLE_LOCK_POLICY.
* doc/xml/manual/configure.xml: Document new configure option.
* include/bits/fs_dir.h (directory_iterator): Use __shared_ptr
instead of shared_ptr.
(recursive_directory_iterator): Likewise.
(__shared_ptr<_Dir>): Add explicit instantiation declaration.
(__shared_ptr<recursive_directory_iterator::_Dir_stack>): Likewise.
* include/bits/shared_ptr_base.h (__allocate_shared, __make_shared):
Add default template argument for _Lock_policy template parameter.
* include/ext/concurrence.h (__default_lock_policy): Check macro
_GLIBCXX_HAVE_ATOMIC_LOCK_POLICY instead of checking if the current
target supports the builtins for compare-and-swap.
* src/filesystem/std-dir.cc (__shared_ptr<_Dir>): Add explicit
instantiation definition.
(__shared_ptr<recursive_directory_iterator::_Dir_stack>): Likewise.
(directory_iterator, recursive_directory_iterator): Use __make_shared
instead of make_shared.
From-SVN: r266533
2018-11-28 07:25:56 +08:00
|
|
|
dnl
|
|
|
|
dnl Set default lock policy for synchronizing shared_ptr reference counting.
|
|
|
|
dnl
|
|
|
|
dnl --with-libstdcxx-lock-policy=auto
|
|
|
|
dnl Use atomic operations for shared_ptr reference counting only if
|
|
|
|
dnl the default target supports atomic compare-and-swap.
|
|
|
|
dnl --with-libstdcxx-lock-policy=atomic
|
|
|
|
dnl Use atomic operations for shared_ptr reference counting.
|
|
|
|
dnl --with-libstdcxx-lock-policy=mutex
|
|
|
|
dnl Use a mutex to synchronize shared_ptr reference counting.
|
|
|
|
dnl
|
|
|
|
dnl This controls the value of __gnu_cxx::__default_lock_policy, which
|
|
|
|
dnl determines how shared_ptr reference counts are synchronized.
|
|
|
|
dnl The option "atomic" means that atomic operations should be used,
|
|
|
|
dnl "mutex" means that a mutex will be used. The default option, "auto",
|
|
|
|
dnl will check if the target supports the compiler-generated builtins
|
|
|
|
dnl for atomic compare-and-swap operations for 2-byte and 4-byte integers,
|
|
|
|
dnl and will use "atomic" if supported, "mutex" otherwise.
|
|
|
|
dnl This option is ignored if the thread model used by GCC is "single",
|
|
|
|
dnl as no synchronization is used at all in that case.
|
|
|
|
dnl This option affects the library ABI (except in the "single" thread model).
|
|
|
|
dnl
|
|
|
|
dnl Defines _GLIBCXX_HAVE_ATOMIC_LOCK_POLICY to 1 if atomics should be used.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_LOCK_POLICY], [
|
|
|
|
|
|
|
|
AC_ARG_WITH([libstdcxx-lock-policy],
|
|
|
|
AC_HELP_STRING([--with-libstdcxx-lock-policy={atomic,mutex,auto}],
|
|
|
|
[synchronization policy for shared_ptr reference counting [default=auto]]),
|
|
|
|
[libstdcxx_atomic_lock_policy=$withval],
|
|
|
|
[libstdcxx_atomic_lock_policy=auto])
|
|
|
|
|
|
|
|
case "$libstdcxx_atomic_lock_policy" in
|
|
|
|
atomic|mutex|auto) ;;
|
|
|
|
*) AC_MSG_ERROR([Invalid argument for --with-libstdcxx-lock-policy]) ;;
|
|
|
|
esac
|
|
|
|
AC_MSG_CHECKING([for lock policy for shared_ptr reference counts])
|
|
|
|
|
|
|
|
if test x"$libstdcxx_atomic_lock_policy" = x"auto"; then
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
|
|
|
|
dnl Why do we care about 2-byte CAS on targets with 4-byte _Atomic_word?!
|
|
|
|
AC_TRY_COMPILE([
|
|
|
|
#if ! defined __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2
|
|
|
|
# error "No 2-byte compare-and-swap"
|
|
|
|
#elif ! defined __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
|
|
|
|
# error "No 4-byte compare-and-swap"
|
|
|
|
#endif
|
|
|
|
],,
|
|
|
|
[libstdcxx_atomic_lock_policy=atomic],
|
|
|
|
[libstdcxx_atomic_lock_policy=mutex])
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test x"$libstdcxx_atomic_lock_policy" = x"atomic"; then
|
|
|
|
AC_MSG_RESULT(atomic)
|
|
|
|
AC_DEFINE(HAVE_ATOMIC_LOCK_POLICY,1,
|
|
|
|
[Defined if shared_ptr reference counting should use atomic operations.])
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(mutex)
|
|
|
|
fi
|
|
|
|
|
|
|
|
])
|
2006-07-15 06:41:43 +08:00
|
|
|
|
2006-07-21 07:37:27 +08:00
|
|
|
dnl
|
|
|
|
dnl Allow visibility attributes to be used on namespaces, objects, etc.
|
|
|
|
dnl
|
2011-11-08 22:07:27 +08:00
|
|
|
dnl --enable-libstdcxx-visibility enables attempt to use visibility attributes.
|
|
|
|
dnl --disable-libstdcxx-visibility turns off all use of visibility attributes.
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_LIBSTDCXX_VISIBILITY[(DEFAULT)]
|
2006-07-21 07:37:27 +08:00
|
|
|
dnl Where DEFAULT is 'yes'.
|
|
|
|
dnl
|
2011-11-08 22:07:27 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_VISIBILITY], [
|
|
|
|
GLIBCXX_ENABLE(libstdcxx-visibility,$1,,[enables visibility safe usage])
|
2006-07-21 07:37:27 +08:00
|
|
|
|
2011-11-08 22:07:27 +08:00
|
|
|
if test x$enable_libstdcxx_visibility = xyes ; then
|
2006-07-21 07:37:27 +08:00
|
|
|
dnl all hail libgfortran
|
|
|
|
dnl Check whether the target supports hidden visibility.
|
|
|
|
AC_CACHE_CHECK([whether the target supports hidden visibility],
|
2008-04-22 04:55:19 +08:00
|
|
|
glibcxx_cv_have_attribute_visibility, [
|
2006-07-21 07:37:27 +08:00
|
|
|
save_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS="$CFLAGS -Werror"
|
|
|
|
AC_TRY_COMPILE([void __attribute__((visibility("hidden"))) foo(void) { }],
|
2008-04-22 04:55:19 +08:00
|
|
|
[], glibcxx_cv_have_attribute_visibility=yes,
|
|
|
|
glibcxx_cv_have_attribute_visibility=no)
|
2006-07-21 07:37:27 +08:00
|
|
|
CFLAGS="$save_CFLAGS"])
|
2008-04-22 04:55:19 +08:00
|
|
|
if test $glibcxx_cv_have_attribute_visibility = no; then
|
2011-11-08 22:07:27 +08:00
|
|
|
enable_libstdcxx_visibility=no
|
2006-07-21 07:37:27 +08:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2011-11-08 22:07:27 +08:00
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_VISIBILITY, test $enable_libstdcxx_visibility = yes)
|
|
|
|
AC_MSG_NOTICE([visibility supported: $enable_libstdcxx_visibility])
|
2006-07-21 07:37:27 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2002-02-15 02:24:13 +08:00
|
|
|
dnl
|
|
|
|
dnl Add version tags to symbols in shared library (or not), additionally
|
|
|
|
dnl marking other symbols as private/local (or not).
|
|
|
|
dnl
|
2011-09-27 08:02:54 +08:00
|
|
|
dnl Sets libtool_VERSION, and determines shared library SONAME.
|
|
|
|
dnl
|
|
|
|
dnl This depends on GLIBCXX CHECK_LINKER_FEATURES, but without it assumes no.
|
|
|
|
dnl
|
2002-02-21 06:10:39 +08:00
|
|
|
dnl --enable-symvers=style adds a version script to the linker call when
|
|
|
|
dnl creating the shared library. The choice of version script is
|
|
|
|
dnl controlled by 'style'.
|
2002-02-15 02:24:13 +08:00
|
|
|
dnl --disable-symvers does not.
|
2011-09-27 08:02:54 +08:00
|
|
|
dnl
|
2003-07-05 12:05:45 +08:00
|
|
|
dnl + Usage: GLIBCXX_ENABLE_SYMVERS[(DEFAULT)]
|
2003-08-05 10:00:18 +08:00
|
|
|
dnl Where DEFAULT is either 'yes' or 'no'. Passing `yes' tries to
|
|
|
|
dnl choose a default style based on linker characteristics. Passing
|
|
|
|
dnl 'no' disables versioning.
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_SYMVERS], [
|
2003-08-05 10:00:18 +08:00
|
|
|
|
2010-10-04 16:49:59 +08:00
|
|
|
GLIBCXX_ENABLE(symvers,$1,[[[=STYLE]]],
|
2003-08-05 10:00:18 +08:00
|
|
|
[enables symbol versioning of the shared library],
|
2010-07-02 18:05:49 +08:00
|
|
|
[permit yes|no|gnu|gnu-versioned-namespace|darwin|darwin-export|sun])
|
2002-02-21 06:10:39 +08:00
|
|
|
|
2003-07-05 12:05:45 +08:00
|
|
|
# If we never went through the GLIBCXX_CHECK_LINKER_FEATURES macro, then we
|
2002-12-30 22:54:45 +08:00
|
|
|
# don't know enough about $LD to do tricks...
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_REQUIRE([GLIBCXX_CHECK_LINKER_FEATURES])
|
2010-07-02 18:05:49 +08:00
|
|
|
# Sun style symbol versions needs GNU c++filt for make_sunver.pl to work
|
|
|
|
# with extern "C++" in version scripts.
|
|
|
|
AC_REQUIRE([GCC_PROG_GNU_CXXFILT])
|
2005-07-28 02:28:32 +08:00
|
|
|
|
|
|
|
# Turn a 'yes' into a suitable default.
|
|
|
|
if test x$enable_symvers = xyes ; then
|
2006-09-29 20:19:45 +08:00
|
|
|
if test $enable_shared = no || test "x$LD" = x || test x$gcc_no_link = xyes; then
|
2005-07-28 02:28:32 +08:00
|
|
|
enable_symvers=no
|
|
|
|
else
|
2005-12-18 17:39:23 +08:00
|
|
|
if test $with_gnu_ld = yes ; then
|
2008-09-01 02:14:25 +08:00
|
|
|
case ${target_os} in
|
2011-03-08 08:04:05 +08:00
|
|
|
hpux*)
|
|
|
|
enable_symvers=no ;;
|
|
|
|
*)
|
|
|
|
enable_symvers=gnu ;;
|
2008-09-01 02:14:25 +08:00
|
|
|
esac
|
2005-12-18 17:39:23 +08:00
|
|
|
else
|
|
|
|
case ${target_os} in
|
2011-03-08 08:04:05 +08:00
|
|
|
darwin*)
|
2005-12-18 17:39:23 +08:00
|
|
|
enable_symvers=darwin ;;
|
2010-07-02 18:05:49 +08:00
|
|
|
# Sun symbol versioning exists since Solaris 2.5.
|
|
|
|
solaris2.[[5-9]]* | solaris2.1[[0-9]]*)
|
|
|
|
# make_sunver.pl needs GNU c++filt to support extern "C++" in
|
|
|
|
# version scripts, so disable symbol versioning if none can be
|
|
|
|
# found.
|
|
|
|
if test -z "$ac_cv_path_CXXFILT"; then
|
|
|
|
AC_MSG_WARN([=== You have requested Sun symbol versioning, but])
|
|
|
|
AC_MSG_WARN([=== no GNU c++filt could be found.])
|
|
|
|
AC_MSG_WARN([=== Symbol versioning will be disabled.])
|
|
|
|
enable_symvers=no
|
|
|
|
else
|
|
|
|
enable_symvers=sun
|
|
|
|
fi
|
|
|
|
;;
|
2011-03-08 08:04:05 +08:00
|
|
|
*)
|
|
|
|
enable_symvers=no ;;
|
2005-12-18 17:39:23 +08:00
|
|
|
esac
|
|
|
|
fi
|
2005-07-28 02:28:32 +08:00
|
|
|
fi
|
2002-02-15 02:24:13 +08:00
|
|
|
fi
|
2002-02-21 06:10:39 +08:00
|
|
|
|
2005-12-18 17:39:23 +08:00
|
|
|
# Check to see if 'darwin' or 'darwin-export' can win.
|
|
|
|
if test x$enable_symvers = xdarwin-export ; then
|
|
|
|
enable_symvers=darwin
|
|
|
|
fi
|
|
|
|
|
2010-07-02 18:05:49 +08:00
|
|
|
# Check if 'sun' was requested on non-Solaris 2 platforms.
|
|
|
|
if test x$enable_symvers = xsun ; then
|
|
|
|
case ${target_os} in
|
|
|
|
solaris2*)
|
|
|
|
# All fine.
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
# Unlikely to work.
|
|
|
|
AC_MSG_WARN([=== You have requested Sun symbol versioning, but])
|
|
|
|
AC_MSG_WARN([=== you are not targetting Solaris 2.])
|
|
|
|
AC_MSG_WARN([=== Symbol versioning will be disabled.])
|
|
|
|
enable_symvers=no
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
2005-11-15 12:56:34 +08:00
|
|
|
# Check to see if 'gnu' can win.
|
2011-03-08 08:04:05 +08:00
|
|
|
if test $enable_symvers = gnu ||
|
|
|
|
test $enable_symvers = gnu-versioned-namespace ||
|
2010-07-02 18:05:49 +08:00
|
|
|
test $enable_symvers = sun; then
|
2005-11-15 12:56:34 +08:00
|
|
|
# Check to see if libgcc_s exists, indicating that shared libgcc is possible.
|
2002-06-19 03:07:12 +08:00
|
|
|
AC_MSG_CHECKING([for shared libgcc])
|
|
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS=' -lgcc_s'
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_TRY_LINK(, [return 0;], glibcxx_shared_libgcc=yes, glibcxx_shared_libgcc=no)
|
2002-06-19 03:07:12 +08:00
|
|
|
CFLAGS="$ac_save_CFLAGS"
|
2004-07-16 01:38:42 +08:00
|
|
|
if test $glibcxx_shared_libgcc = no; then
|
|
|
|
cat > conftest.c <<EOF
|
|
|
|
int main (void) { return 0; }
|
|
|
|
EOF
|
|
|
|
changequote(,)dnl
|
|
|
|
glibcxx_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
|
|
|
|
-shared -shared-libgcc -o conftest.so \
|
|
|
|
conftest.c -v 2>&1 >/dev/null \
|
|
|
|
| sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
|
|
|
|
changequote([,])dnl
|
|
|
|
rm -f conftest.c conftest.so
|
|
|
|
if test x${glibcxx_libgcc_s_suffix+set} = xset; then
|
|
|
|
CFLAGS=" -lgcc_s$glibcxx_libgcc_s_suffix"
|
|
|
|
AC_TRY_LINK(, [return 0;], glibcxx_shared_libgcc=yes)
|
|
|
|
CFLAGS="$ac_save_CFLAGS"
|
|
|
|
fi
|
|
|
|
fi
|
2003-07-05 12:05:45 +08:00
|
|
|
AC_MSG_RESULT($glibcxx_shared_libgcc)
|
2005-07-28 02:28:32 +08:00
|
|
|
|
|
|
|
# For GNU ld, we need at least this version. The format is described in
|
|
|
|
# GLIBCXX_CHECK_LINKER_FEATURES above.
|
|
|
|
glibcxx_min_gnu_ld_version=21400
|
2002-02-21 06:10:39 +08:00
|
|
|
|
2005-11-15 12:56:34 +08:00
|
|
|
# If no shared libgcc, can't win.
|
|
|
|
if test $glibcxx_shared_libgcc != yes; then
|
|
|
|
AC_MSG_WARN([=== You have requested GNU symbol versioning, but])
|
|
|
|
AC_MSG_WARN([=== you are not building a shared libgcc_s.])
|
|
|
|
AC_MSG_WARN([=== Symbol versioning will be disabled.])
|
|
|
|
enable_symvers=no
|
2010-07-02 18:05:49 +08:00
|
|
|
elif test $with_gnu_ld != yes && test $enable_symvers = sun; then
|
|
|
|
: All interesting versions of Sun ld support sun style symbol versioning.
|
2005-11-15 12:56:34 +08:00
|
|
|
elif test $with_gnu_ld != yes ; then
|
2002-02-22 19:36:26 +08:00
|
|
|
# just fail for now
|
2005-07-28 02:28:32 +08:00
|
|
|
AC_MSG_WARN([=== You have requested GNU symbol versioning, but])
|
|
|
|
AC_MSG_WARN([=== you are not using the GNU linker.])
|
|
|
|
AC_MSG_WARN([=== Symbol versioning will be disabled.])
|
|
|
|
enable_symvers=no
|
2008-03-29 01:32:05 +08:00
|
|
|
elif test $glibcxx_ld_is_gold = yes ; then
|
|
|
|
: All versions of gold support symbol versioning.
|
2005-07-28 02:28:32 +08:00
|
|
|
elif test $glibcxx_gnu_ld_version -lt $glibcxx_min_gnu_ld_version ; then
|
|
|
|
# The right tools, the right setup, but too old. Fallbacks?
|
|
|
|
AC_MSG_WARN(=== Linker version $glibcxx_gnu_ld_version is too old for)
|
|
|
|
AC_MSG_WARN(=== full symbol versioning support in this release of GCC.)
|
|
|
|
AC_MSG_WARN(=== You would need to upgrade your binutils to version)
|
|
|
|
AC_MSG_WARN(=== $glibcxx_min_gnu_ld_version or later and rebuild GCC.)
|
2003-07-11 12:04:49 +08:00
|
|
|
AC_MSG_WARN([=== Symbol versioning will be disabled.])
|
2002-02-22 19:36:26 +08:00
|
|
|
enable_symvers=no
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2011-09-27 08:02:54 +08:00
|
|
|
# For libtool versioning info, format is CURRENT:REVISION:AGE
|
2019-08-29 20:16:27 +08:00
|
|
|
libtool_VERSION=6:28:0
|
2011-09-27 08:02:54 +08:00
|
|
|
|
|
|
|
# Everything parsed; figure out what files and settings to use.
|
2002-02-21 06:10:39 +08:00
|
|
|
case $enable_symvers in
|
2002-02-22 19:36:26 +08:00
|
|
|
no)
|
2005-12-18 17:39:23 +08:00
|
|
|
SYMVER_FILE=config/abi/pre/none.ver
|
2003-08-05 10:00:18 +08:00
|
|
|
;;
|
2002-02-21 06:10:39 +08:00
|
|
|
gnu)
|
2005-12-18 17:39:23 +08:00
|
|
|
SYMVER_FILE=config/abi/pre/gnu.ver
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_SYMVER_GNU, 1,
|
|
|
|
[Define to use GNU versioning in the shared library.])
|
2005-07-28 02:28:32 +08:00
|
|
|
;;
|
2005-12-19 08:56:05 +08:00
|
|
|
gnu-versioned-namespace)
|
2017-05-11 04:40:28 +08:00
|
|
|
libtool_VERSION=8:0:0
|
2005-12-19 08:56:05 +08:00
|
|
|
SYMVER_FILE=config/abi/pre/gnu-versioned-namespace.ver
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_SYMVER_GNU_NAMESPACE, 1,
|
|
|
|
[Define to use GNU namespace versioning in the shared library.])
|
2005-12-19 08:56:05 +08:00
|
|
|
;;
|
2005-12-18 17:39:23 +08:00
|
|
|
darwin)
|
|
|
|
SYMVER_FILE=config/abi/pre/gnu.ver
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_SYMVER_DARWIN, 1,
|
|
|
|
[Define to use darwin versioning in the shared library.])
|
2003-08-05 10:00:18 +08:00
|
|
|
;;
|
2010-07-02 18:05:49 +08:00
|
|
|
sun)
|
|
|
|
SYMVER_FILE=config/abi/pre/gnu.ver
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_DEFINE(_GLIBCXX_SYMVER_SUN, 1,
|
|
|
|
[Define to use Sun versioning in the shared library.])
|
2010-07-02 18:05:49 +08:00
|
|
|
;;
|
2002-02-21 06:10:39 +08:00
|
|
|
esac
|
|
|
|
|
2005-12-18 17:39:23 +08:00
|
|
|
if test x$enable_symvers != xno ; then
|
|
|
|
AC_DEFINE(_GLIBCXX_SYMVER, 1,
|
|
|
|
[Define to use symbol versioning in the shared library.])
|
|
|
|
fi
|
|
|
|
|
2009-01-08 06:49:29 +08:00
|
|
|
AC_CACHE_CHECK([whether the target supports .symver directive],
|
|
|
|
glibcxx_cv_have_as_symver_directive, [
|
|
|
|
AC_TRY_COMPILE([void foo (void); __asm (".symver foo, bar@SYMVER");],
|
|
|
|
[], glibcxx_cv_have_as_symver_directive=yes,
|
|
|
|
glibcxx_cv_have_as_symver_directive=no)])
|
|
|
|
if test $glibcxx_cv_have_as_symver_directive = yes; then
|
|
|
|
AC_DEFINE(HAVE_AS_SYMVER_DIRECTIVE, 1,
|
|
|
|
[Define to 1 if the target assembler supports .symver directive.])
|
|
|
|
fi
|
|
|
|
|
2005-12-18 17:39:23 +08:00
|
|
|
AC_SUBST(SYMVER_FILE)
|
|
|
|
AC_SUBST(port_specific_symbol_files)
|
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_SYMVERS, test $enable_symvers != no)
|
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_SYMVERS_GNU, test $enable_symvers = gnu)
|
2005-12-19 08:56:05 +08:00
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_SYMVERS_GNU_NAMESPACE, test $enable_symvers = gnu-versioned-namespace)
|
2005-12-18 17:39:23 +08:00
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_SYMVERS_DARWIN, test $enable_symvers = darwin)
|
2010-07-02 18:05:49 +08:00
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_SYMVERS_SUN, test $enable_symvers = sun)
|
2005-12-18 17:39:23 +08:00
|
|
|
AC_MSG_NOTICE(versioning on shared library symbols is $enable_symvers)
|
|
|
|
|
2010-07-02 18:05:49 +08:00
|
|
|
if test $enable_symvers != no ; then
|
|
|
|
case ${target_os} in
|
|
|
|
# The Solaris 2 runtime linker doesn't support the GNU extension of
|
|
|
|
# binding the same symbol to different versions
|
|
|
|
solaris2*)
|
2012-02-27 21:51:50 +08:00
|
|
|
;;
|
2010-07-02 18:05:49 +08:00
|
|
|
# Other platforms with GNU symbol versioning (GNU/Linux, more?) do.
|
|
|
|
*)
|
2010-07-02 20:09:29 +08:00
|
|
|
AC_DEFINE(HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define to 1 if the target runtime linker supports binding the same symbol to different versions.])
|
2012-02-27 21:51:50 +08:00
|
|
|
;;
|
2010-07-02 18:05:49 +08:00
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
2005-12-18 17:39:23 +08:00
|
|
|
# Now, set up compatibility support, if any.
|
2005-06-17 15:33:56 +08:00
|
|
|
# In addition, need this to deal with std::size_t mangling in
|
|
|
|
# src/compatibility.cc. In a perfect world, could use
|
|
|
|
# typeid(std::size_t).name()[0] to do direct substitution.
|
|
|
|
AC_MSG_CHECKING([for size_t as unsigned int])
|
|
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS="-Werror"
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_TRY_COMPILE(, [__SIZE_TYPE__* stp; unsigned int* uip; stp = uip;],
|
|
|
|
[glibcxx_size_t_is_i=yes], [glibcxx_size_t_is_i=no])
|
2005-06-17 15:33:56 +08:00
|
|
|
CFLAGS=$ac_save_CFLAGS
|
|
|
|
if test "$glibcxx_size_t_is_i" = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_SIZE_T_IS_UINT, 1, [Define if size_t is unsigned int.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT([$glibcxx_size_t_is_i])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for ptrdiff_t as int])
|
|
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS="-Werror"
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_TRY_COMPILE(, [__PTRDIFF_TYPE__* ptp; int* ip; ptp = ip;],
|
|
|
|
[glibcxx_ptrdiff_t_is_i=yes], [glibcxx_ptrdiff_t_is_i=no])
|
2005-06-17 15:33:56 +08:00
|
|
|
CFLAGS=$ac_save_CFLAGS
|
|
|
|
if test "$glibcxx_ptrdiff_t_is_i" = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_PTRDIFF_T_IS_INT, 1, [Define if ptrdiff_t is int.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT([$glibcxx_ptrdiff_t_is_i])
|
2003-08-05 10:00:18 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Setup to use the gcc gthr.h thread-specific memory and mutex model.
|
|
|
|
dnl We must stage the required headers so that they will be installed
|
|
|
|
dnl with the library (unlike libgcc, the STL implementation is provided
|
|
|
|
dnl solely within headers). Since we must not inject random user-space
|
|
|
|
dnl macro names into user-provided C++ code, we first stage into <file>-in
|
|
|
|
dnl and process to <file> with an output command. The reason for a two-
|
|
|
|
dnl stage process here is to correctly handle $srcdir!=$objdir without
|
|
|
|
dnl having to write complex code (the sed commands to clean the macro
|
|
|
|
dnl namespace are complex and fragile enough as it is). We must also
|
|
|
|
dnl add a relative path so that -I- is supported properly.
|
|
|
|
dnl
|
2012-10-15 21:10:30 +08:00
|
|
|
dnl Substs:
|
|
|
|
dnl thread_header
|
|
|
|
dnl
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_THREADS], [
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_MSG_CHECKING([for thread model used by GCC])
|
2003-08-11 13:26:58 +08:00
|
|
|
target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'`
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_MSG_RESULT([$target_thread_file])
|
2012-10-15 21:10:30 +08:00
|
|
|
GCC_AC_THREAD_HEADER([$target_thread_file])
|
2003-08-05 10:00:18 +08:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2008-08-28 18:22:19 +08:00
|
|
|
dnl
|
|
|
|
dnl Check if gthread implementation defines the types and functions
|
|
|
|
dnl required by the c++0x thread library. Conforming gthread
|
|
|
|
dnl implementations can define __GTHREADS_CXX0X to enable use with c++0x.
|
|
|
|
dnl
|
2012-02-17 21:38:15 +08:00
|
|
|
dnl GLIBCXX_ENABLE_SYMVERS must be done before this.
|
|
|
|
dnl
|
2008-08-28 18:22:19 +08:00
|
|
|
AC_DEFUN([GLIBCXX_CHECK_GTHREADS], [
|
2012-02-17 21:38:15 +08:00
|
|
|
GLIBCXX_ENABLE(libstdcxx-threads,auto,,[enable C++11 threads support])
|
|
|
|
|
|
|
|
if test x$enable_libstdcxx_threads = xauto ||
|
|
|
|
test x$enable_libstdcxx_threads = xyes; then
|
|
|
|
|
2008-08-28 18:22:19 +08:00
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
Move gthr to toplevel libgcc
gcc:
* gthr-single.h, gthr.h: Move to ../libgcc.
* gthr-aix.h: Move to ../libgcc/config/rs6000.
* gthr-dce.h: Move to ../libgcc/config/pa.
* gthr-lynx.h: Move to ../libgcc/config.
* gthr-mipssde.h: Move to ../libgcc/config/mips.
* gthr-posix.h: Move to ../libgcc/config.
* gthr-rtems.h: Likewise.
* gthr-tpf.h: Move to ../libgcc/config/s390.
* gthr-vxworks.h: Move to ../libgcc/config.
* gthr-win32.h: Move to ../libgcc/config/i386.
* configure.ac (gthread_flags): Remove
(gthr-default.h): Don't create.
(thread_file): Don't substitute.
* configure: Regenerate.
* Makefile.in (GCC_THREAD_FILE): Remove.
(GTHREAD_FLAGS): Remove.
(libgcc.mvars): Remove GTHREAD_FLAGS.
* config/t-vxworks (EXTRA_HEADERS): Remove.
gcc/po:
* EXCLUDES (gthr-aix.h, gthr-dce.h, gthr-posix.c, gthr-posix.h)
(gthr-rtems.h, gthr-single.h, gthr-solaris.h, gthr-vxworks.h)
(gthr-win32.h, gthr.h): Remove.
libgcc:
* gthr-single.h, gthr.h: New files.
* config/gthr-lynx.h, config/gthr-posix.h., config/gthr-rtems.h,
config/gthr-vxworks.h, config/i386/gthr-win32.h,
config/mips/gthr-mipssde.h, config/pa/gthr-dce.h,
config/rs6000/gthr-aix.h, config/s390/gthr-tpf.h: New files.
* config/i386/gthr-win32.c: Include "gthr-win32.h".
* configure.ac (thread_header): New variable.
Set it depending on target_thread_file.
(gthr-default.h): Link from $thread_header.
* configure: Regenerate.
* Makefile.in (LIBGCC2_CFLAGS): Remove $(GTHREAD_FLAGS).
libgfortran:
* Makefile.am (AM_CPPFLAGS): Add
-I$(srcdir)/$(MULTISRCTOP)../libgcc, -I$(MULTIBUILDTOP)../libgcc.
* Makefile.in: Regenerate.
* acinclude.m4 (LIBGFOR_CHECK_GTHR_DEFAULT): Remove.
* configure.ac (LIBGFOR_CHECK_GTHR_DEFAULT): Likewise.
* configure: Regenerate.
* config.h.in: Regenerate.
libobjc:
* Makefile.in (INCLUDES): Add -I$(MULTIBUILDTOP)../libgcc.
* configure.ac (target_thread_file, HAVE_GTHR_DEFAULT): Remove.
* configure: Regenerate.
* config.h.in: Regenerate.
libstdc++-v3:
* acinclude.m4 (GLIBCXX_CONFIGURE): Determine and substitute
toplevel_builddir.
(GLIBCXX_ENABLE_THREADS): Remove glibcxx_thread_h,
HAVE_GTHR_DEFAULT, enable_thread.
(GLIBCXX_CHECK_GTHREADS): Reflect gthr move to libgcc.
* include/Makefile.am (thread_host_headers): Remove
${host_builddir}/gthr-tpf.h.
(${host_builddir}/gthr.h): Reflect gthr move to libgcc.
Use $<.
(${host_builddir}/gthr-single.h): Likewise.
(${host_builddir}/gthr-posix.h): Likewise.
(${host_builddir}/gthr-tpf.h): Remove.
(${host_builddir}/gthr-default.h): Likewise.
* configure, config.h.in: Regenerate.
* Makefile.in, doc/Makefile.in, include/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, python/Makefile.in,
src/Makefile.intestsuite/Makefile.in: Regenerate.
From-SVN: r180776
2011-11-02 23:28:43 +08:00
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions \
|
|
|
|
-I${toplevel_srcdir}/libgcc -I${toplevel_builddir}/libgcc"
|
2008-08-28 18:22:19 +08:00
|
|
|
|
2011-10-23 05:31:24 +08:00
|
|
|
target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'`
|
|
|
|
case $target_thread_file in
|
|
|
|
posix)
|
|
|
|
CXXFLAGS="$CXXFLAGS -DSUPPORTS_WEAK -DGTHREAD_USE_WEAK -D_PTHREADS"
|
|
|
|
esac
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether it can be safely assumed that mutex_timedlock is available])
|
2011-07-16 05:52:06 +08:00
|
|
|
|
|
|
|
AC_TRY_COMPILE([#include <unistd.h>],
|
|
|
|
[
|
2011-10-23 05:31:24 +08:00
|
|
|
// In case of POSIX threads check _POSIX_TIMEOUTS.
|
|
|
|
#if (defined(_PTHREADS) \
|
2012-02-16 03:56:07 +08:00
|
|
|
&& (!defined(_POSIX_TIMEOUTS) || _POSIX_TIMEOUTS <= 0))
|
2011-07-16 05:52:06 +08:00
|
|
|
#error
|
|
|
|
#endif
|
|
|
|
], [ac_gthread_use_mutex_timedlock=1], [ac_gthread_use_mutex_timedlock=0])
|
|
|
|
|
|
|
|
AC_DEFINE_UNQUOTED(_GTHREAD_USE_MUTEX_TIMEDLOCK, $ac_gthread_use_mutex_timedlock,
|
2012-02-16 03:56:07 +08:00
|
|
|
[Define to 1 if mutex_timedlock is available.])
|
2011-07-16 05:52:06 +08:00
|
|
|
|
|
|
|
if test $ac_gthread_use_mutex_timedlock = 1 ; then res_mutex_timedlock=yes ;
|
|
|
|
else res_mutex_timedlock=no ; fi
|
|
|
|
AC_MSG_RESULT([$res_mutex_timedlock])
|
|
|
|
|
2008-08-28 18:22:19 +08:00
|
|
|
AC_MSG_CHECKING([for gthreads library])
|
|
|
|
|
2011-10-23 05:31:24 +08:00
|
|
|
AC_TRY_COMPILE([#include "gthr.h"],
|
2008-08-28 18:22:19 +08:00
|
|
|
[
|
2008-09-05 02:57:42 +08:00
|
|
|
#ifndef __GTHREADS_CXX0X
|
|
|
|
#error
|
|
|
|
#endif
|
2014-04-22 20:30:59 +08:00
|
|
|
], [ac_has_gthreads=yes], [ac_has_gthreads=no])
|
2012-02-17 21:38:15 +08:00
|
|
|
else
|
|
|
|
ac_has_gthreads=no
|
|
|
|
fi
|
2008-08-28 18:22:19 +08:00
|
|
|
|
|
|
|
AC_MSG_RESULT([$ac_has_gthreads])
|
|
|
|
|
|
|
|
if test x"$ac_has_gthreads" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCXX_HAS_GTHREADS, 1,
|
2011-03-08 08:04:05 +08:00
|
|
|
[Define if gthreads library is available.])
|
2015-03-18 18:53:38 +08:00
|
|
|
|
|
|
|
# Also check for pthread_rwlock_t for std::shared_timed_mutex in C++14
|
|
|
|
AC_CHECK_TYPE([pthread_rwlock_t],
|
|
|
|
[AC_DEFINE([_GLIBCXX_USE_PTHREAD_RWLOCK_T], 1,
|
|
|
|
[Define if POSIX read/write locks are available in <gthr.h>.])],
|
|
|
|
[],
|
|
|
|
[#include "gthr.h"])
|
2008-08-28 18:22:19 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2003-08-05 10:00:18 +08:00
|
|
|
# Check whether LC_MESSAGES is available in <locale.h>.
|
|
|
|
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
|
|
|
#
|
|
|
|
# This file file be copied and used freely without restrictions. It can
|
|
|
|
# be used in projects which are not available under the GNU Public License
|
|
|
|
# but which still want to provide support for the GNU gettext functionality.
|
|
|
|
# Please note that the actual code is *not* freely available.
|
2004-03-02 03:22:28 +08:00
|
|
|
AC_DEFUN([AC_LC_MESSAGES], [
|
2003-08-05 10:00:18 +08:00
|
|
|
AC_CHECK_HEADER(locale.h, [
|
|
|
|
AC_CACHE_CHECK([for LC_MESSAGES], ac_cv_val_LC_MESSAGES,
|
2008-08-17 20:30:55 +08:00
|
|
|
[AC_TRY_COMPILE([#include <locale.h>], [return LC_MESSAGES],
|
2003-08-05 10:00:18 +08:00
|
|
|
ac_cv_val_LC_MESSAGES=yes, ac_cv_val_LC_MESSAGES=no)])
|
|
|
|
if test $ac_cv_val_LC_MESSAGES = yes; then
|
2011-03-08 08:04:05 +08:00
|
|
|
AC_DEFINE(HAVE_LC_MESSAGES, 1,
|
|
|
|
[Define if LC_MESSAGES is available in <locale.h>.])
|
2003-08-05 10:00:18 +08:00
|
|
|
fi
|
|
|
|
])
|
|
|
|
])
|
|
|
|
|
2012-09-10 01:20:42 +08:00
|
|
|
dnl
|
|
|
|
dnl Check whether rdrand is supported in the assembler.
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_X86_RDRAND], [
|
|
|
|
AC_MSG_CHECKING([for rdrand support in assembler])
|
2012-09-10 03:46:41 +08:00
|
|
|
AC_CACHE_VAL(ac_cv_x86_rdrand, [
|
2012-09-10 01:20:42 +08:00
|
|
|
ac_cv_x86_rdrand=no
|
|
|
|
case "$target" in
|
|
|
|
i?86-*-* | \
|
|
|
|
x86_64-*-*)
|
|
|
|
AC_TRY_COMPILE(, [asm("rdrand %eax");],
|
|
|
|
[ac_cv_x86_rdrand=yes], [ac_cv_x86_rdrand=no])
|
|
|
|
esac
|
|
|
|
])
|
|
|
|
if test $ac_cv_x86_rdrand = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_X86_RDRAND, 1,
|
|
|
|
[ Defined if as can handle rdrand. ])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_cv_x86_rdrand)
|
|
|
|
])
|
|
|
|
|
2019-05-29 22:45:35 +08:00
|
|
|
dnl
|
|
|
|
dnl Check whether rdseed is supported in the assembler.
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_X86_RDSEED], [
|
|
|
|
AC_MSG_CHECKING([for rdseed support in assembler])
|
|
|
|
AC_CACHE_VAL(ac_cv_x86_rdseed, [
|
|
|
|
ac_cv_x86_rdseed=no
|
|
|
|
case "$target" in
|
|
|
|
i?86-*-* | \
|
|
|
|
x86_64-*-*)
|
|
|
|
AC_TRY_COMPILE(, [asm("rdseed %eax");],
|
|
|
|
[ac_cv_x86_rdseed=yes], [ac_cv_x86_rdseed=no])
|
|
|
|
esac
|
|
|
|
])
|
|
|
|
if test $ac_cv_x86_rdseed = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_X86_RDSEED, 1,
|
|
|
|
[ Defined if as can handle rdseed. ])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_cv_x86_rdseed)
|
|
|
|
])
|
|
|
|
|
2011-05-29 01:27:01 +08:00
|
|
|
dnl
|
|
|
|
dnl Check whether get_nprocs is available in <sys/sysinfo.h>, and define _GLIBCXX_USE_GET_NPROCS.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_GET_NPROCS], [
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for get_nprocs])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_GET_NPROCS, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <sys/sysinfo.h>],
|
|
|
|
[int n = get_nprocs();],
|
|
|
|
[glibcxx_cv_GET_NPROCS=yes],
|
|
|
|
[glibcxx_cv_GET_NPROCS=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_GET_NPROCS = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_GET_NPROCS, 1, [Define if get_nprocs is available in <sys/sysinfo.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_GET_NPROCS)
|
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check whether sysconf(_SC_NPROCESSORS_ONLN) is available in <unistd.h>, and define _GLIBCXX_USE_SC_NPROCESSORS_ONLN.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_SC_NPROCESSORS_ONLN], [
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for _SC_NPROCESSORS_ONLN])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_SC_NPROCESSORS_ONLN, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <unistd.h>],
|
|
|
|
[int n = sysconf(_SC_NPROCESSORS_ONLN);],
|
|
|
|
[glibcxx_cv_SC_NPROCESSORS_ONLN=yes],
|
|
|
|
[glibcxx_cv_SC_NPROCESSORS_ONLN=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_SC_NPROCESSORS_ONLN = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_SC_NPROCESSORS_ONLN, 1, [Define if _SC_NPROCESSORS_ONLN is available in <unistd.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_SC_NPROCESSORS_ONLN)
|
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
2011-11-07 21:45:03 +08:00
|
|
|
dnl
|
|
|
|
dnl Check whether sysconf(_SC_NPROC_ONLN) is available in <unistd.h>, and define _GLIBCXX_USE_SC_NPROC_ONLN.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_SC_NPROC_ONLN], [
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for _SC_NPROC_ONLN])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_SC_NPROC_ONLN, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <unistd.h>],
|
|
|
|
[int n = sysconf(_SC_NPROC_ONLN);],
|
|
|
|
[glibcxx_cv_SC_NPROC_ONLN=yes],
|
|
|
|
[glibcxx_cv_SC_NPROC_ONLN=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_SC_NPROC_ONLN = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_SC_NPROC_ONLN, 1, [Define if _SC_NPROC_ONLN is available in <unistd.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_SC_NPROC_ONLN)
|
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check whether pthread_num_processors_np is available in <pthread.h>, and define _GLIBCXX_USE_PTHREADS_NUM_PROCESSORS_NP.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP], [
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for pthreads_num_processors_np])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_PTHREADS_NUM_PROCESSORS_NP, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <pthread.h>],
|
|
|
|
[int n = pthread_num_processors_np();],
|
|
|
|
[glibcxx_cv_PTHREADS_NUM_PROCESSORS_NP=yes],
|
|
|
|
[glibcxx_cv_PTHREADS_NUM_PROCESSORS_NP=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_PTHREADS_NUM_PROCESSORS_NP = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_PTHREADS_NUM_PROCESSORS_NP, 1, [Define if pthreads_num_processors_np is available in <pthread.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_PTHREADS_NUM_PROCESSORS_NP)
|
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check whether sysctl is available in <pthread.h>, and define _GLIBCXX_USE_SYSCTL_HW_NCPU.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_SYSCTL_HW_NCPU], [
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for hw.ncpu sysctl])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_SYSCTL_HW_NCPU, [
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <sys/sysctl.h>
|
|
|
|
],
|
|
|
|
[
|
|
|
|
int count;
|
|
|
|
size_t size = sizeof(count);
|
|
|
|
int mib[] = { CTL_HW, HW_NCPU };
|
|
|
|
sysctl(mib, 2, &count, &size, NULL, 0);
|
|
|
|
],
|
|
|
|
[glibcxx_cv_SYSCTL_HW_NCPU=yes],
|
|
|
|
[glibcxx_cv_SYSCTL_HW_NCPU=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_SYSCTL_HW_NCPU = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_SYSCTL_HW_NCPU, 1, [Define if sysctl(), CTL_HW and HW_NCPU are available in <sys/sysctl.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_SYSCTL_HW_NCPU)
|
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
2011-05-29 01:27:01 +08:00
|
|
|
|
2012-02-16 03:56:07 +08:00
|
|
|
dnl
|
|
|
|
dnl Check to see if python pretty printing can be activated.
|
|
|
|
dnl
|
|
|
|
dnl --with-python-dir=dir
|
|
|
|
dnl installs directory into $prefix/dir
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_PYTHON], [
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for custom python install directory])
|
|
|
|
AC_ARG_WITH([python-dir],
|
|
|
|
AS_HELP_STRING([--with-python-dir],
|
|
|
|
[the location to install Python modules. This path is relative starting from the prefix.]),
|
|
|
|
[with_python_dir=$withval], [with_python_dir="no"])
|
|
|
|
AC_MSG_RESULT(${with_python_dir})
|
|
|
|
|
|
|
|
# Needed for installing Python modules during make install.
|
|
|
|
python_mod_dir="${with_python_dir}"
|
|
|
|
AC_SUBST(python_mod_dir)
|
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_PYTHONDIR, test $python_mod_dir != no)
|
|
|
|
])
|
|
|
|
|
2012-02-18 04:26:32 +08:00
|
|
|
dnl
|
|
|
|
dnl Check to see if -Werror is disabled.
|
|
|
|
dnl
|
|
|
|
dnl --enable-werror/--disable-werror
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_WERROR], [
|
|
|
|
AC_MSG_CHECKING([for -Werror])
|
|
|
|
GLIBCXX_ENABLE(werror,$1,,[turns on -Werror])
|
|
|
|
AC_MSG_RESULT($enable_werror)
|
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_WERROR, test $enable_werror = yes)
|
|
|
|
])
|
|
|
|
|
2014-01-24 05:17:15 +08:00
|
|
|
dnl
|
|
|
|
dnl Check whether obsolescent tmpnam is available in <stdio.h>,
|
|
|
|
dnl and define _GLIBCXX_USE_TMPNAM.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_TMPNAM], [dnl
|
|
|
|
dnl
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
|
|
|
dnl
|
|
|
|
AC_MSG_CHECKING([for tmpnam])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_TMPNAM, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <stdio.h>],
|
|
|
|
[char *tmp = tmpnam(NULL);],
|
|
|
|
[glibcxx_cv_TMPNAM=yes],
|
|
|
|
[glibcxx_cv_TMPNAM=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_TMPNAM = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_TMPNAM, 1, [Define if obsolescent tmpnam is available in <stdio.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_TMPNAM)
|
|
|
|
dnl
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
2012-02-16 03:56:07 +08:00
|
|
|
|
2013-04-10 04:55:17 +08:00
|
|
|
dnl
|
|
|
|
dnl Check to see if sys/sdt.h exists and that it is suitable for use.
|
|
|
|
dnl Some versions of sdt.h were not compatible with C++11.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_SDT_H], [
|
2014-07-20 01:56:09 +08:00
|
|
|
AC_MSG_CHECKING([for suitable sys/sdt.h])
|
2013-04-10 04:55:17 +08:00
|
|
|
# Note that this test has to be run with the C language.
|
|
|
|
# Otherwise, sdt.h will try to include some headers from
|
|
|
|
# libstdc++ itself.
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_C
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_sys_sdt_h, [
|
|
|
|
# Because we have to run the test in C, we use grep rather
|
|
|
|
# than the compiler to check for the bug. The bug is that
|
|
|
|
# were strings without trailing whitespace, causing g++
|
|
|
|
# to look for operator"". The pattern searches for the fixed
|
|
|
|
# output.
|
|
|
|
AC_EGREP_CPP([ \",\" ], [
|
|
|
|
#include <sys/sdt.h>
|
|
|
|
int f() { STAP_PROBE(hi, bob); }
|
|
|
|
], [glibcxx_cv_sys_sdt_h=yes], [glibcxx_cv_sys_sdt_h=no])
|
|
|
|
])
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
if test $glibcxx_cv_sys_sdt_h = yes; then
|
|
|
|
AC_DEFINE(HAVE_SYS_SDT_H, 1,
|
|
|
|
[Define to 1 if you have a suitable <sys/sdt.h> header file])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_sys_sdt_h)
|
|
|
|
])
|
|
|
|
|
re PR libstdc++/49561 ([C++0x] std::list::size complexity)
PR libstdc++/49561
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Define.
* configure.ac: Use GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI.
* configure: Regenerate.
* include/Makefile.am (stamp-cxx11-abi): New target.
(c++config.h): Set _GLIBCXX_USE_CXX11_ABI macro.
* include/Makefile.in: Regenerate.
* include/bits/c++config: Add _GLIBCXX_USE_CXX11_ABI placeholder and
define _GLIBCXX_DEFAULT_ABI_TAG.
* include/bits/list.tcc (list::emplace(const_iterator, _Args&...)):
Increment size.
(list::emplace(const_iterator, const value_type&)): Likewise.
(list::merge(list&), list::merge(list&, _StrictWeakOrdering)): Adjust
list sizes.
* include/bits/stl_list.h (_List_base, list): Add ABI tag macro.
(_List_base::_M_size): New data member in cxx11 ABI mode.
(_List_base::_S_distance(_List_node_base*, _List_node_base*)): New
function.
(_List_base::_M_get_size(), _List_base::_M_set_size(size_t),
_List_base::_M_inc_size(size_t), _List_base::_M_dec_size(size_t),
_List_base::_M_distance, _List_base::_M_node_count): New functions for
accessing list size correctly for the ABI mode.
(_List_base::_List_base(_List_base&&)): Copy size and reset source.
(_List_base::_M_init()): Initialize size member.
(list::size()): Use _List_base::_M_node_count.
(list::swap(list&)): Swap sizes.
(list::splice(iterator, list&)): Update sizes.
(list::splice(iterator, list&, iterator)): Likewise.
(list::insert(iterator, const value_type&)): Update size.
(list::insert(iterator, _Args&&...)): Likewise.
(list::_M_erase(iterator)): Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Adjust.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust.
From-SVN: r216094
2014-10-10 23:33:57 +08:00
|
|
|
dnl
|
New std::string implementation.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove.
(GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI, GLIBCXX_DEFAULT_ABI): Add.
* configure.ac: Use new macros.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* include/Makefile.am: Set _GLIBCXX_USE_DUAL_ABI.
* include/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Export symbols related to new std::string.
Tighten old patterns to not match new symbols.
* config/locale/generic/monetary_members.cc: Guard some definitions
to not compile with new ABI.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Prevent double-free.
* config/os/gnu-linux/ldbl-extra.ver: Add new __gnu_cxx_ldbl128
exports. Tighten old patterns.
* doc/xml/manual/configure.xml: Document new configure options.
* doc/html/*: Regenerate.
* include/bits/basic_string.h (__cxx11::basic_string): Define new
non-reference-counted implementation in inline namespace __cxx11.
(stoi, stol, stoll, stof, stod, stold, to_string): Conditionally use
inline namespace.
(literals::string_literals::operator"): Conditionally use abi-tag.
* include/bits/basic_string.tcc (__cxx11::basic_string): Define.
* include/bits/c++config: Define _GLIBCXX_USE_DUAL_ABI and
LDBL_CXX11_ABI namespace macros.
* include/bits/locale_classes.h (locale::name()): Use abi_tag when
new ABI is in use.
(locale::_S_twinned_facets): New static member.
(locale::facet::__shim): Declare new type.
(locale::_facet::_M_sso_shim, locale::_facet::_M_cow_shim): New
functions for creating shims.
(locale::_Impl::_M_facet_unchecked): New member function for use
during construction.
(locale::_Impl::_M_init_extra): New member functions to create second
version of some facets.
(collate, collate_byname): Use abi_tag when new ABI is in use.
* include/bits/locale_facets.h: Add _GLIBCXX_NUM_CXX11_FACETS macro.
(numpunct, numpunct_byname): Use __cxx11 namespace.
(num_get::_M_extract_float, num_get::_M_extract_int): Use abi_tag
when new ABI is in use.
(num_get::__do_get, num_put::__do_put): Do not declare long double
compat functions for new ABI.
* include/bits/locale_facets.tcc (num_get, num_put): Use abi_tag on
definitions.
(numpunct, numpunct_byname): Qualify explicit instantiations.
* include/bits/locale_facets_nonio.h (time_get, time_get_byname,
moneypunct, moneypunct_byname, money_get, money_put, messages,
messages_byname): Use new inline namespace macros.
(money_get::__do_get, money_put::__do_put): Do not declare long
double compat functions for new ABI.
* include/bits/locale_facets_nonio.tcc (money_get, money_put): Use
new namespace macros.
(money_get::__do_get, money_put::__do_put): Do not define for new ABI.
* include/bits/localefwd.h (numpunct, numpunct_byname, collate,
collate_byname, time_get, time_get_byname, moneypunct,
moneypunct_byname, money_get, money_put, messages, messages_byname):
Use new namespace macros.
* include/bits/regex.h: Use inline namespace macros.
* include/bits/stl_list.h (_List_base, list): Use inline namespace
instead of abi-tag.
* include/bits/stringfwd.h (basic_string): Use namespace macros.
* include/std/iosfwd (basic_stringbuf, basic_istringstream,
basic_ostringstream, basic_stringstream): Likewise.
* include/std/sstream: Likewise.
(basic_stringbuf::__xfer_bufptrs): Update streambuf pointers on move.
* include/std/stdexcept (__cow_string, __sso_string): New types for
indirectly using std::string with either ABI.
(logic_error, runtime_error): Replace std::string member with
__cow_string when new ABI is in use. Declare non-inline copy
constructor and assignment operator. Declare const char* constructors.
(domain_error, invalid_argument, length_error, out_of_range,
range_error, overflow_error, underflow_error): Declare const char*
constructors.
* include/std/system_error (error_category): Replace with new
definition in inline namespace _V2.
(error_code::message, error_condition::message): Use abi_tag on
functions returning std::string.
* python/libstdcxx/v6/printers.py (StdStringPrinter): Handle new ABI.
* src/c++11/Makefile.am: Add new files.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc: Compile with old std::string ABI.
Define old error_category symbols.
* src/c++11/cow-fstream-inst.cc: New. Instantiate fstream members
using old std::string ABI.
* src/c++11/cow-locale_init.cc (locale::_Impl::_M_init_extra): Define.
* src/c++11/cow-shim_facets.cc: Define shim facets using old ABI.
* src/c++11/cow-sstream-inst.cc: Instantiate stringstreams using old
std::string ABI.
* src/c++11/cow-stdexcept.cc: Define new constructors and assignment
operators.
(__cow_string, error_category::_M_message): Define.
* src/c++11/cow-string-inst.cc: Explicit instantiations using old
std::string. Include src/c++98/istream-string.cc.
* src/c++11/cow-wstring-inst.cc: Explicit instantiations using old
std::wstring.
* src/c++11/cxx11-hash_tr1.cc: Explicit instantiations using new
string.
* src/c++11/cxx11-ios_failure.cc: Add sanity check.
* src/c++11/cxx11-locale-inst.cc: Instantiate facets using new
std::string.
* src/c++11/cxx11-shim_facets.cc: Define shim facets using new ABI.
* src/c++11/cxx11-stdexcept.cc: Define constructors taking new
std::string.
* src/c++11/cxx11-wlocale-inst.cc: Instantiate facets using
new std::wstring.
* src/c++11/fstream-inst.cc: Compile with new ABI.
* src/c++11/functexcept.cc: Compile with old ABI.
* src/c++11/random.cc: Compile with new ABI.
* src/c++11/sstream-inst.cc: Compile with new ABI.
* src/c++11/string-inst.cc: Explicit instantiations for new string.
* src/c++11/system_error.cc (__sso_string, error_category::_M_message):
Define.
* src/c++11/wstring-inst.cc: Compile with new ABI.
* src/c++98/Makefile.am: Compile some host files twice for old and
new std::string. Add new files.
* src/c++98/Makefile.in: Regenerate.
* src/c++98/compatibility-ldbl.cc: Compile with old ABI.
* src/c++98/compatibility.cc: Likewise.
* src/c++98/concept-inst.cc: Likewise.
* src/c++98/hash_tr1.cc: Likewise.
* src/c++98/istream-string.cc: New file defining functions that
work with istream and std::string moved from ...
* src/c++98/istream.cc: ... here.
* src/c++98/cow-istream-string.cc: Recompile istream-string.cc with
old ABI.
* src/c++98/locale-inst.cc: Adjust facet instantiations to work for
either ABI.
* src/c++98/locale.cc (locale::_M_install_facet,
locale::_M_install_cache): Handle twinned facets.
* src/c++98/locale-facets.cc: Compile with old std::string ABI.
(__verify_grouping): Define new overload and old std::string version.
* src/c++98/locale_init.cc: Initialize twinned facets.
* src/c++98/localename.cc: Likewise.
* src/c++98/misc-inst.cc: Instantiate C++98-only std::string members.
(__verify_grouping): Define new std::string version.
* src/c++98/stdexcept.cc: Compile with old std::string ABI.
* src/c++98/wlocale-inst.cc: Likewise.
* testsuite/18_support/50594.cc: Adjust to work with SSO strings.
* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
Likewise.
* testsuite/21_strings/headers/string/synopsis.cc: Use inline
namespace macros.
* testsuite/23_containers/headers/list/synopsis.cc: Likewise.
* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Set dg-options so
correct exception type can be caught.
* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/char/12297.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* testsuite/27_io/ios_base/failure/cxx11.cc: Disable for old ABI.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error.
* testsuite/libstdc++-prettyprinters/libfundts.cc: Use old ABI.
* testsuite/libstdc++-prettyprinters/simple.cc: Likewise.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
* testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.
* testsuite/util/exception/safety.h: Adjust member function types
for new std::string.
* testsuite/util/testsuite_abi.cc: Add new version and ignore
__float128 symbols in __cxx11 namespace.
From-SVN: r218964
2014-12-20 02:16:39 +08:00
|
|
|
dnl Control whether the library should define symbols for old and new ABIs.
|
|
|
|
dnl This affects definitions of strings, stringstreams and locale facets.
|
re PR libstdc++/49561 ([C++0x] std::list::size complexity)
PR libstdc++/49561
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Define.
* configure.ac: Use GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI.
* configure: Regenerate.
* include/Makefile.am (stamp-cxx11-abi): New target.
(c++config.h): Set _GLIBCXX_USE_CXX11_ABI macro.
* include/Makefile.in: Regenerate.
* include/bits/c++config: Add _GLIBCXX_USE_CXX11_ABI placeholder and
define _GLIBCXX_DEFAULT_ABI_TAG.
* include/bits/list.tcc (list::emplace(const_iterator, _Args&...)):
Increment size.
(list::emplace(const_iterator, const value_type&)): Likewise.
(list::merge(list&), list::merge(list&, _StrictWeakOrdering)): Adjust
list sizes.
* include/bits/stl_list.h (_List_base, list): Add ABI tag macro.
(_List_base::_M_size): New data member in cxx11 ABI mode.
(_List_base::_S_distance(_List_node_base*, _List_node_base*)): New
function.
(_List_base::_M_get_size(), _List_base::_M_set_size(size_t),
_List_base::_M_inc_size(size_t), _List_base::_M_dec_size(size_t),
_List_base::_M_distance, _List_base::_M_node_count): New functions for
accessing list size correctly for the ABI mode.
(_List_base::_List_base(_List_base&&)): Copy size and reset source.
(_List_base::_M_init()): Initialize size member.
(list::size()): Use _List_base::_M_node_count.
(list::swap(list&)): Swap sizes.
(list::splice(iterator, list&)): Update sizes.
(list::splice(iterator, list&, iterator)): Likewise.
(list::insert(iterator, const value_type&)): Update size.
(list::insert(iterator, _Args&&...)): Likewise.
(list::_M_erase(iterator)): Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Adjust.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust.
From-SVN: r216094
2014-10-10 23:33:57 +08:00
|
|
|
dnl
|
New std::string implementation.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove.
(GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI, GLIBCXX_DEFAULT_ABI): Add.
* configure.ac: Use new macros.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* include/Makefile.am: Set _GLIBCXX_USE_DUAL_ABI.
* include/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Export symbols related to new std::string.
Tighten old patterns to not match new symbols.
* config/locale/generic/monetary_members.cc: Guard some definitions
to not compile with new ABI.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Prevent double-free.
* config/os/gnu-linux/ldbl-extra.ver: Add new __gnu_cxx_ldbl128
exports. Tighten old patterns.
* doc/xml/manual/configure.xml: Document new configure options.
* doc/html/*: Regenerate.
* include/bits/basic_string.h (__cxx11::basic_string): Define new
non-reference-counted implementation in inline namespace __cxx11.
(stoi, stol, stoll, stof, stod, stold, to_string): Conditionally use
inline namespace.
(literals::string_literals::operator"): Conditionally use abi-tag.
* include/bits/basic_string.tcc (__cxx11::basic_string): Define.
* include/bits/c++config: Define _GLIBCXX_USE_DUAL_ABI and
LDBL_CXX11_ABI namespace macros.
* include/bits/locale_classes.h (locale::name()): Use abi_tag when
new ABI is in use.
(locale::_S_twinned_facets): New static member.
(locale::facet::__shim): Declare new type.
(locale::_facet::_M_sso_shim, locale::_facet::_M_cow_shim): New
functions for creating shims.
(locale::_Impl::_M_facet_unchecked): New member function for use
during construction.
(locale::_Impl::_M_init_extra): New member functions to create second
version of some facets.
(collate, collate_byname): Use abi_tag when new ABI is in use.
* include/bits/locale_facets.h: Add _GLIBCXX_NUM_CXX11_FACETS macro.
(numpunct, numpunct_byname): Use __cxx11 namespace.
(num_get::_M_extract_float, num_get::_M_extract_int): Use abi_tag
when new ABI is in use.
(num_get::__do_get, num_put::__do_put): Do not declare long double
compat functions for new ABI.
* include/bits/locale_facets.tcc (num_get, num_put): Use abi_tag on
definitions.
(numpunct, numpunct_byname): Qualify explicit instantiations.
* include/bits/locale_facets_nonio.h (time_get, time_get_byname,
moneypunct, moneypunct_byname, money_get, money_put, messages,
messages_byname): Use new inline namespace macros.
(money_get::__do_get, money_put::__do_put): Do not declare long
double compat functions for new ABI.
* include/bits/locale_facets_nonio.tcc (money_get, money_put): Use
new namespace macros.
(money_get::__do_get, money_put::__do_put): Do not define for new ABI.
* include/bits/localefwd.h (numpunct, numpunct_byname, collate,
collate_byname, time_get, time_get_byname, moneypunct,
moneypunct_byname, money_get, money_put, messages, messages_byname):
Use new namespace macros.
* include/bits/regex.h: Use inline namespace macros.
* include/bits/stl_list.h (_List_base, list): Use inline namespace
instead of abi-tag.
* include/bits/stringfwd.h (basic_string): Use namespace macros.
* include/std/iosfwd (basic_stringbuf, basic_istringstream,
basic_ostringstream, basic_stringstream): Likewise.
* include/std/sstream: Likewise.
(basic_stringbuf::__xfer_bufptrs): Update streambuf pointers on move.
* include/std/stdexcept (__cow_string, __sso_string): New types for
indirectly using std::string with either ABI.
(logic_error, runtime_error): Replace std::string member with
__cow_string when new ABI is in use. Declare non-inline copy
constructor and assignment operator. Declare const char* constructors.
(domain_error, invalid_argument, length_error, out_of_range,
range_error, overflow_error, underflow_error): Declare const char*
constructors.
* include/std/system_error (error_category): Replace with new
definition in inline namespace _V2.
(error_code::message, error_condition::message): Use abi_tag on
functions returning std::string.
* python/libstdcxx/v6/printers.py (StdStringPrinter): Handle new ABI.
* src/c++11/Makefile.am: Add new files.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc: Compile with old std::string ABI.
Define old error_category symbols.
* src/c++11/cow-fstream-inst.cc: New. Instantiate fstream members
using old std::string ABI.
* src/c++11/cow-locale_init.cc (locale::_Impl::_M_init_extra): Define.
* src/c++11/cow-shim_facets.cc: Define shim facets using old ABI.
* src/c++11/cow-sstream-inst.cc: Instantiate stringstreams using old
std::string ABI.
* src/c++11/cow-stdexcept.cc: Define new constructors and assignment
operators.
(__cow_string, error_category::_M_message): Define.
* src/c++11/cow-string-inst.cc: Explicit instantiations using old
std::string. Include src/c++98/istream-string.cc.
* src/c++11/cow-wstring-inst.cc: Explicit instantiations using old
std::wstring.
* src/c++11/cxx11-hash_tr1.cc: Explicit instantiations using new
string.
* src/c++11/cxx11-ios_failure.cc: Add sanity check.
* src/c++11/cxx11-locale-inst.cc: Instantiate facets using new
std::string.
* src/c++11/cxx11-shim_facets.cc: Define shim facets using new ABI.
* src/c++11/cxx11-stdexcept.cc: Define constructors taking new
std::string.
* src/c++11/cxx11-wlocale-inst.cc: Instantiate facets using
new std::wstring.
* src/c++11/fstream-inst.cc: Compile with new ABI.
* src/c++11/functexcept.cc: Compile with old ABI.
* src/c++11/random.cc: Compile with new ABI.
* src/c++11/sstream-inst.cc: Compile with new ABI.
* src/c++11/string-inst.cc: Explicit instantiations for new string.
* src/c++11/system_error.cc (__sso_string, error_category::_M_message):
Define.
* src/c++11/wstring-inst.cc: Compile with new ABI.
* src/c++98/Makefile.am: Compile some host files twice for old and
new std::string. Add new files.
* src/c++98/Makefile.in: Regenerate.
* src/c++98/compatibility-ldbl.cc: Compile with old ABI.
* src/c++98/compatibility.cc: Likewise.
* src/c++98/concept-inst.cc: Likewise.
* src/c++98/hash_tr1.cc: Likewise.
* src/c++98/istream-string.cc: New file defining functions that
work with istream and std::string moved from ...
* src/c++98/istream.cc: ... here.
* src/c++98/cow-istream-string.cc: Recompile istream-string.cc with
old ABI.
* src/c++98/locale-inst.cc: Adjust facet instantiations to work for
either ABI.
* src/c++98/locale.cc (locale::_M_install_facet,
locale::_M_install_cache): Handle twinned facets.
* src/c++98/locale-facets.cc: Compile with old std::string ABI.
(__verify_grouping): Define new overload and old std::string version.
* src/c++98/locale_init.cc: Initialize twinned facets.
* src/c++98/localename.cc: Likewise.
* src/c++98/misc-inst.cc: Instantiate C++98-only std::string members.
(__verify_grouping): Define new std::string version.
* src/c++98/stdexcept.cc: Compile with old std::string ABI.
* src/c++98/wlocale-inst.cc: Likewise.
* testsuite/18_support/50594.cc: Adjust to work with SSO strings.
* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
Likewise.
* testsuite/21_strings/headers/string/synopsis.cc: Use inline
namespace macros.
* testsuite/23_containers/headers/list/synopsis.cc: Likewise.
* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Set dg-options so
correct exception type can be caught.
* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/char/12297.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* testsuite/27_io/ios_base/failure/cxx11.cc: Disable for old ABI.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error.
* testsuite/libstdc++-prettyprinters/libfundts.cc: Use old ABI.
* testsuite/libstdc++-prettyprinters/simple.cc: Likewise.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
* testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.
* testsuite/util/exception/safety.h: Adjust member function types
for new std::string.
* testsuite/util/testsuite_abi.cc: Add new version and ignore
__float128 symbols in __cxx11 namespace.
From-SVN: r218964
2014-12-20 02:16:39 +08:00
|
|
|
dnl --disable-libstdcxx-dual-abi will use old ABI for all types.
|
re PR libstdc++/49561 ([C++0x] std::list::size complexity)
PR libstdc++/49561
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Define.
* configure.ac: Use GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI.
* configure: Regenerate.
* include/Makefile.am (stamp-cxx11-abi): New target.
(c++config.h): Set _GLIBCXX_USE_CXX11_ABI macro.
* include/Makefile.in: Regenerate.
* include/bits/c++config: Add _GLIBCXX_USE_CXX11_ABI placeholder and
define _GLIBCXX_DEFAULT_ABI_TAG.
* include/bits/list.tcc (list::emplace(const_iterator, _Args&...)):
Increment size.
(list::emplace(const_iterator, const value_type&)): Likewise.
(list::merge(list&), list::merge(list&, _StrictWeakOrdering)): Adjust
list sizes.
* include/bits/stl_list.h (_List_base, list): Add ABI tag macro.
(_List_base::_M_size): New data member in cxx11 ABI mode.
(_List_base::_S_distance(_List_node_base*, _List_node_base*)): New
function.
(_List_base::_M_get_size(), _List_base::_M_set_size(size_t),
_List_base::_M_inc_size(size_t), _List_base::_M_dec_size(size_t),
_List_base::_M_distance, _List_base::_M_node_count): New functions for
accessing list size correctly for the ABI mode.
(_List_base::_List_base(_List_base&&)): Copy size and reset source.
(_List_base::_M_init()): Initialize size member.
(list::size()): Use _List_base::_M_node_count.
(list::swap(list&)): Swap sizes.
(list::splice(iterator, list&)): Update sizes.
(list::splice(iterator, list&, iterator)): Likewise.
(list::insert(iterator, const value_type&)): Update size.
(list::insert(iterator, _Args&&...)): Likewise.
(list::_M_erase(iterator)): Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Adjust.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust.
From-SVN: r216094
2014-10-10 23:33:57 +08:00
|
|
|
dnl
|
|
|
|
dnl Defines:
|
New std::string implementation.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove.
(GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI, GLIBCXX_DEFAULT_ABI): Add.
* configure.ac: Use new macros.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* include/Makefile.am: Set _GLIBCXX_USE_DUAL_ABI.
* include/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Export symbols related to new std::string.
Tighten old patterns to not match new symbols.
* config/locale/generic/monetary_members.cc: Guard some definitions
to not compile with new ABI.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Prevent double-free.
* config/os/gnu-linux/ldbl-extra.ver: Add new __gnu_cxx_ldbl128
exports. Tighten old patterns.
* doc/xml/manual/configure.xml: Document new configure options.
* doc/html/*: Regenerate.
* include/bits/basic_string.h (__cxx11::basic_string): Define new
non-reference-counted implementation in inline namespace __cxx11.
(stoi, stol, stoll, stof, stod, stold, to_string): Conditionally use
inline namespace.
(literals::string_literals::operator"): Conditionally use abi-tag.
* include/bits/basic_string.tcc (__cxx11::basic_string): Define.
* include/bits/c++config: Define _GLIBCXX_USE_DUAL_ABI and
LDBL_CXX11_ABI namespace macros.
* include/bits/locale_classes.h (locale::name()): Use abi_tag when
new ABI is in use.
(locale::_S_twinned_facets): New static member.
(locale::facet::__shim): Declare new type.
(locale::_facet::_M_sso_shim, locale::_facet::_M_cow_shim): New
functions for creating shims.
(locale::_Impl::_M_facet_unchecked): New member function for use
during construction.
(locale::_Impl::_M_init_extra): New member functions to create second
version of some facets.
(collate, collate_byname): Use abi_tag when new ABI is in use.
* include/bits/locale_facets.h: Add _GLIBCXX_NUM_CXX11_FACETS macro.
(numpunct, numpunct_byname): Use __cxx11 namespace.
(num_get::_M_extract_float, num_get::_M_extract_int): Use abi_tag
when new ABI is in use.
(num_get::__do_get, num_put::__do_put): Do not declare long double
compat functions for new ABI.
* include/bits/locale_facets.tcc (num_get, num_put): Use abi_tag on
definitions.
(numpunct, numpunct_byname): Qualify explicit instantiations.
* include/bits/locale_facets_nonio.h (time_get, time_get_byname,
moneypunct, moneypunct_byname, money_get, money_put, messages,
messages_byname): Use new inline namespace macros.
(money_get::__do_get, money_put::__do_put): Do not declare long
double compat functions for new ABI.
* include/bits/locale_facets_nonio.tcc (money_get, money_put): Use
new namespace macros.
(money_get::__do_get, money_put::__do_put): Do not define for new ABI.
* include/bits/localefwd.h (numpunct, numpunct_byname, collate,
collate_byname, time_get, time_get_byname, moneypunct,
moneypunct_byname, money_get, money_put, messages, messages_byname):
Use new namespace macros.
* include/bits/regex.h: Use inline namespace macros.
* include/bits/stl_list.h (_List_base, list): Use inline namespace
instead of abi-tag.
* include/bits/stringfwd.h (basic_string): Use namespace macros.
* include/std/iosfwd (basic_stringbuf, basic_istringstream,
basic_ostringstream, basic_stringstream): Likewise.
* include/std/sstream: Likewise.
(basic_stringbuf::__xfer_bufptrs): Update streambuf pointers on move.
* include/std/stdexcept (__cow_string, __sso_string): New types for
indirectly using std::string with either ABI.
(logic_error, runtime_error): Replace std::string member with
__cow_string when new ABI is in use. Declare non-inline copy
constructor and assignment operator. Declare const char* constructors.
(domain_error, invalid_argument, length_error, out_of_range,
range_error, overflow_error, underflow_error): Declare const char*
constructors.
* include/std/system_error (error_category): Replace with new
definition in inline namespace _V2.
(error_code::message, error_condition::message): Use abi_tag on
functions returning std::string.
* python/libstdcxx/v6/printers.py (StdStringPrinter): Handle new ABI.
* src/c++11/Makefile.am: Add new files.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc: Compile with old std::string ABI.
Define old error_category symbols.
* src/c++11/cow-fstream-inst.cc: New. Instantiate fstream members
using old std::string ABI.
* src/c++11/cow-locale_init.cc (locale::_Impl::_M_init_extra): Define.
* src/c++11/cow-shim_facets.cc: Define shim facets using old ABI.
* src/c++11/cow-sstream-inst.cc: Instantiate stringstreams using old
std::string ABI.
* src/c++11/cow-stdexcept.cc: Define new constructors and assignment
operators.
(__cow_string, error_category::_M_message): Define.
* src/c++11/cow-string-inst.cc: Explicit instantiations using old
std::string. Include src/c++98/istream-string.cc.
* src/c++11/cow-wstring-inst.cc: Explicit instantiations using old
std::wstring.
* src/c++11/cxx11-hash_tr1.cc: Explicit instantiations using new
string.
* src/c++11/cxx11-ios_failure.cc: Add sanity check.
* src/c++11/cxx11-locale-inst.cc: Instantiate facets using new
std::string.
* src/c++11/cxx11-shim_facets.cc: Define shim facets using new ABI.
* src/c++11/cxx11-stdexcept.cc: Define constructors taking new
std::string.
* src/c++11/cxx11-wlocale-inst.cc: Instantiate facets using
new std::wstring.
* src/c++11/fstream-inst.cc: Compile with new ABI.
* src/c++11/functexcept.cc: Compile with old ABI.
* src/c++11/random.cc: Compile with new ABI.
* src/c++11/sstream-inst.cc: Compile with new ABI.
* src/c++11/string-inst.cc: Explicit instantiations for new string.
* src/c++11/system_error.cc (__sso_string, error_category::_M_message):
Define.
* src/c++11/wstring-inst.cc: Compile with new ABI.
* src/c++98/Makefile.am: Compile some host files twice for old and
new std::string. Add new files.
* src/c++98/Makefile.in: Regenerate.
* src/c++98/compatibility-ldbl.cc: Compile with old ABI.
* src/c++98/compatibility.cc: Likewise.
* src/c++98/concept-inst.cc: Likewise.
* src/c++98/hash_tr1.cc: Likewise.
* src/c++98/istream-string.cc: New file defining functions that
work with istream and std::string moved from ...
* src/c++98/istream.cc: ... here.
* src/c++98/cow-istream-string.cc: Recompile istream-string.cc with
old ABI.
* src/c++98/locale-inst.cc: Adjust facet instantiations to work for
either ABI.
* src/c++98/locale.cc (locale::_M_install_facet,
locale::_M_install_cache): Handle twinned facets.
* src/c++98/locale-facets.cc: Compile with old std::string ABI.
(__verify_grouping): Define new overload and old std::string version.
* src/c++98/locale_init.cc: Initialize twinned facets.
* src/c++98/localename.cc: Likewise.
* src/c++98/misc-inst.cc: Instantiate C++98-only std::string members.
(__verify_grouping): Define new std::string version.
* src/c++98/stdexcept.cc: Compile with old std::string ABI.
* src/c++98/wlocale-inst.cc: Likewise.
* testsuite/18_support/50594.cc: Adjust to work with SSO strings.
* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
Likewise.
* testsuite/21_strings/headers/string/synopsis.cc: Use inline
namespace macros.
* testsuite/23_containers/headers/list/synopsis.cc: Likewise.
* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Set dg-options so
correct exception type can be caught.
* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/char/12297.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* testsuite/27_io/ios_base/failure/cxx11.cc: Disable for old ABI.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error.
* testsuite/libstdc++-prettyprinters/libfundts.cc: Use old ABI.
* testsuite/libstdc++-prettyprinters/simple.cc: Likewise.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
* testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.
* testsuite/util/exception/safety.h: Adjust member function types
for new std::string.
* testsuite/util/testsuite_abi.cc: Add new version and ignore
__float128 symbols in __cxx11 namespace.
From-SVN: r218964
2014-12-20 02:16:39 +08:00
|
|
|
dnl _GLIBCXX_USE_DUAL_ABI (always defined, either to 1 or 0)
|
re PR libstdc++/49561 ([C++0x] std::list::size complexity)
PR libstdc++/49561
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Define.
* configure.ac: Use GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI.
* configure: Regenerate.
* include/Makefile.am (stamp-cxx11-abi): New target.
(c++config.h): Set _GLIBCXX_USE_CXX11_ABI macro.
* include/Makefile.in: Regenerate.
* include/bits/c++config: Add _GLIBCXX_USE_CXX11_ABI placeholder and
define _GLIBCXX_DEFAULT_ABI_TAG.
* include/bits/list.tcc (list::emplace(const_iterator, _Args&...)):
Increment size.
(list::emplace(const_iterator, const value_type&)): Likewise.
(list::merge(list&), list::merge(list&, _StrictWeakOrdering)): Adjust
list sizes.
* include/bits/stl_list.h (_List_base, list): Add ABI tag macro.
(_List_base::_M_size): New data member in cxx11 ABI mode.
(_List_base::_S_distance(_List_node_base*, _List_node_base*)): New
function.
(_List_base::_M_get_size(), _List_base::_M_set_size(size_t),
_List_base::_M_inc_size(size_t), _List_base::_M_dec_size(size_t),
_List_base::_M_distance, _List_base::_M_node_count): New functions for
accessing list size correctly for the ABI mode.
(_List_base::_List_base(_List_base&&)): Copy size and reset source.
(_List_base::_M_init()): Initialize size member.
(list::size()): Use _List_base::_M_node_count.
(list::swap(list&)): Swap sizes.
(list::splice(iterator, list&)): Update sizes.
(list::splice(iterator, list&, iterator)): Likewise.
(list::insert(iterator, const value_type&)): Update size.
(list::insert(iterator, _Args&&...)): Likewise.
(list::_M_erase(iterator)): Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Adjust.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust.
From-SVN: r216094
2014-10-10 23:33:57 +08:00
|
|
|
dnl
|
New std::string implementation.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove.
(GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI, GLIBCXX_DEFAULT_ABI): Add.
* configure.ac: Use new macros.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* include/Makefile.am: Set _GLIBCXX_USE_DUAL_ABI.
* include/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Export symbols related to new std::string.
Tighten old patterns to not match new symbols.
* config/locale/generic/monetary_members.cc: Guard some definitions
to not compile with new ABI.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Prevent double-free.
* config/os/gnu-linux/ldbl-extra.ver: Add new __gnu_cxx_ldbl128
exports. Tighten old patterns.
* doc/xml/manual/configure.xml: Document new configure options.
* doc/html/*: Regenerate.
* include/bits/basic_string.h (__cxx11::basic_string): Define new
non-reference-counted implementation in inline namespace __cxx11.
(stoi, stol, stoll, stof, stod, stold, to_string): Conditionally use
inline namespace.
(literals::string_literals::operator"): Conditionally use abi-tag.
* include/bits/basic_string.tcc (__cxx11::basic_string): Define.
* include/bits/c++config: Define _GLIBCXX_USE_DUAL_ABI and
LDBL_CXX11_ABI namespace macros.
* include/bits/locale_classes.h (locale::name()): Use abi_tag when
new ABI is in use.
(locale::_S_twinned_facets): New static member.
(locale::facet::__shim): Declare new type.
(locale::_facet::_M_sso_shim, locale::_facet::_M_cow_shim): New
functions for creating shims.
(locale::_Impl::_M_facet_unchecked): New member function for use
during construction.
(locale::_Impl::_M_init_extra): New member functions to create second
version of some facets.
(collate, collate_byname): Use abi_tag when new ABI is in use.
* include/bits/locale_facets.h: Add _GLIBCXX_NUM_CXX11_FACETS macro.
(numpunct, numpunct_byname): Use __cxx11 namespace.
(num_get::_M_extract_float, num_get::_M_extract_int): Use abi_tag
when new ABI is in use.
(num_get::__do_get, num_put::__do_put): Do not declare long double
compat functions for new ABI.
* include/bits/locale_facets.tcc (num_get, num_put): Use abi_tag on
definitions.
(numpunct, numpunct_byname): Qualify explicit instantiations.
* include/bits/locale_facets_nonio.h (time_get, time_get_byname,
moneypunct, moneypunct_byname, money_get, money_put, messages,
messages_byname): Use new inline namespace macros.
(money_get::__do_get, money_put::__do_put): Do not declare long
double compat functions for new ABI.
* include/bits/locale_facets_nonio.tcc (money_get, money_put): Use
new namespace macros.
(money_get::__do_get, money_put::__do_put): Do not define for new ABI.
* include/bits/localefwd.h (numpunct, numpunct_byname, collate,
collate_byname, time_get, time_get_byname, moneypunct,
moneypunct_byname, money_get, money_put, messages, messages_byname):
Use new namespace macros.
* include/bits/regex.h: Use inline namespace macros.
* include/bits/stl_list.h (_List_base, list): Use inline namespace
instead of abi-tag.
* include/bits/stringfwd.h (basic_string): Use namespace macros.
* include/std/iosfwd (basic_stringbuf, basic_istringstream,
basic_ostringstream, basic_stringstream): Likewise.
* include/std/sstream: Likewise.
(basic_stringbuf::__xfer_bufptrs): Update streambuf pointers on move.
* include/std/stdexcept (__cow_string, __sso_string): New types for
indirectly using std::string with either ABI.
(logic_error, runtime_error): Replace std::string member with
__cow_string when new ABI is in use. Declare non-inline copy
constructor and assignment operator. Declare const char* constructors.
(domain_error, invalid_argument, length_error, out_of_range,
range_error, overflow_error, underflow_error): Declare const char*
constructors.
* include/std/system_error (error_category): Replace with new
definition in inline namespace _V2.
(error_code::message, error_condition::message): Use abi_tag on
functions returning std::string.
* python/libstdcxx/v6/printers.py (StdStringPrinter): Handle new ABI.
* src/c++11/Makefile.am: Add new files.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc: Compile with old std::string ABI.
Define old error_category symbols.
* src/c++11/cow-fstream-inst.cc: New. Instantiate fstream members
using old std::string ABI.
* src/c++11/cow-locale_init.cc (locale::_Impl::_M_init_extra): Define.
* src/c++11/cow-shim_facets.cc: Define shim facets using old ABI.
* src/c++11/cow-sstream-inst.cc: Instantiate stringstreams using old
std::string ABI.
* src/c++11/cow-stdexcept.cc: Define new constructors and assignment
operators.
(__cow_string, error_category::_M_message): Define.
* src/c++11/cow-string-inst.cc: Explicit instantiations using old
std::string. Include src/c++98/istream-string.cc.
* src/c++11/cow-wstring-inst.cc: Explicit instantiations using old
std::wstring.
* src/c++11/cxx11-hash_tr1.cc: Explicit instantiations using new
string.
* src/c++11/cxx11-ios_failure.cc: Add sanity check.
* src/c++11/cxx11-locale-inst.cc: Instantiate facets using new
std::string.
* src/c++11/cxx11-shim_facets.cc: Define shim facets using new ABI.
* src/c++11/cxx11-stdexcept.cc: Define constructors taking new
std::string.
* src/c++11/cxx11-wlocale-inst.cc: Instantiate facets using
new std::wstring.
* src/c++11/fstream-inst.cc: Compile with new ABI.
* src/c++11/functexcept.cc: Compile with old ABI.
* src/c++11/random.cc: Compile with new ABI.
* src/c++11/sstream-inst.cc: Compile with new ABI.
* src/c++11/string-inst.cc: Explicit instantiations for new string.
* src/c++11/system_error.cc (__sso_string, error_category::_M_message):
Define.
* src/c++11/wstring-inst.cc: Compile with new ABI.
* src/c++98/Makefile.am: Compile some host files twice for old and
new std::string. Add new files.
* src/c++98/Makefile.in: Regenerate.
* src/c++98/compatibility-ldbl.cc: Compile with old ABI.
* src/c++98/compatibility.cc: Likewise.
* src/c++98/concept-inst.cc: Likewise.
* src/c++98/hash_tr1.cc: Likewise.
* src/c++98/istream-string.cc: New file defining functions that
work with istream and std::string moved from ...
* src/c++98/istream.cc: ... here.
* src/c++98/cow-istream-string.cc: Recompile istream-string.cc with
old ABI.
* src/c++98/locale-inst.cc: Adjust facet instantiations to work for
either ABI.
* src/c++98/locale.cc (locale::_M_install_facet,
locale::_M_install_cache): Handle twinned facets.
* src/c++98/locale-facets.cc: Compile with old std::string ABI.
(__verify_grouping): Define new overload and old std::string version.
* src/c++98/locale_init.cc: Initialize twinned facets.
* src/c++98/localename.cc: Likewise.
* src/c++98/misc-inst.cc: Instantiate C++98-only std::string members.
(__verify_grouping): Define new std::string version.
* src/c++98/stdexcept.cc: Compile with old std::string ABI.
* src/c++98/wlocale-inst.cc: Likewise.
* testsuite/18_support/50594.cc: Adjust to work with SSO strings.
* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
Likewise.
* testsuite/21_strings/headers/string/synopsis.cc: Use inline
namespace macros.
* testsuite/23_containers/headers/list/synopsis.cc: Likewise.
* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Set dg-options so
correct exception type can be caught.
* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/char/12297.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* testsuite/27_io/ios_base/failure/cxx11.cc: Disable for old ABI.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error.
* testsuite/libstdc++-prettyprinters/libfundts.cc: Use old ABI.
* testsuite/libstdc++-prettyprinters/simple.cc: Likewise.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
* testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.
* testsuite/util/exception/safety.h: Adjust member function types
for new std::string.
* testsuite/util/testsuite_abi.cc: Add new version and ignore
__float128 symbols in __cxx11 namespace.
From-SVN: r218964
2014-12-20 02:16:39 +08:00
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI], [
|
|
|
|
GLIBCXX_ENABLE(libstdcxx-dual-abi,$1,,[support two versions of std::string])
|
2015-03-24 00:47:18 +08:00
|
|
|
if test x$enable_symvers = xgnu-versioned-namespace; then
|
|
|
|
# gnu-versioned-namespace is incompatible with the dual ABI.
|
|
|
|
enable_libstdcxx_dual_abi="no"
|
|
|
|
fi
|
New std::string implementation.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove.
(GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI, GLIBCXX_DEFAULT_ABI): Add.
* configure.ac: Use new macros.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* include/Makefile.am: Set _GLIBCXX_USE_DUAL_ABI.
* include/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Export symbols related to new std::string.
Tighten old patterns to not match new symbols.
* config/locale/generic/monetary_members.cc: Guard some definitions
to not compile with new ABI.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Prevent double-free.
* config/os/gnu-linux/ldbl-extra.ver: Add new __gnu_cxx_ldbl128
exports. Tighten old patterns.
* doc/xml/manual/configure.xml: Document new configure options.
* doc/html/*: Regenerate.
* include/bits/basic_string.h (__cxx11::basic_string): Define new
non-reference-counted implementation in inline namespace __cxx11.
(stoi, stol, stoll, stof, stod, stold, to_string): Conditionally use
inline namespace.
(literals::string_literals::operator"): Conditionally use abi-tag.
* include/bits/basic_string.tcc (__cxx11::basic_string): Define.
* include/bits/c++config: Define _GLIBCXX_USE_DUAL_ABI and
LDBL_CXX11_ABI namespace macros.
* include/bits/locale_classes.h (locale::name()): Use abi_tag when
new ABI is in use.
(locale::_S_twinned_facets): New static member.
(locale::facet::__shim): Declare new type.
(locale::_facet::_M_sso_shim, locale::_facet::_M_cow_shim): New
functions for creating shims.
(locale::_Impl::_M_facet_unchecked): New member function for use
during construction.
(locale::_Impl::_M_init_extra): New member functions to create second
version of some facets.
(collate, collate_byname): Use abi_tag when new ABI is in use.
* include/bits/locale_facets.h: Add _GLIBCXX_NUM_CXX11_FACETS macro.
(numpunct, numpunct_byname): Use __cxx11 namespace.
(num_get::_M_extract_float, num_get::_M_extract_int): Use abi_tag
when new ABI is in use.
(num_get::__do_get, num_put::__do_put): Do not declare long double
compat functions for new ABI.
* include/bits/locale_facets.tcc (num_get, num_put): Use abi_tag on
definitions.
(numpunct, numpunct_byname): Qualify explicit instantiations.
* include/bits/locale_facets_nonio.h (time_get, time_get_byname,
moneypunct, moneypunct_byname, money_get, money_put, messages,
messages_byname): Use new inline namespace macros.
(money_get::__do_get, money_put::__do_put): Do not declare long
double compat functions for new ABI.
* include/bits/locale_facets_nonio.tcc (money_get, money_put): Use
new namespace macros.
(money_get::__do_get, money_put::__do_put): Do not define for new ABI.
* include/bits/localefwd.h (numpunct, numpunct_byname, collate,
collate_byname, time_get, time_get_byname, moneypunct,
moneypunct_byname, money_get, money_put, messages, messages_byname):
Use new namespace macros.
* include/bits/regex.h: Use inline namespace macros.
* include/bits/stl_list.h (_List_base, list): Use inline namespace
instead of abi-tag.
* include/bits/stringfwd.h (basic_string): Use namespace macros.
* include/std/iosfwd (basic_stringbuf, basic_istringstream,
basic_ostringstream, basic_stringstream): Likewise.
* include/std/sstream: Likewise.
(basic_stringbuf::__xfer_bufptrs): Update streambuf pointers on move.
* include/std/stdexcept (__cow_string, __sso_string): New types for
indirectly using std::string with either ABI.
(logic_error, runtime_error): Replace std::string member with
__cow_string when new ABI is in use. Declare non-inline copy
constructor and assignment operator. Declare const char* constructors.
(domain_error, invalid_argument, length_error, out_of_range,
range_error, overflow_error, underflow_error): Declare const char*
constructors.
* include/std/system_error (error_category): Replace with new
definition in inline namespace _V2.
(error_code::message, error_condition::message): Use abi_tag on
functions returning std::string.
* python/libstdcxx/v6/printers.py (StdStringPrinter): Handle new ABI.
* src/c++11/Makefile.am: Add new files.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc: Compile with old std::string ABI.
Define old error_category symbols.
* src/c++11/cow-fstream-inst.cc: New. Instantiate fstream members
using old std::string ABI.
* src/c++11/cow-locale_init.cc (locale::_Impl::_M_init_extra): Define.
* src/c++11/cow-shim_facets.cc: Define shim facets using old ABI.
* src/c++11/cow-sstream-inst.cc: Instantiate stringstreams using old
std::string ABI.
* src/c++11/cow-stdexcept.cc: Define new constructors and assignment
operators.
(__cow_string, error_category::_M_message): Define.
* src/c++11/cow-string-inst.cc: Explicit instantiations using old
std::string. Include src/c++98/istream-string.cc.
* src/c++11/cow-wstring-inst.cc: Explicit instantiations using old
std::wstring.
* src/c++11/cxx11-hash_tr1.cc: Explicit instantiations using new
string.
* src/c++11/cxx11-ios_failure.cc: Add sanity check.
* src/c++11/cxx11-locale-inst.cc: Instantiate facets using new
std::string.
* src/c++11/cxx11-shim_facets.cc: Define shim facets using new ABI.
* src/c++11/cxx11-stdexcept.cc: Define constructors taking new
std::string.
* src/c++11/cxx11-wlocale-inst.cc: Instantiate facets using
new std::wstring.
* src/c++11/fstream-inst.cc: Compile with new ABI.
* src/c++11/functexcept.cc: Compile with old ABI.
* src/c++11/random.cc: Compile with new ABI.
* src/c++11/sstream-inst.cc: Compile with new ABI.
* src/c++11/string-inst.cc: Explicit instantiations for new string.
* src/c++11/system_error.cc (__sso_string, error_category::_M_message):
Define.
* src/c++11/wstring-inst.cc: Compile with new ABI.
* src/c++98/Makefile.am: Compile some host files twice for old and
new std::string. Add new files.
* src/c++98/Makefile.in: Regenerate.
* src/c++98/compatibility-ldbl.cc: Compile with old ABI.
* src/c++98/compatibility.cc: Likewise.
* src/c++98/concept-inst.cc: Likewise.
* src/c++98/hash_tr1.cc: Likewise.
* src/c++98/istream-string.cc: New file defining functions that
work with istream and std::string moved from ...
* src/c++98/istream.cc: ... here.
* src/c++98/cow-istream-string.cc: Recompile istream-string.cc with
old ABI.
* src/c++98/locale-inst.cc: Adjust facet instantiations to work for
either ABI.
* src/c++98/locale.cc (locale::_M_install_facet,
locale::_M_install_cache): Handle twinned facets.
* src/c++98/locale-facets.cc: Compile with old std::string ABI.
(__verify_grouping): Define new overload and old std::string version.
* src/c++98/locale_init.cc: Initialize twinned facets.
* src/c++98/localename.cc: Likewise.
* src/c++98/misc-inst.cc: Instantiate C++98-only std::string members.
(__verify_grouping): Define new std::string version.
* src/c++98/stdexcept.cc: Compile with old std::string ABI.
* src/c++98/wlocale-inst.cc: Likewise.
* testsuite/18_support/50594.cc: Adjust to work with SSO strings.
* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
Likewise.
* testsuite/21_strings/headers/string/synopsis.cc: Use inline
namespace macros.
* testsuite/23_containers/headers/list/synopsis.cc: Likewise.
* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Set dg-options so
correct exception type can be caught.
* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/char/12297.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* testsuite/27_io/ios_base/failure/cxx11.cc: Disable for old ABI.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error.
* testsuite/libstdc++-prettyprinters/libfundts.cc: Use old ABI.
* testsuite/libstdc++-prettyprinters/simple.cc: Likewise.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
* testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.
* testsuite/util/exception/safety.h: Adjust member function types
for new std::string.
* testsuite/util/testsuite_abi.cc: Add new version and ignore
__float128 symbols in __cxx11 namespace.
From-SVN: r218964
2014-12-20 02:16:39 +08:00
|
|
|
if test x"$enable_libstdcxx_dual_abi" != xyes; then
|
|
|
|
AC_MSG_NOTICE([dual ABI is disabled])
|
2015-07-03 05:52:38 +08:00
|
|
|
default_libstdcxx_abi="gcc4-compatible"
|
re PR libstdc++/49561 ([C++0x] std::list::size complexity)
PR libstdc++/49561
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Define.
* configure.ac: Use GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI.
* configure: Regenerate.
* include/Makefile.am (stamp-cxx11-abi): New target.
(c++config.h): Set _GLIBCXX_USE_CXX11_ABI macro.
* include/Makefile.in: Regenerate.
* include/bits/c++config: Add _GLIBCXX_USE_CXX11_ABI placeholder and
define _GLIBCXX_DEFAULT_ABI_TAG.
* include/bits/list.tcc (list::emplace(const_iterator, _Args&...)):
Increment size.
(list::emplace(const_iterator, const value_type&)): Likewise.
(list::merge(list&), list::merge(list&, _StrictWeakOrdering)): Adjust
list sizes.
* include/bits/stl_list.h (_List_base, list): Add ABI tag macro.
(_List_base::_M_size): New data member in cxx11 ABI mode.
(_List_base::_S_distance(_List_node_base*, _List_node_base*)): New
function.
(_List_base::_M_get_size(), _List_base::_M_set_size(size_t),
_List_base::_M_inc_size(size_t), _List_base::_M_dec_size(size_t),
_List_base::_M_distance, _List_base::_M_node_count): New functions for
accessing list size correctly for the ABI mode.
(_List_base::_List_base(_List_base&&)): Copy size and reset source.
(_List_base::_M_init()): Initialize size member.
(list::size()): Use _List_base::_M_node_count.
(list::swap(list&)): Swap sizes.
(list::splice(iterator, list&)): Update sizes.
(list::splice(iterator, list&, iterator)): Likewise.
(list::insert(iterator, const value_type&)): Update size.
(list::insert(iterator, _Args&&...)): Likewise.
(list::_M_erase(iterator)): Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Adjust.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust.
From-SVN: r216094
2014-10-10 23:33:57 +08:00
|
|
|
fi
|
New std::string implementation.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove.
(GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI, GLIBCXX_DEFAULT_ABI): Add.
* configure.ac: Use new macros.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* include/Makefile.am: Set _GLIBCXX_USE_DUAL_ABI.
* include/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Export symbols related to new std::string.
Tighten old patterns to not match new symbols.
* config/locale/generic/monetary_members.cc: Guard some definitions
to not compile with new ABI.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Prevent double-free.
* config/os/gnu-linux/ldbl-extra.ver: Add new __gnu_cxx_ldbl128
exports. Tighten old patterns.
* doc/xml/manual/configure.xml: Document new configure options.
* doc/html/*: Regenerate.
* include/bits/basic_string.h (__cxx11::basic_string): Define new
non-reference-counted implementation in inline namespace __cxx11.
(stoi, stol, stoll, stof, stod, stold, to_string): Conditionally use
inline namespace.
(literals::string_literals::operator"): Conditionally use abi-tag.
* include/bits/basic_string.tcc (__cxx11::basic_string): Define.
* include/bits/c++config: Define _GLIBCXX_USE_DUAL_ABI and
LDBL_CXX11_ABI namespace macros.
* include/bits/locale_classes.h (locale::name()): Use abi_tag when
new ABI is in use.
(locale::_S_twinned_facets): New static member.
(locale::facet::__shim): Declare new type.
(locale::_facet::_M_sso_shim, locale::_facet::_M_cow_shim): New
functions for creating shims.
(locale::_Impl::_M_facet_unchecked): New member function for use
during construction.
(locale::_Impl::_M_init_extra): New member functions to create second
version of some facets.
(collate, collate_byname): Use abi_tag when new ABI is in use.
* include/bits/locale_facets.h: Add _GLIBCXX_NUM_CXX11_FACETS macro.
(numpunct, numpunct_byname): Use __cxx11 namespace.
(num_get::_M_extract_float, num_get::_M_extract_int): Use abi_tag
when new ABI is in use.
(num_get::__do_get, num_put::__do_put): Do not declare long double
compat functions for new ABI.
* include/bits/locale_facets.tcc (num_get, num_put): Use abi_tag on
definitions.
(numpunct, numpunct_byname): Qualify explicit instantiations.
* include/bits/locale_facets_nonio.h (time_get, time_get_byname,
moneypunct, moneypunct_byname, money_get, money_put, messages,
messages_byname): Use new inline namespace macros.
(money_get::__do_get, money_put::__do_put): Do not declare long
double compat functions for new ABI.
* include/bits/locale_facets_nonio.tcc (money_get, money_put): Use
new namespace macros.
(money_get::__do_get, money_put::__do_put): Do not define for new ABI.
* include/bits/localefwd.h (numpunct, numpunct_byname, collate,
collate_byname, time_get, time_get_byname, moneypunct,
moneypunct_byname, money_get, money_put, messages, messages_byname):
Use new namespace macros.
* include/bits/regex.h: Use inline namespace macros.
* include/bits/stl_list.h (_List_base, list): Use inline namespace
instead of abi-tag.
* include/bits/stringfwd.h (basic_string): Use namespace macros.
* include/std/iosfwd (basic_stringbuf, basic_istringstream,
basic_ostringstream, basic_stringstream): Likewise.
* include/std/sstream: Likewise.
(basic_stringbuf::__xfer_bufptrs): Update streambuf pointers on move.
* include/std/stdexcept (__cow_string, __sso_string): New types for
indirectly using std::string with either ABI.
(logic_error, runtime_error): Replace std::string member with
__cow_string when new ABI is in use. Declare non-inline copy
constructor and assignment operator. Declare const char* constructors.
(domain_error, invalid_argument, length_error, out_of_range,
range_error, overflow_error, underflow_error): Declare const char*
constructors.
* include/std/system_error (error_category): Replace with new
definition in inline namespace _V2.
(error_code::message, error_condition::message): Use abi_tag on
functions returning std::string.
* python/libstdcxx/v6/printers.py (StdStringPrinter): Handle new ABI.
* src/c++11/Makefile.am: Add new files.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc: Compile with old std::string ABI.
Define old error_category symbols.
* src/c++11/cow-fstream-inst.cc: New. Instantiate fstream members
using old std::string ABI.
* src/c++11/cow-locale_init.cc (locale::_Impl::_M_init_extra): Define.
* src/c++11/cow-shim_facets.cc: Define shim facets using old ABI.
* src/c++11/cow-sstream-inst.cc: Instantiate stringstreams using old
std::string ABI.
* src/c++11/cow-stdexcept.cc: Define new constructors and assignment
operators.
(__cow_string, error_category::_M_message): Define.
* src/c++11/cow-string-inst.cc: Explicit instantiations using old
std::string. Include src/c++98/istream-string.cc.
* src/c++11/cow-wstring-inst.cc: Explicit instantiations using old
std::wstring.
* src/c++11/cxx11-hash_tr1.cc: Explicit instantiations using new
string.
* src/c++11/cxx11-ios_failure.cc: Add sanity check.
* src/c++11/cxx11-locale-inst.cc: Instantiate facets using new
std::string.
* src/c++11/cxx11-shim_facets.cc: Define shim facets using new ABI.
* src/c++11/cxx11-stdexcept.cc: Define constructors taking new
std::string.
* src/c++11/cxx11-wlocale-inst.cc: Instantiate facets using
new std::wstring.
* src/c++11/fstream-inst.cc: Compile with new ABI.
* src/c++11/functexcept.cc: Compile with old ABI.
* src/c++11/random.cc: Compile with new ABI.
* src/c++11/sstream-inst.cc: Compile with new ABI.
* src/c++11/string-inst.cc: Explicit instantiations for new string.
* src/c++11/system_error.cc (__sso_string, error_category::_M_message):
Define.
* src/c++11/wstring-inst.cc: Compile with new ABI.
* src/c++98/Makefile.am: Compile some host files twice for old and
new std::string. Add new files.
* src/c++98/Makefile.in: Regenerate.
* src/c++98/compatibility-ldbl.cc: Compile with old ABI.
* src/c++98/compatibility.cc: Likewise.
* src/c++98/concept-inst.cc: Likewise.
* src/c++98/hash_tr1.cc: Likewise.
* src/c++98/istream-string.cc: New file defining functions that
work with istream and std::string moved from ...
* src/c++98/istream.cc: ... here.
* src/c++98/cow-istream-string.cc: Recompile istream-string.cc with
old ABI.
* src/c++98/locale-inst.cc: Adjust facet instantiations to work for
either ABI.
* src/c++98/locale.cc (locale::_M_install_facet,
locale::_M_install_cache): Handle twinned facets.
* src/c++98/locale-facets.cc: Compile with old std::string ABI.
(__verify_grouping): Define new overload and old std::string version.
* src/c++98/locale_init.cc: Initialize twinned facets.
* src/c++98/localename.cc: Likewise.
* src/c++98/misc-inst.cc: Instantiate C++98-only std::string members.
(__verify_grouping): Define new std::string version.
* src/c++98/stdexcept.cc: Compile with old std::string ABI.
* src/c++98/wlocale-inst.cc: Likewise.
* testsuite/18_support/50594.cc: Adjust to work with SSO strings.
* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
Likewise.
* testsuite/21_strings/headers/string/synopsis.cc: Use inline
namespace macros.
* testsuite/23_containers/headers/list/synopsis.cc: Likewise.
* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Set dg-options so
correct exception type can be caught.
* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/char/12297.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* testsuite/27_io/ios_base/failure/cxx11.cc: Disable for old ABI.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error.
* testsuite/libstdc++-prettyprinters/libfundts.cc: Use old ABI.
* testsuite/libstdc++-prettyprinters/simple.cc: Likewise.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
* testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.
* testsuite/util/exception/safety.h: Adjust member function types
for new std::string.
* testsuite/util/testsuite_abi.cc: Add new version and ignore
__float128 symbols in __cxx11 namespace.
From-SVN: r218964
2014-12-20 02:16:39 +08:00
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_DUAL_ABI, test $enable_libstdcxx_dual_abi = yes)
|
re PR libstdc++/49561 ([C++0x] std::list::size complexity)
PR libstdc++/49561
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Define.
* configure.ac: Use GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI.
* configure: Regenerate.
* include/Makefile.am (stamp-cxx11-abi): New target.
(c++config.h): Set _GLIBCXX_USE_CXX11_ABI macro.
* include/Makefile.in: Regenerate.
* include/bits/c++config: Add _GLIBCXX_USE_CXX11_ABI placeholder and
define _GLIBCXX_DEFAULT_ABI_TAG.
* include/bits/list.tcc (list::emplace(const_iterator, _Args&...)):
Increment size.
(list::emplace(const_iterator, const value_type&)): Likewise.
(list::merge(list&), list::merge(list&, _StrictWeakOrdering)): Adjust
list sizes.
* include/bits/stl_list.h (_List_base, list): Add ABI tag macro.
(_List_base::_M_size): New data member in cxx11 ABI mode.
(_List_base::_S_distance(_List_node_base*, _List_node_base*)): New
function.
(_List_base::_M_get_size(), _List_base::_M_set_size(size_t),
_List_base::_M_inc_size(size_t), _List_base::_M_dec_size(size_t),
_List_base::_M_distance, _List_base::_M_node_count): New functions for
accessing list size correctly for the ABI mode.
(_List_base::_List_base(_List_base&&)): Copy size and reset source.
(_List_base::_M_init()): Initialize size member.
(list::size()): Use _List_base::_M_node_count.
(list::swap(list&)): Swap sizes.
(list::splice(iterator, list&)): Update sizes.
(list::splice(iterator, list&, iterator)): Likewise.
(list::insert(iterator, const value_type&)): Update size.
(list::insert(iterator, _Args&&...)): Likewise.
(list::_M_erase(iterator)): Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc:
Adjust.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Adjust.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust.
From-SVN: r216094
2014-10-10 23:33:57 +08:00
|
|
|
])
|
|
|
|
|
New std::string implementation.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove.
(GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI, GLIBCXX_DEFAULT_ABI): Add.
* configure.ac: Use new macros.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* include/Makefile.am: Set _GLIBCXX_USE_DUAL_ABI.
* include/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Export symbols related to new std::string.
Tighten old patterns to not match new symbols.
* config/locale/generic/monetary_members.cc: Guard some definitions
to not compile with new ABI.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Prevent double-free.
* config/os/gnu-linux/ldbl-extra.ver: Add new __gnu_cxx_ldbl128
exports. Tighten old patterns.
* doc/xml/manual/configure.xml: Document new configure options.
* doc/html/*: Regenerate.
* include/bits/basic_string.h (__cxx11::basic_string): Define new
non-reference-counted implementation in inline namespace __cxx11.
(stoi, stol, stoll, stof, stod, stold, to_string): Conditionally use
inline namespace.
(literals::string_literals::operator"): Conditionally use abi-tag.
* include/bits/basic_string.tcc (__cxx11::basic_string): Define.
* include/bits/c++config: Define _GLIBCXX_USE_DUAL_ABI and
LDBL_CXX11_ABI namespace macros.
* include/bits/locale_classes.h (locale::name()): Use abi_tag when
new ABI is in use.
(locale::_S_twinned_facets): New static member.
(locale::facet::__shim): Declare new type.
(locale::_facet::_M_sso_shim, locale::_facet::_M_cow_shim): New
functions for creating shims.
(locale::_Impl::_M_facet_unchecked): New member function for use
during construction.
(locale::_Impl::_M_init_extra): New member functions to create second
version of some facets.
(collate, collate_byname): Use abi_tag when new ABI is in use.
* include/bits/locale_facets.h: Add _GLIBCXX_NUM_CXX11_FACETS macro.
(numpunct, numpunct_byname): Use __cxx11 namespace.
(num_get::_M_extract_float, num_get::_M_extract_int): Use abi_tag
when new ABI is in use.
(num_get::__do_get, num_put::__do_put): Do not declare long double
compat functions for new ABI.
* include/bits/locale_facets.tcc (num_get, num_put): Use abi_tag on
definitions.
(numpunct, numpunct_byname): Qualify explicit instantiations.
* include/bits/locale_facets_nonio.h (time_get, time_get_byname,
moneypunct, moneypunct_byname, money_get, money_put, messages,
messages_byname): Use new inline namespace macros.
(money_get::__do_get, money_put::__do_put): Do not declare long
double compat functions for new ABI.
* include/bits/locale_facets_nonio.tcc (money_get, money_put): Use
new namespace macros.
(money_get::__do_get, money_put::__do_put): Do not define for new ABI.
* include/bits/localefwd.h (numpunct, numpunct_byname, collate,
collate_byname, time_get, time_get_byname, moneypunct,
moneypunct_byname, money_get, money_put, messages, messages_byname):
Use new namespace macros.
* include/bits/regex.h: Use inline namespace macros.
* include/bits/stl_list.h (_List_base, list): Use inline namespace
instead of abi-tag.
* include/bits/stringfwd.h (basic_string): Use namespace macros.
* include/std/iosfwd (basic_stringbuf, basic_istringstream,
basic_ostringstream, basic_stringstream): Likewise.
* include/std/sstream: Likewise.
(basic_stringbuf::__xfer_bufptrs): Update streambuf pointers on move.
* include/std/stdexcept (__cow_string, __sso_string): New types for
indirectly using std::string with either ABI.
(logic_error, runtime_error): Replace std::string member with
__cow_string when new ABI is in use. Declare non-inline copy
constructor and assignment operator. Declare const char* constructors.
(domain_error, invalid_argument, length_error, out_of_range,
range_error, overflow_error, underflow_error): Declare const char*
constructors.
* include/std/system_error (error_category): Replace with new
definition in inline namespace _V2.
(error_code::message, error_condition::message): Use abi_tag on
functions returning std::string.
* python/libstdcxx/v6/printers.py (StdStringPrinter): Handle new ABI.
* src/c++11/Makefile.am: Add new files.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc: Compile with old std::string ABI.
Define old error_category symbols.
* src/c++11/cow-fstream-inst.cc: New. Instantiate fstream members
using old std::string ABI.
* src/c++11/cow-locale_init.cc (locale::_Impl::_M_init_extra): Define.
* src/c++11/cow-shim_facets.cc: Define shim facets using old ABI.
* src/c++11/cow-sstream-inst.cc: Instantiate stringstreams using old
std::string ABI.
* src/c++11/cow-stdexcept.cc: Define new constructors and assignment
operators.
(__cow_string, error_category::_M_message): Define.
* src/c++11/cow-string-inst.cc: Explicit instantiations using old
std::string. Include src/c++98/istream-string.cc.
* src/c++11/cow-wstring-inst.cc: Explicit instantiations using old
std::wstring.
* src/c++11/cxx11-hash_tr1.cc: Explicit instantiations using new
string.
* src/c++11/cxx11-ios_failure.cc: Add sanity check.
* src/c++11/cxx11-locale-inst.cc: Instantiate facets using new
std::string.
* src/c++11/cxx11-shim_facets.cc: Define shim facets using new ABI.
* src/c++11/cxx11-stdexcept.cc: Define constructors taking new
std::string.
* src/c++11/cxx11-wlocale-inst.cc: Instantiate facets using
new std::wstring.
* src/c++11/fstream-inst.cc: Compile with new ABI.
* src/c++11/functexcept.cc: Compile with old ABI.
* src/c++11/random.cc: Compile with new ABI.
* src/c++11/sstream-inst.cc: Compile with new ABI.
* src/c++11/string-inst.cc: Explicit instantiations for new string.
* src/c++11/system_error.cc (__sso_string, error_category::_M_message):
Define.
* src/c++11/wstring-inst.cc: Compile with new ABI.
* src/c++98/Makefile.am: Compile some host files twice for old and
new std::string. Add new files.
* src/c++98/Makefile.in: Regenerate.
* src/c++98/compatibility-ldbl.cc: Compile with old ABI.
* src/c++98/compatibility.cc: Likewise.
* src/c++98/concept-inst.cc: Likewise.
* src/c++98/hash_tr1.cc: Likewise.
* src/c++98/istream-string.cc: New file defining functions that
work with istream and std::string moved from ...
* src/c++98/istream.cc: ... here.
* src/c++98/cow-istream-string.cc: Recompile istream-string.cc with
old ABI.
* src/c++98/locale-inst.cc: Adjust facet instantiations to work for
either ABI.
* src/c++98/locale.cc (locale::_M_install_facet,
locale::_M_install_cache): Handle twinned facets.
* src/c++98/locale-facets.cc: Compile with old std::string ABI.
(__verify_grouping): Define new overload and old std::string version.
* src/c++98/locale_init.cc: Initialize twinned facets.
* src/c++98/localename.cc: Likewise.
* src/c++98/misc-inst.cc: Instantiate C++98-only std::string members.
(__verify_grouping): Define new std::string version.
* src/c++98/stdexcept.cc: Compile with old std::string ABI.
* src/c++98/wlocale-inst.cc: Likewise.
* testsuite/18_support/50594.cc: Adjust to work with SSO strings.
* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
Likewise.
* testsuite/21_strings/headers/string/synopsis.cc: Use inline
namespace macros.
* testsuite/23_containers/headers/list/synopsis.cc: Likewise.
* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Set dg-options so
correct exception type can be caught.
* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/char/12297.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* testsuite/27_io/ios_base/failure/cxx11.cc: Disable for old ABI.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error.
* testsuite/libstdc++-prettyprinters/libfundts.cc: Use old ABI.
* testsuite/libstdc++-prettyprinters/simple.cc: Likewise.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
* testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.
* testsuite/util/exception/safety.h: Adjust member function types
for new std::string.
* testsuite/util/testsuite_abi.cc: Add new version and ignore
__float128 symbols in __cxx11 namespace.
From-SVN: r218964
2014-12-20 02:16:39 +08:00
|
|
|
dnl
|
|
|
|
dnl Check to see which ABI should be enabled by default.
|
|
|
|
dnl
|
2015-07-03 05:52:38 +08:00
|
|
|
dnl --with-default-libstdcxx-abi={gcc4-compatible,new}
|
New std::string implementation.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove.
(GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI, GLIBCXX_DEFAULT_ABI): Add.
* configure.ac: Use new macros.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* include/Makefile.am: Set _GLIBCXX_USE_DUAL_ABI.
* include/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Export symbols related to new std::string.
Tighten old patterns to not match new symbols.
* config/locale/generic/monetary_members.cc: Guard some definitions
to not compile with new ABI.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Prevent double-free.
* config/os/gnu-linux/ldbl-extra.ver: Add new __gnu_cxx_ldbl128
exports. Tighten old patterns.
* doc/xml/manual/configure.xml: Document new configure options.
* doc/html/*: Regenerate.
* include/bits/basic_string.h (__cxx11::basic_string): Define new
non-reference-counted implementation in inline namespace __cxx11.
(stoi, stol, stoll, stof, stod, stold, to_string): Conditionally use
inline namespace.
(literals::string_literals::operator"): Conditionally use abi-tag.
* include/bits/basic_string.tcc (__cxx11::basic_string): Define.
* include/bits/c++config: Define _GLIBCXX_USE_DUAL_ABI and
LDBL_CXX11_ABI namespace macros.
* include/bits/locale_classes.h (locale::name()): Use abi_tag when
new ABI is in use.
(locale::_S_twinned_facets): New static member.
(locale::facet::__shim): Declare new type.
(locale::_facet::_M_sso_shim, locale::_facet::_M_cow_shim): New
functions for creating shims.
(locale::_Impl::_M_facet_unchecked): New member function for use
during construction.
(locale::_Impl::_M_init_extra): New member functions to create second
version of some facets.
(collate, collate_byname): Use abi_tag when new ABI is in use.
* include/bits/locale_facets.h: Add _GLIBCXX_NUM_CXX11_FACETS macro.
(numpunct, numpunct_byname): Use __cxx11 namespace.
(num_get::_M_extract_float, num_get::_M_extract_int): Use abi_tag
when new ABI is in use.
(num_get::__do_get, num_put::__do_put): Do not declare long double
compat functions for new ABI.
* include/bits/locale_facets.tcc (num_get, num_put): Use abi_tag on
definitions.
(numpunct, numpunct_byname): Qualify explicit instantiations.
* include/bits/locale_facets_nonio.h (time_get, time_get_byname,
moneypunct, moneypunct_byname, money_get, money_put, messages,
messages_byname): Use new inline namespace macros.
(money_get::__do_get, money_put::__do_put): Do not declare long
double compat functions for new ABI.
* include/bits/locale_facets_nonio.tcc (money_get, money_put): Use
new namespace macros.
(money_get::__do_get, money_put::__do_put): Do not define for new ABI.
* include/bits/localefwd.h (numpunct, numpunct_byname, collate,
collate_byname, time_get, time_get_byname, moneypunct,
moneypunct_byname, money_get, money_put, messages, messages_byname):
Use new namespace macros.
* include/bits/regex.h: Use inline namespace macros.
* include/bits/stl_list.h (_List_base, list): Use inline namespace
instead of abi-tag.
* include/bits/stringfwd.h (basic_string): Use namespace macros.
* include/std/iosfwd (basic_stringbuf, basic_istringstream,
basic_ostringstream, basic_stringstream): Likewise.
* include/std/sstream: Likewise.
(basic_stringbuf::__xfer_bufptrs): Update streambuf pointers on move.
* include/std/stdexcept (__cow_string, __sso_string): New types for
indirectly using std::string with either ABI.
(logic_error, runtime_error): Replace std::string member with
__cow_string when new ABI is in use. Declare non-inline copy
constructor and assignment operator. Declare const char* constructors.
(domain_error, invalid_argument, length_error, out_of_range,
range_error, overflow_error, underflow_error): Declare const char*
constructors.
* include/std/system_error (error_category): Replace with new
definition in inline namespace _V2.
(error_code::message, error_condition::message): Use abi_tag on
functions returning std::string.
* python/libstdcxx/v6/printers.py (StdStringPrinter): Handle new ABI.
* src/c++11/Makefile.am: Add new files.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc: Compile with old std::string ABI.
Define old error_category symbols.
* src/c++11/cow-fstream-inst.cc: New. Instantiate fstream members
using old std::string ABI.
* src/c++11/cow-locale_init.cc (locale::_Impl::_M_init_extra): Define.
* src/c++11/cow-shim_facets.cc: Define shim facets using old ABI.
* src/c++11/cow-sstream-inst.cc: Instantiate stringstreams using old
std::string ABI.
* src/c++11/cow-stdexcept.cc: Define new constructors and assignment
operators.
(__cow_string, error_category::_M_message): Define.
* src/c++11/cow-string-inst.cc: Explicit instantiations using old
std::string. Include src/c++98/istream-string.cc.
* src/c++11/cow-wstring-inst.cc: Explicit instantiations using old
std::wstring.
* src/c++11/cxx11-hash_tr1.cc: Explicit instantiations using new
string.
* src/c++11/cxx11-ios_failure.cc: Add sanity check.
* src/c++11/cxx11-locale-inst.cc: Instantiate facets using new
std::string.
* src/c++11/cxx11-shim_facets.cc: Define shim facets using new ABI.
* src/c++11/cxx11-stdexcept.cc: Define constructors taking new
std::string.
* src/c++11/cxx11-wlocale-inst.cc: Instantiate facets using
new std::wstring.
* src/c++11/fstream-inst.cc: Compile with new ABI.
* src/c++11/functexcept.cc: Compile with old ABI.
* src/c++11/random.cc: Compile with new ABI.
* src/c++11/sstream-inst.cc: Compile with new ABI.
* src/c++11/string-inst.cc: Explicit instantiations for new string.
* src/c++11/system_error.cc (__sso_string, error_category::_M_message):
Define.
* src/c++11/wstring-inst.cc: Compile with new ABI.
* src/c++98/Makefile.am: Compile some host files twice for old and
new std::string. Add new files.
* src/c++98/Makefile.in: Regenerate.
* src/c++98/compatibility-ldbl.cc: Compile with old ABI.
* src/c++98/compatibility.cc: Likewise.
* src/c++98/concept-inst.cc: Likewise.
* src/c++98/hash_tr1.cc: Likewise.
* src/c++98/istream-string.cc: New file defining functions that
work with istream and std::string moved from ...
* src/c++98/istream.cc: ... here.
* src/c++98/cow-istream-string.cc: Recompile istream-string.cc with
old ABI.
* src/c++98/locale-inst.cc: Adjust facet instantiations to work for
either ABI.
* src/c++98/locale.cc (locale::_M_install_facet,
locale::_M_install_cache): Handle twinned facets.
* src/c++98/locale-facets.cc: Compile with old std::string ABI.
(__verify_grouping): Define new overload and old std::string version.
* src/c++98/locale_init.cc: Initialize twinned facets.
* src/c++98/localename.cc: Likewise.
* src/c++98/misc-inst.cc: Instantiate C++98-only std::string members.
(__verify_grouping): Define new std::string version.
* src/c++98/stdexcept.cc: Compile with old std::string ABI.
* src/c++98/wlocale-inst.cc: Likewise.
* testsuite/18_support/50594.cc: Adjust to work with SSO strings.
* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
Likewise.
* testsuite/21_strings/headers/string/synopsis.cc: Use inline
namespace macros.
* testsuite/23_containers/headers/list/synopsis.cc: Likewise.
* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Set dg-options so
correct exception type can be caught.
* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/char/12297.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* testsuite/27_io/ios_base/failure/cxx11.cc: Disable for old ABI.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error.
* testsuite/libstdc++-prettyprinters/libfundts.cc: Use old ABI.
* testsuite/libstdc++-prettyprinters/simple.cc: Likewise.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
* testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.
* testsuite/util/exception/safety.h: Adjust member function types
for new std::string.
* testsuite/util/testsuite_abi.cc: Add new version and ignore
__float128 symbols in __cxx11 namespace.
From-SVN: r218964
2014-12-20 02:16:39 +08:00
|
|
|
dnl
|
|
|
|
dnl Defines:
|
|
|
|
dnl _GLIBCXX_USE_CXX11_ABI (always defined, either to 1 or 0)
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_DEFAULT_ABI], [
|
|
|
|
if test x$enable_libstdcxx_dual_abi = xyes; then
|
|
|
|
AC_MSG_CHECKING([for default std::string ABI to use])
|
|
|
|
AC_ARG_WITH([default-libstdcxx-abi],
|
|
|
|
AS_HELP_STRING([--with-default-libstdcxx-abi],
|
|
|
|
[set the std::string ABI to use by default]),
|
|
|
|
[case "$withval" in
|
2015-07-03 05:52:38 +08:00
|
|
|
gcc4-compatible) default_libstdcxx_abi="gcc4-compatible" ;;
|
|
|
|
new|cxx11) default_libstdcxx_abi="new" ;;
|
|
|
|
c++*|gnu++*) AC_MSG_ERROR([Supported arguments for --with-default-libstdcxx-abi have changed, use "new" or "gcc4-compatible"]) ;;
|
|
|
|
*) AC_MSG_ERROR([Invalid argument for --with-default-libstdcxx-abi]) ;;
|
|
|
|
esac
|
|
|
|
],
|
|
|
|
[default_libstdcxx_abi="new"])
|
New std::string implementation.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove.
(GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI, GLIBCXX_DEFAULT_ABI): Add.
* configure.ac: Use new macros.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* include/Makefile.am: Set _GLIBCXX_USE_DUAL_ABI.
* include/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Export symbols related to new std::string.
Tighten old patterns to not match new symbols.
* config/locale/generic/monetary_members.cc: Guard some definitions
to not compile with new ABI.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Prevent double-free.
* config/os/gnu-linux/ldbl-extra.ver: Add new __gnu_cxx_ldbl128
exports. Tighten old patterns.
* doc/xml/manual/configure.xml: Document new configure options.
* doc/html/*: Regenerate.
* include/bits/basic_string.h (__cxx11::basic_string): Define new
non-reference-counted implementation in inline namespace __cxx11.
(stoi, stol, stoll, stof, stod, stold, to_string): Conditionally use
inline namespace.
(literals::string_literals::operator"): Conditionally use abi-tag.
* include/bits/basic_string.tcc (__cxx11::basic_string): Define.
* include/bits/c++config: Define _GLIBCXX_USE_DUAL_ABI and
LDBL_CXX11_ABI namespace macros.
* include/bits/locale_classes.h (locale::name()): Use abi_tag when
new ABI is in use.
(locale::_S_twinned_facets): New static member.
(locale::facet::__shim): Declare new type.
(locale::_facet::_M_sso_shim, locale::_facet::_M_cow_shim): New
functions for creating shims.
(locale::_Impl::_M_facet_unchecked): New member function for use
during construction.
(locale::_Impl::_M_init_extra): New member functions to create second
version of some facets.
(collate, collate_byname): Use abi_tag when new ABI is in use.
* include/bits/locale_facets.h: Add _GLIBCXX_NUM_CXX11_FACETS macro.
(numpunct, numpunct_byname): Use __cxx11 namespace.
(num_get::_M_extract_float, num_get::_M_extract_int): Use abi_tag
when new ABI is in use.
(num_get::__do_get, num_put::__do_put): Do not declare long double
compat functions for new ABI.
* include/bits/locale_facets.tcc (num_get, num_put): Use abi_tag on
definitions.
(numpunct, numpunct_byname): Qualify explicit instantiations.
* include/bits/locale_facets_nonio.h (time_get, time_get_byname,
moneypunct, moneypunct_byname, money_get, money_put, messages,
messages_byname): Use new inline namespace macros.
(money_get::__do_get, money_put::__do_put): Do not declare long
double compat functions for new ABI.
* include/bits/locale_facets_nonio.tcc (money_get, money_put): Use
new namespace macros.
(money_get::__do_get, money_put::__do_put): Do not define for new ABI.
* include/bits/localefwd.h (numpunct, numpunct_byname, collate,
collate_byname, time_get, time_get_byname, moneypunct,
moneypunct_byname, money_get, money_put, messages, messages_byname):
Use new namespace macros.
* include/bits/regex.h: Use inline namespace macros.
* include/bits/stl_list.h (_List_base, list): Use inline namespace
instead of abi-tag.
* include/bits/stringfwd.h (basic_string): Use namespace macros.
* include/std/iosfwd (basic_stringbuf, basic_istringstream,
basic_ostringstream, basic_stringstream): Likewise.
* include/std/sstream: Likewise.
(basic_stringbuf::__xfer_bufptrs): Update streambuf pointers on move.
* include/std/stdexcept (__cow_string, __sso_string): New types for
indirectly using std::string with either ABI.
(logic_error, runtime_error): Replace std::string member with
__cow_string when new ABI is in use. Declare non-inline copy
constructor and assignment operator. Declare const char* constructors.
(domain_error, invalid_argument, length_error, out_of_range,
range_error, overflow_error, underflow_error): Declare const char*
constructors.
* include/std/system_error (error_category): Replace with new
definition in inline namespace _V2.
(error_code::message, error_condition::message): Use abi_tag on
functions returning std::string.
* python/libstdcxx/v6/printers.py (StdStringPrinter): Handle new ABI.
* src/c++11/Makefile.am: Add new files.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc: Compile with old std::string ABI.
Define old error_category symbols.
* src/c++11/cow-fstream-inst.cc: New. Instantiate fstream members
using old std::string ABI.
* src/c++11/cow-locale_init.cc (locale::_Impl::_M_init_extra): Define.
* src/c++11/cow-shim_facets.cc: Define shim facets using old ABI.
* src/c++11/cow-sstream-inst.cc: Instantiate stringstreams using old
std::string ABI.
* src/c++11/cow-stdexcept.cc: Define new constructors and assignment
operators.
(__cow_string, error_category::_M_message): Define.
* src/c++11/cow-string-inst.cc: Explicit instantiations using old
std::string. Include src/c++98/istream-string.cc.
* src/c++11/cow-wstring-inst.cc: Explicit instantiations using old
std::wstring.
* src/c++11/cxx11-hash_tr1.cc: Explicit instantiations using new
string.
* src/c++11/cxx11-ios_failure.cc: Add sanity check.
* src/c++11/cxx11-locale-inst.cc: Instantiate facets using new
std::string.
* src/c++11/cxx11-shim_facets.cc: Define shim facets using new ABI.
* src/c++11/cxx11-stdexcept.cc: Define constructors taking new
std::string.
* src/c++11/cxx11-wlocale-inst.cc: Instantiate facets using
new std::wstring.
* src/c++11/fstream-inst.cc: Compile with new ABI.
* src/c++11/functexcept.cc: Compile with old ABI.
* src/c++11/random.cc: Compile with new ABI.
* src/c++11/sstream-inst.cc: Compile with new ABI.
* src/c++11/string-inst.cc: Explicit instantiations for new string.
* src/c++11/system_error.cc (__sso_string, error_category::_M_message):
Define.
* src/c++11/wstring-inst.cc: Compile with new ABI.
* src/c++98/Makefile.am: Compile some host files twice for old and
new std::string. Add new files.
* src/c++98/Makefile.in: Regenerate.
* src/c++98/compatibility-ldbl.cc: Compile with old ABI.
* src/c++98/compatibility.cc: Likewise.
* src/c++98/concept-inst.cc: Likewise.
* src/c++98/hash_tr1.cc: Likewise.
* src/c++98/istream-string.cc: New file defining functions that
work with istream and std::string moved from ...
* src/c++98/istream.cc: ... here.
* src/c++98/cow-istream-string.cc: Recompile istream-string.cc with
old ABI.
* src/c++98/locale-inst.cc: Adjust facet instantiations to work for
either ABI.
* src/c++98/locale.cc (locale::_M_install_facet,
locale::_M_install_cache): Handle twinned facets.
* src/c++98/locale-facets.cc: Compile with old std::string ABI.
(__verify_grouping): Define new overload and old std::string version.
* src/c++98/locale_init.cc: Initialize twinned facets.
* src/c++98/localename.cc: Likewise.
* src/c++98/misc-inst.cc: Instantiate C++98-only std::string members.
(__verify_grouping): Define new std::string version.
* src/c++98/stdexcept.cc: Compile with old std::string ABI.
* src/c++98/wlocale-inst.cc: Likewise.
* testsuite/18_support/50594.cc: Adjust to work with SSO strings.
* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
Likewise.
* testsuite/21_strings/headers/string/synopsis.cc: Use inline
namespace macros.
* testsuite/23_containers/headers/list/synopsis.cc: Likewise.
* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Set dg-options so
correct exception type can be caught.
* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/char/12297.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* testsuite/27_io/ios_base/failure/cxx11.cc: Disable for old ABI.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error.
* testsuite/libstdc++-prettyprinters/libfundts.cc: Use old ABI.
* testsuite/libstdc++-prettyprinters/simple.cc: Likewise.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
* testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.
* testsuite/util/exception/safety.h: Adjust member function types
for new std::string.
* testsuite/util/testsuite_abi.cc: Add new version and ignore
__float128 symbols in __cxx11 namespace.
From-SVN: r218964
2014-12-20 02:16:39 +08:00
|
|
|
AC_MSG_RESULT(${default_libstdcxx_abi})
|
|
|
|
fi
|
2015-07-03 05:52:38 +08:00
|
|
|
if test $default_libstdcxx_abi = "new"; then
|
New std::string implementation.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove.
(GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI, GLIBCXX_DEFAULT_ABI): Add.
* configure.ac: Use new macros.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* include/Makefile.am: Set _GLIBCXX_USE_DUAL_ABI.
* include/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Export symbols related to new std::string.
Tighten old patterns to not match new symbols.
* config/locale/generic/monetary_members.cc: Guard some definitions
to not compile with new ABI.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Prevent double-free.
* config/os/gnu-linux/ldbl-extra.ver: Add new __gnu_cxx_ldbl128
exports. Tighten old patterns.
* doc/xml/manual/configure.xml: Document new configure options.
* doc/html/*: Regenerate.
* include/bits/basic_string.h (__cxx11::basic_string): Define new
non-reference-counted implementation in inline namespace __cxx11.
(stoi, stol, stoll, stof, stod, stold, to_string): Conditionally use
inline namespace.
(literals::string_literals::operator"): Conditionally use abi-tag.
* include/bits/basic_string.tcc (__cxx11::basic_string): Define.
* include/bits/c++config: Define _GLIBCXX_USE_DUAL_ABI and
LDBL_CXX11_ABI namespace macros.
* include/bits/locale_classes.h (locale::name()): Use abi_tag when
new ABI is in use.
(locale::_S_twinned_facets): New static member.
(locale::facet::__shim): Declare new type.
(locale::_facet::_M_sso_shim, locale::_facet::_M_cow_shim): New
functions for creating shims.
(locale::_Impl::_M_facet_unchecked): New member function for use
during construction.
(locale::_Impl::_M_init_extra): New member functions to create second
version of some facets.
(collate, collate_byname): Use abi_tag when new ABI is in use.
* include/bits/locale_facets.h: Add _GLIBCXX_NUM_CXX11_FACETS macro.
(numpunct, numpunct_byname): Use __cxx11 namespace.
(num_get::_M_extract_float, num_get::_M_extract_int): Use abi_tag
when new ABI is in use.
(num_get::__do_get, num_put::__do_put): Do not declare long double
compat functions for new ABI.
* include/bits/locale_facets.tcc (num_get, num_put): Use abi_tag on
definitions.
(numpunct, numpunct_byname): Qualify explicit instantiations.
* include/bits/locale_facets_nonio.h (time_get, time_get_byname,
moneypunct, moneypunct_byname, money_get, money_put, messages,
messages_byname): Use new inline namespace macros.
(money_get::__do_get, money_put::__do_put): Do not declare long
double compat functions for new ABI.
* include/bits/locale_facets_nonio.tcc (money_get, money_put): Use
new namespace macros.
(money_get::__do_get, money_put::__do_put): Do not define for new ABI.
* include/bits/localefwd.h (numpunct, numpunct_byname, collate,
collate_byname, time_get, time_get_byname, moneypunct,
moneypunct_byname, money_get, money_put, messages, messages_byname):
Use new namespace macros.
* include/bits/regex.h: Use inline namespace macros.
* include/bits/stl_list.h (_List_base, list): Use inline namespace
instead of abi-tag.
* include/bits/stringfwd.h (basic_string): Use namespace macros.
* include/std/iosfwd (basic_stringbuf, basic_istringstream,
basic_ostringstream, basic_stringstream): Likewise.
* include/std/sstream: Likewise.
(basic_stringbuf::__xfer_bufptrs): Update streambuf pointers on move.
* include/std/stdexcept (__cow_string, __sso_string): New types for
indirectly using std::string with either ABI.
(logic_error, runtime_error): Replace std::string member with
__cow_string when new ABI is in use. Declare non-inline copy
constructor and assignment operator. Declare const char* constructors.
(domain_error, invalid_argument, length_error, out_of_range,
range_error, overflow_error, underflow_error): Declare const char*
constructors.
* include/std/system_error (error_category): Replace with new
definition in inline namespace _V2.
(error_code::message, error_condition::message): Use abi_tag on
functions returning std::string.
* python/libstdcxx/v6/printers.py (StdStringPrinter): Handle new ABI.
* src/c++11/Makefile.am: Add new files.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc: Compile with old std::string ABI.
Define old error_category symbols.
* src/c++11/cow-fstream-inst.cc: New. Instantiate fstream members
using old std::string ABI.
* src/c++11/cow-locale_init.cc (locale::_Impl::_M_init_extra): Define.
* src/c++11/cow-shim_facets.cc: Define shim facets using old ABI.
* src/c++11/cow-sstream-inst.cc: Instantiate stringstreams using old
std::string ABI.
* src/c++11/cow-stdexcept.cc: Define new constructors and assignment
operators.
(__cow_string, error_category::_M_message): Define.
* src/c++11/cow-string-inst.cc: Explicit instantiations using old
std::string. Include src/c++98/istream-string.cc.
* src/c++11/cow-wstring-inst.cc: Explicit instantiations using old
std::wstring.
* src/c++11/cxx11-hash_tr1.cc: Explicit instantiations using new
string.
* src/c++11/cxx11-ios_failure.cc: Add sanity check.
* src/c++11/cxx11-locale-inst.cc: Instantiate facets using new
std::string.
* src/c++11/cxx11-shim_facets.cc: Define shim facets using new ABI.
* src/c++11/cxx11-stdexcept.cc: Define constructors taking new
std::string.
* src/c++11/cxx11-wlocale-inst.cc: Instantiate facets using
new std::wstring.
* src/c++11/fstream-inst.cc: Compile with new ABI.
* src/c++11/functexcept.cc: Compile with old ABI.
* src/c++11/random.cc: Compile with new ABI.
* src/c++11/sstream-inst.cc: Compile with new ABI.
* src/c++11/string-inst.cc: Explicit instantiations for new string.
* src/c++11/system_error.cc (__sso_string, error_category::_M_message):
Define.
* src/c++11/wstring-inst.cc: Compile with new ABI.
* src/c++98/Makefile.am: Compile some host files twice for old and
new std::string. Add new files.
* src/c++98/Makefile.in: Regenerate.
* src/c++98/compatibility-ldbl.cc: Compile with old ABI.
* src/c++98/compatibility.cc: Likewise.
* src/c++98/concept-inst.cc: Likewise.
* src/c++98/hash_tr1.cc: Likewise.
* src/c++98/istream-string.cc: New file defining functions that
work with istream and std::string moved from ...
* src/c++98/istream.cc: ... here.
* src/c++98/cow-istream-string.cc: Recompile istream-string.cc with
old ABI.
* src/c++98/locale-inst.cc: Adjust facet instantiations to work for
either ABI.
* src/c++98/locale.cc (locale::_M_install_facet,
locale::_M_install_cache): Handle twinned facets.
* src/c++98/locale-facets.cc: Compile with old std::string ABI.
(__verify_grouping): Define new overload and old std::string version.
* src/c++98/locale_init.cc: Initialize twinned facets.
* src/c++98/localename.cc: Likewise.
* src/c++98/misc-inst.cc: Instantiate C++98-only std::string members.
(__verify_grouping): Define new std::string version.
* src/c++98/stdexcept.cc: Compile with old std::string ABI.
* src/c++98/wlocale-inst.cc: Likewise.
* testsuite/18_support/50594.cc: Adjust to work with SSO strings.
* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
Likewise.
* testsuite/21_strings/headers/string/synopsis.cc: Use inline
namespace macros.
* testsuite/23_containers/headers/list/synopsis.cc: Likewise.
* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Set dg-options so
correct exception type can be caught.
* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/char/12297.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* testsuite/27_io/ios_base/failure/cxx11.cc: Disable for old ABI.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error.
* testsuite/libstdc++-prettyprinters/libfundts.cc: Use old ABI.
* testsuite/libstdc++-prettyprinters/simple.cc: Likewise.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
* testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.
* testsuite/util/exception/safety.h: Adjust member function types
for new std::string.
* testsuite/util/testsuite_abi.cc: Add new version and ignore
__float128 symbols in __cxx11 namespace.
From-SVN: r218964
2014-12-20 02:16:39 +08:00
|
|
|
glibcxx_cxx11_abi=1
|
|
|
|
glibcxx_cxx98_abi=0
|
|
|
|
else
|
|
|
|
glibcxx_cxx11_abi=0
|
|
|
|
glibcxx_cxx98_abi=1
|
|
|
|
fi
|
|
|
|
AC_SUBST(glibcxx_cxx98_abi)
|
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_CXX11_ABI, test $glibcxx_cxx11_abi = 1)
|
|
|
|
])
|
|
|
|
|
2015-05-01 03:11:52 +08:00
|
|
|
dnl
|
|
|
|
dnl Check to see whether to build libstdc++fs.a
|
|
|
|
dnl
|
|
|
|
dnl --enable-libstdcxx-filesystem-ts
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_FILESYSTEM_TS], [
|
|
|
|
GLIBCXX_ENABLE(libstdcxx-filesystem-ts,auto,,
|
|
|
|
[turns on ISO/IEC TS 18822 support],
|
|
|
|
[permit yes|no|auto])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether to build Filesystem TS support])
|
2015-05-02 03:48:00 +08:00
|
|
|
if test x"$ac_cv_header_dirent_h" != x"yes"; then
|
|
|
|
enable_libstdcxx_filesystem_ts=no
|
|
|
|
fi
|
2015-05-01 03:11:52 +08:00
|
|
|
if test x"$enable_libstdcxx_filesystem_ts" = x"auto"; then
|
|
|
|
case "${target_os}" in
|
|
|
|
freebsd*|netbsd*|openbsd*|dragonfly*|darwin*)
|
|
|
|
enable_libstdcxx_filesystem_ts=yes
|
|
|
|
;;
|
|
|
|
gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
|
|
|
|
enable_libstdcxx_filesystem_ts=yes
|
|
|
|
;;
|
2017-11-21 14:22:13 +08:00
|
|
|
rtems*)
|
|
|
|
enable_libstdcxx_filesystem_ts=yes
|
|
|
|
;;
|
2015-05-01 03:11:52 +08:00
|
|
|
solaris*)
|
2015-05-13 19:07:38 +08:00
|
|
|
enable_libstdcxx_filesystem_ts=yes
|
2015-05-01 03:11:52 +08:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
enable_libstdcxx_filesystem_ts=no
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($enable_libstdcxx_filesystem_ts)
|
|
|
|
GLIBCXX_CONDITIONAL(ENABLE_FILESYSTEM_TS, test $enable_libstdcxx_filesystem_ts = yes)
|
|
|
|
])
|
|
|
|
|
|
|
|
dnl
|
2018-06-19 00:01:24 +08:00
|
|
|
dnl Check whether the library calls required by the Filesystem TS are present.
|
|
|
|
dnl Defines:
|
|
|
|
dnl HAVE_STRUCT_DIRENT_D_TYPE
|
|
|
|
dnl _GLIBCXX_USE_REALPATH
|
|
|
|
dnl _GLIBCXX_USE_UTIMENSAT
|
|
|
|
dnl _GLIBCXX_USE_ST_MTIM
|
|
|
|
dnl _GLIBCXX_USE_FCHMOD
|
|
|
|
dnl _GLIBCXX_USE_FCHMODAT
|
|
|
|
dnl _GLIBCXX_USE_SENDFILE
|
|
|
|
dnl HAVE_LINK
|
|
|
|
dnl HAVE_READLINK
|
|
|
|
dnl HAVE_SYMLINK
|
2015-05-01 03:11:52 +08:00
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_FILESYSTEM_DEPS], [dnl
|
|
|
|
dnl
|
2018-06-19 00:01:24 +08:00
|
|
|
if test $enable_libstdcxx_filesystem_ts = yes; then
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
2015-05-14 19:47:19 +08:00
|
|
|
dnl
|
2018-06-19 00:01:24 +08:00
|
|
|
AC_MSG_CHECKING([for struct dirent.d_type])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_dirent_d_type, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <dirent.h>],
|
|
|
|
[
|
|
|
|
struct dirent d;
|
|
|
|
if (sizeof d.d_type) return 0;
|
|
|
|
],
|
|
|
|
[glibcxx_cv_dirent_d_type=yes],
|
|
|
|
[glibcxx_cv_dirent_d_type=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_dirent_d_type = yes; then
|
|
|
|
AC_DEFINE(HAVE_STRUCT_DIRENT_D_TYPE, 1, [Define to 1 if `d_type' is a member of `struct dirent'.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_dirent_d_type)
|
2015-05-01 03:11:52 +08:00
|
|
|
dnl
|
2018-06-19 00:01:24 +08:00
|
|
|
AC_MSG_CHECKING([for realpath])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_realpath, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[
|
|
|
|
#include <limits.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
],
|
|
|
|
[
|
|
|
|
#if _XOPEN_VERSION < 500
|
|
|
|
#error
|
|
|
|
#elif _XOPEN_VERSION >= 700 || defined(PATH_MAX)
|
|
|
|
char *tmp = realpath((const char*)NULL, (char*)NULL);
|
|
|
|
#else
|
|
|
|
#error
|
|
|
|
#endif
|
|
|
|
],
|
|
|
|
[glibcxx_cv_realpath=yes],
|
|
|
|
[glibcxx_cv_realpath=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_realpath = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_REALPATH, 1, [Define if usable realpath is available in <stdlib.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_realpath)
|
2015-05-01 03:11:52 +08:00
|
|
|
dnl
|
2018-06-19 00:01:24 +08:00
|
|
|
AC_MSG_CHECKING([for utimensat])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_utimensat, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
],
|
|
|
|
[
|
|
|
|
struct timespec ts[2] = { { 0, UTIME_OMIT }, { 1, 1 } };
|
|
|
|
int i = utimensat(AT_FDCWD, "path", ts, 0);
|
|
|
|
],
|
|
|
|
[glibcxx_cv_utimensat=yes],
|
|
|
|
[glibcxx_cv_utimensat=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_utimensat = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_UTIMENSAT, 1, [Define if utimensat and UTIME_OMIT are available in <sys/stat.h> and AT_FDCWD in <fcntl.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_utimensat)
|
PR libstdc++/86756 Move rest of std::filesystem to libstdc++.so
Move std::filesystem directory iterators and operations from
libstdc++fs.a to main libstdc++ library. These components have many
dependencies on OS support, which is not available on all targets. Some
additional autoconf checks and conditional compilation is needed to
ensure the files will build for all targets. Previously this code was
not compiled without --enable-libstdcxx-filesystem-ts but the C++17
components should be available for all hosted builds.
The tests for these components no longer need to link to libstdc++fs.a,
but are not expected to pass on all targets. To avoid numerous failures
on targets which are not expected to pass the tests (due to missing OS
functionality) leave the dg-require-filesystem-ts directives in place
for now. This will ensure the tests only run for builds where the
filesystem-ts library is built, which presumably means some level of OS
support is present.
PR libstdc++/86756
* acinclude.m4 (GLIBCXX_CHECK_FILESYSTEM_DEPS): Check for utime and
lstat and define _GLIBCXX_USE_UTIME and _GLIBCXX_USE_LSTAT.
* config.h.in: Regenerate.
* config/abi/pre/gnu.ver (GLIBCXX_3.4.26): Export symbols for
remaining std::filesystem types and functions.
* configure: Regenerate.
* src/c++17/Makefile.am: Add C++17 filesystem sources.
* src/c++17/Makefile.in: Regenerate.
* src/c++17/cow-fs_dir.cc: Move src/filesystem/cow-std-dir.cc to
here, and change name of included file.
* src/c++17/cow-fs_ops.cc: Move src/filesystem/cow-std-ops.cc to
here, and change name of included file.
* src/c++17/fs_dir.cc: Move src/filesystem/std-dir.cc to here. Change
path to dir-common.h.
* src/c++17/fs_ops.cc: Move src/filesystem/std-ops.cc to here. Change
path to ops-common.h. Disable -Wunused-parameter warnings.
(internal_file_clock): Define unconditionally.
[!_GLIBCXX_HAVE_SYS_STAT_H] (internal_file_clock::from_stat): Do not
define.
(do_copy_file, do_space): Move definitions to ops.common.h.
(copy, file_size, hard_link_count, last_write_time, space): Only
perform operation when _GLIBCXX_HAVE_SYS_STAT_H is defined, otherwise
report an error.
(last_write_time, read_symlink): Remove unused attributes from
parameters.
* src/filesystem/Makefile.am: Remove C++17 filesystem sources.
* src/filesystem/Makefile.in: Regenerate.
* src/filesystem/cow-std-dir.cc: Move to src/c++17/cow-fs_dir.cc.
* src/filesystem/cow-std-ops.cc: Move to src/c++17/cow-fs_ops.cc.
* src/filesystem/std-dir.cc: Move to src/c++17/fs_dir.cc.
* src/filesystem/std-ops.cc: Move to src/c++17/fs_ops.cc.
* src/filesystem/dir-common.h [!_GLIBCXX_HAVE_DIRENT_H]: Define
dummy types and functions instead of using #error.
* src/filesystem/dir.cc [!_GLIBCXX_HAVE_DIRENT_H]: Use #error.
* src/filesystem/ops-common.h [!_GLIBCXX_USE_LSTAT] (lstat): Define
in terms of stat.
[!_GLIBCXX_HAVE_UNISTD_H]: Define dummy types and functions.
(do_copy_file, do_space): Move definitions here from std-ops.cc.
* src/filesystem/ops.cc: Adjust calls to do_copy_file and do_space
to account for new namespace.
* testsuite/27_io/filesystem/directory_entry/86597.cc: Remove
-lstdc++fs from dg-options.
* testsuite/27_io/filesystem/directory_entry/lwg3171.cc: Likewise.
* testsuite/27_io/filesystem/file_status/1.cc: Likewise.
* testsuite/27_io/filesystem/filesystem_error/cons.cc: Likewise.
* testsuite/27_io/filesystem/filesystem_error/copy.cc: Likewise.
* testsuite/27_io/filesystem/iterators/directory_iterator.cc:
Likewise.
* testsuite/27_io/filesystem/iterators/pop.cc: Likewise.
* testsuite/27_io/filesystem/iterators/recursive_directory_iterator.cc:
Likewise.
* testsuite/27_io/filesystem/operations/absolute.cc: Likewise.
* testsuite/27_io/filesystem/operations/canonical.cc: Likewise.
* testsuite/27_io/filesystem/operations/copy.cc: Likewise.
* testsuite/27_io/filesystem/operations/copy_file.cc: Likewise.
* testsuite/27_io/filesystem/operations/create_directories.cc:
Likewise.
* testsuite/27_io/filesystem/operations/create_directory.cc: Likewise.
* testsuite/27_io/filesystem/operations/create_symlink.cc: Likewise.
* testsuite/27_io/filesystem/operations/current_path.cc: Likewise.
* testsuite/27_io/filesystem/operations/equivalent.cc: Likewise.
* testsuite/27_io/filesystem/operations/exists.cc: Likewise.
* testsuite/27_io/filesystem/operations/file_size.cc: Likewise.
* testsuite/27_io/filesystem/operations/is_empty.cc: Likewise.
* testsuite/27_io/filesystem/operations/last_write_time.cc: Likewise.
* testsuite/27_io/filesystem/operations/permissions.cc: Likewise.
* testsuite/27_io/filesystem/operations/proximate.cc: Likewise.
* testsuite/27_io/filesystem/operations/read_symlink.cc: Likewise.
* testsuite/27_io/filesystem/operations/relative.cc: Likewise.
* testsuite/27_io/filesystem/operations/remove.cc: Likewise.
* testsuite/27_io/filesystem/operations/remove_all.cc: Likewise.
* testsuite/27_io/filesystem/operations/space.cc: Likewise.
* testsuite/27_io/filesystem/operations/status.cc: Likewise.
* testsuite/27_io/filesystem/operations/symlink_status.cc: Likewise.
* testsuite/27_io/filesystem/operations/temp_directory_path.cc:
Likewise.
* testsuite/27_io/filesystem/operations/weakly_canonical.cc: Likewise.
From-SVN: r267616
2019-01-07 06:34:37 +08:00
|
|
|
dnl
|
|
|
|
AC_MSG_CHECKING([for utime])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_utime, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[
|
|
|
|
#include <utime.h>
|
|
|
|
],
|
|
|
|
[
|
|
|
|
struct utimbuf t = { 1, 1 };
|
|
|
|
int i = utime("path", &t);
|
|
|
|
],
|
|
|
|
[glibcxx_cv_utime=yes],
|
|
|
|
[glibcxx_cv_utime=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_utime = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_UTIME, 1, [Define if utime is available in <utime.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_utime)
|
|
|
|
dnl
|
|
|
|
AC_MSG_CHECKING([for lstat])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_lstat, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[ #include <sys/stat.h> ],
|
|
|
|
[
|
|
|
|
struct stat st;
|
|
|
|
int i = lstat("path", &st);
|
|
|
|
],
|
|
|
|
[glibcxx_cv_lstat=yes],
|
|
|
|
[glibcxx_cv_lstat=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_lstat = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_LSTAT, 1, [Define if lstat is available in <sys/stat.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_lstat)
|
2015-05-01 03:11:52 +08:00
|
|
|
dnl
|
2018-06-19 00:01:24 +08:00
|
|
|
AC_MSG_CHECKING([for struct stat.st_mtim.tv_nsec])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_st_mtim, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[ #include <sys/stat.h> ],
|
|
|
|
[
|
|
|
|
struct stat st;
|
|
|
|
return st.st_mtim.tv_nsec;
|
|
|
|
],
|
|
|
|
[glibcxx_cv_st_mtim=yes],
|
|
|
|
[glibcxx_cv_st_mtim=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_st_mtim = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_ST_MTIM, 1, [Define if struct stat has timespec members.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_st_mtim)
|
2015-05-14 21:23:14 +08:00
|
|
|
dnl
|
2018-06-19 00:01:24 +08:00
|
|
|
AC_MSG_CHECKING([for fchmod])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_fchmod, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <sys/stat.h>],
|
|
|
|
[fchmod(1, S_IWUSR);],
|
|
|
|
[glibcxx_cv_fchmod=yes],
|
|
|
|
[glibcxx_cv_fchmod=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_fchmod = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_FCHMOD, 1, [Define if fchmod is available in <sys/stat.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_fchmod)
|
2015-05-02 03:48:00 +08:00
|
|
|
dnl
|
2018-06-19 00:01:24 +08:00
|
|
|
AC_MSG_CHECKING([for fchmodat])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_fchmodat, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
],
|
|
|
|
[fchmodat(AT_FDCWD, "", 0, AT_SYMLINK_NOFOLLOW);],
|
|
|
|
[glibcxx_cv_fchmodat=yes],
|
|
|
|
[glibcxx_cv_fchmodat=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_fchmodat = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_FCHMODAT, 1, [Define if fchmodat is available in <sys/stat.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_fchmodat)
|
|
|
|
dnl
|
|
|
|
AC_MSG_CHECKING([for sendfile that can copy files])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_sendfile, [dnl
|
|
|
|
case "${target_os}" in
|
|
|
|
gnu* | linux* | solaris*)
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <sys/sendfile.h>],
|
|
|
|
[sendfile(1, 2, (off_t*)0, sizeof 1);],
|
|
|
|
[glibcxx_cv_sendfile=yes],
|
|
|
|
[glibcxx_cv_sendfile=no])
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
glibcxx_cv_sendfile=no
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_sendfile = yes; then
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_SENDFILE, 1, [Define if sendfile is available in <sys/sendfile.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_sendfile)
|
2015-05-14 21:23:14 +08:00
|
|
|
dnl
|
2018-06-19 00:01:24 +08:00
|
|
|
AC_MSG_CHECKING([for link])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_link, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <unistd.h>],
|
|
|
|
[link("", "");],
|
|
|
|
[glibcxx_cv_link=yes],
|
|
|
|
[glibcxx_cv_link=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_link = yes; then
|
|
|
|
AC_DEFINE(HAVE_LINK, 1, [Define if link is available in <unistd.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_link)
|
2015-05-01 03:11:52 +08:00
|
|
|
dnl
|
2018-06-19 00:01:24 +08:00
|
|
|
AC_MSG_CHECKING([for readlink])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_readlink, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <unistd.h>],
|
|
|
|
[char buf[32]; readlink("", buf, sizeof(buf));],
|
|
|
|
[glibcxx_cv_readlink=yes],
|
|
|
|
[glibcxx_cv_readlink=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_readlink = yes; then
|
|
|
|
AC_DEFINE(HAVE_READLINK, 1, [Define if readlink is available in <unistd.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_readlink)
|
|
|
|
dnl
|
|
|
|
AC_MSG_CHECKING([for symlink])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_symlink, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <unistd.h>],
|
|
|
|
[symlink("", "");],
|
|
|
|
[glibcxx_cv_symlink=yes],
|
|
|
|
[glibcxx_cv_symlink=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_symlink = yes; then
|
|
|
|
AC_DEFINE(HAVE_SYMLINK, 1, [Define if symlink is available in <unistd.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_symlink)
|
2019-01-07 20:38:51 +08:00
|
|
|
dnl
|
|
|
|
AC_MSG_CHECKING([for truncate])
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_truncate, [dnl
|
|
|
|
GCC_TRY_COMPILE_OR_LINK(
|
|
|
|
[#include <unistd.h>],
|
|
|
|
[truncate("", 99);],
|
|
|
|
[glibcxx_cv_truncate=yes],
|
|
|
|
[glibcxx_cv_truncate=no])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_truncate = yes; then
|
|
|
|
AC_DEFINE(HAVE_TRUNCATE, 1, [Define if truncate is available in <unistd.h>.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($glibcxx_cv_truncate)
|
2018-06-19 00:01:24 +08:00
|
|
|
dnl
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
fi
|
2015-05-01 03:11:52 +08:00
|
|
|
])
|
New std::string implementation.
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove.
(GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI, GLIBCXX_DEFAULT_ABI): Add.
* configure.ac: Use new macros.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* include/Makefile.am: Set _GLIBCXX_USE_DUAL_ABI.
* include/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver: Export symbols related to new std::string.
Tighten old patterns to not match new symbols.
* config/locale/generic/monetary_members.cc: Guard some definitions
to not compile with new ABI.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Prevent double-free.
* config/os/gnu-linux/ldbl-extra.ver: Add new __gnu_cxx_ldbl128
exports. Tighten old patterns.
* doc/xml/manual/configure.xml: Document new configure options.
* doc/html/*: Regenerate.
* include/bits/basic_string.h (__cxx11::basic_string): Define new
non-reference-counted implementation in inline namespace __cxx11.
(stoi, stol, stoll, stof, stod, stold, to_string): Conditionally use
inline namespace.
(literals::string_literals::operator"): Conditionally use abi-tag.
* include/bits/basic_string.tcc (__cxx11::basic_string): Define.
* include/bits/c++config: Define _GLIBCXX_USE_DUAL_ABI and
LDBL_CXX11_ABI namespace macros.
* include/bits/locale_classes.h (locale::name()): Use abi_tag when
new ABI is in use.
(locale::_S_twinned_facets): New static member.
(locale::facet::__shim): Declare new type.
(locale::_facet::_M_sso_shim, locale::_facet::_M_cow_shim): New
functions for creating shims.
(locale::_Impl::_M_facet_unchecked): New member function for use
during construction.
(locale::_Impl::_M_init_extra): New member functions to create second
version of some facets.
(collate, collate_byname): Use abi_tag when new ABI is in use.
* include/bits/locale_facets.h: Add _GLIBCXX_NUM_CXX11_FACETS macro.
(numpunct, numpunct_byname): Use __cxx11 namespace.
(num_get::_M_extract_float, num_get::_M_extract_int): Use abi_tag
when new ABI is in use.
(num_get::__do_get, num_put::__do_put): Do not declare long double
compat functions for new ABI.
* include/bits/locale_facets.tcc (num_get, num_put): Use abi_tag on
definitions.
(numpunct, numpunct_byname): Qualify explicit instantiations.
* include/bits/locale_facets_nonio.h (time_get, time_get_byname,
moneypunct, moneypunct_byname, money_get, money_put, messages,
messages_byname): Use new inline namespace macros.
(money_get::__do_get, money_put::__do_put): Do not declare long
double compat functions for new ABI.
* include/bits/locale_facets_nonio.tcc (money_get, money_put): Use
new namespace macros.
(money_get::__do_get, money_put::__do_put): Do not define for new ABI.
* include/bits/localefwd.h (numpunct, numpunct_byname, collate,
collate_byname, time_get, time_get_byname, moneypunct,
moneypunct_byname, money_get, money_put, messages, messages_byname):
Use new namespace macros.
* include/bits/regex.h: Use inline namespace macros.
* include/bits/stl_list.h (_List_base, list): Use inline namespace
instead of abi-tag.
* include/bits/stringfwd.h (basic_string): Use namespace macros.
* include/std/iosfwd (basic_stringbuf, basic_istringstream,
basic_ostringstream, basic_stringstream): Likewise.
* include/std/sstream: Likewise.
(basic_stringbuf::__xfer_bufptrs): Update streambuf pointers on move.
* include/std/stdexcept (__cow_string, __sso_string): New types for
indirectly using std::string with either ABI.
(logic_error, runtime_error): Replace std::string member with
__cow_string when new ABI is in use. Declare non-inline copy
constructor and assignment operator. Declare const char* constructors.
(domain_error, invalid_argument, length_error, out_of_range,
range_error, overflow_error, underflow_error): Declare const char*
constructors.
* include/std/system_error (error_category): Replace with new
definition in inline namespace _V2.
(error_code::message, error_condition::message): Use abi_tag on
functions returning std::string.
* python/libstdcxx/v6/printers.py (StdStringPrinter): Handle new ABI.
* src/c++11/Makefile.am: Add new files.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc: Compile with old std::string ABI.
Define old error_category symbols.
* src/c++11/cow-fstream-inst.cc: New. Instantiate fstream members
using old std::string ABI.
* src/c++11/cow-locale_init.cc (locale::_Impl::_M_init_extra): Define.
* src/c++11/cow-shim_facets.cc: Define shim facets using old ABI.
* src/c++11/cow-sstream-inst.cc: Instantiate stringstreams using old
std::string ABI.
* src/c++11/cow-stdexcept.cc: Define new constructors and assignment
operators.
(__cow_string, error_category::_M_message): Define.
* src/c++11/cow-string-inst.cc: Explicit instantiations using old
std::string. Include src/c++98/istream-string.cc.
* src/c++11/cow-wstring-inst.cc: Explicit instantiations using old
std::wstring.
* src/c++11/cxx11-hash_tr1.cc: Explicit instantiations using new
string.
* src/c++11/cxx11-ios_failure.cc: Add sanity check.
* src/c++11/cxx11-locale-inst.cc: Instantiate facets using new
std::string.
* src/c++11/cxx11-shim_facets.cc: Define shim facets using new ABI.
* src/c++11/cxx11-stdexcept.cc: Define constructors taking new
std::string.
* src/c++11/cxx11-wlocale-inst.cc: Instantiate facets using
new std::wstring.
* src/c++11/fstream-inst.cc: Compile with new ABI.
* src/c++11/functexcept.cc: Compile with old ABI.
* src/c++11/random.cc: Compile with new ABI.
* src/c++11/sstream-inst.cc: Compile with new ABI.
* src/c++11/string-inst.cc: Explicit instantiations for new string.
* src/c++11/system_error.cc (__sso_string, error_category::_M_message):
Define.
* src/c++11/wstring-inst.cc: Compile with new ABI.
* src/c++98/Makefile.am: Compile some host files twice for old and
new std::string. Add new files.
* src/c++98/Makefile.in: Regenerate.
* src/c++98/compatibility-ldbl.cc: Compile with old ABI.
* src/c++98/compatibility.cc: Likewise.
* src/c++98/concept-inst.cc: Likewise.
* src/c++98/hash_tr1.cc: Likewise.
* src/c++98/istream-string.cc: New file defining functions that
work with istream and std::string moved from ...
* src/c++98/istream.cc: ... here.
* src/c++98/cow-istream-string.cc: Recompile istream-string.cc with
old ABI.
* src/c++98/locale-inst.cc: Adjust facet instantiations to work for
either ABI.
* src/c++98/locale.cc (locale::_M_install_facet,
locale::_M_install_cache): Handle twinned facets.
* src/c++98/locale-facets.cc: Compile with old std::string ABI.
(__verify_grouping): Define new overload and old std::string version.
* src/c++98/locale_init.cc: Initialize twinned facets.
* src/c++98/localename.cc: Likewise.
* src/c++98/misc-inst.cc: Instantiate C++98-only std::string members.
(__verify_grouping): Define new std::string version.
* src/c++98/stdexcept.cc: Compile with old std::string ABI.
* src/c++98/wlocale-inst.cc: Likewise.
* testsuite/18_support/50594.cc: Adjust to work with SSO strings.
* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
Likewise.
* testsuite/21_strings/headers/string/synopsis.cc: Use inline
namespace macros.
* testsuite/23_containers/headers/list/synopsis.cc: Likewise.
* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Set dg-options so
correct exception type can be caught.
* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/char/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
exceptions_failbit.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/char/12297.cc: Likewise.
* testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/char/
exceptions_null.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
exceptions_null.cc: Likewise.
* testsuite/27_io/ios_base/storage/2.cc: Likewise.
* testsuite/27_io/ios_base/failure/cxx11.cc: Disable for old ABI.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error.
* testsuite/libstdc++-prettyprinters/libfundts.cc: Use old ABI.
* testsuite/libstdc++-prettyprinters/simple.cc: Likewise.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
* testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.
* testsuite/util/exception/safety.h: Adjust member function types
for new std::string.
* testsuite/util/testsuite_abi.cc: Add new version and ignore
__float128 symbols in __cxx11 namespace.
From-SVN: r218964
2014-12-20 02:16:39 +08:00
|
|
|
|
2016-01-16 06:42:41 +08:00
|
|
|
dnl
|
|
|
|
dnl Check how size_t is mangled. Copied from libitm.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_SIZE_T_MANGLING], [
|
|
|
|
AC_CACHE_CHECK([how size_t is mangled],
|
|
|
|
glibcxx_cv_size_t_mangling, [
|
|
|
|
AC_TRY_COMPILE([], [extern __SIZE_TYPE__ x; extern unsigned long x;],
|
|
|
|
[glibcxx_cv_size_t_mangling=m], [
|
|
|
|
AC_TRY_COMPILE([], [extern __SIZE_TYPE__ x; extern unsigned int x;],
|
|
|
|
[glibcxx_cv_size_t_mangling=j], [
|
|
|
|
AC_TRY_COMPILE([],
|
|
|
|
[extern __SIZE_TYPE__ x; extern unsigned long long x;],
|
|
|
|
[glibcxx_cv_size_t_mangling=y], [
|
|
|
|
AC_TRY_COMPILE([],
|
|
|
|
[extern __SIZE_TYPE__ x; extern unsigned short x;],
|
2017-01-21 01:46:36 +08:00
|
|
|
[glibcxx_cv_size_t_mangling=t], [
|
|
|
|
AC_TRY_COMPILE([],
|
|
|
|
[extern __SIZE_TYPE__ x; extern __int20 unsigned x;],
|
|
|
|
[glibcxx_cv_size_t_mangling=u6uint20],
|
|
|
|
[glibcxx_cv_size_t_mangling=x])
|
|
|
|
])
|
2016-01-16 06:42:41 +08:00
|
|
|
])
|
|
|
|
])
|
|
|
|
])
|
|
|
|
])
|
|
|
|
if test $glibcxx_cv_size_t_mangling = x; then
|
|
|
|
AC_MSG_ERROR([Unknown underlying type for size_t])
|
|
|
|
fi
|
|
|
|
AC_DEFINE_UNQUOTED(_GLIBCXX_MANGLE_SIZE_T, [$glibcxx_cv_size_t_mangling],
|
|
|
|
[Define to the letter to which size_t is mangled.])
|
|
|
|
])
|
|
|
|
|
2017-01-04 18:54:59 +08:00
|
|
|
dnl
|
|
|
|
dnl Determine whether std::exception_ptr symbols should be exported with
|
|
|
|
dnl the symbol versions from GCC 4.6.0 or GCC 7.1.0, depending on which
|
|
|
|
dnl release first added support for std::exception_ptr. Originally it was
|
|
|
|
dnl only supported for targets with always-lock-free atomics for int, but
|
|
|
|
dnl since GCC 7.1 it is supported for all targets.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_EXCEPTION_PTR_SYMVER], [
|
|
|
|
if test $enable_symvers != no; then
|
|
|
|
AC_MSG_CHECKING([for first version to support std::exception_ptr])
|
|
|
|
case ${target} in
|
|
|
|
aarch64-*-* | alpha-*-* | hppa*-*-* | i?86-*-* | x86_64-*-* | \
|
|
|
|
m68k-*-* | powerpc*-*-* | s390*-*-* | *-*-solaris* )
|
|
|
|
ac_exception_ptr_since_gcc46=yes
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
# If the value of this macro changes then we will need to hardcode
|
|
|
|
# yes/no here for additional targets based on the original value.
|
|
|
|
AC_TRY_COMPILE([], [
|
|
|
|
#if __GCC_ATOMIC_INT_LOCK_FREE <= 1
|
|
|
|
# error atomic int not always lock free
|
|
|
|
#endif
|
|
|
|
],
|
|
|
|
[ac_exception_ptr_since_gcc46=yes],
|
|
|
|
[ac_exception_ptr_since_gcc46=no])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
if test x"$ac_exception_ptr_since_gcc46" = x"yes" ; then
|
|
|
|
AC_DEFINE(HAVE_EXCEPTION_PTR_SINCE_GCC46, 1,
|
|
|
|
[Define to 1 if GCC 4.6 supported std::exception_ptr for the target])
|
|
|
|
AC_MSG_RESULT([4.6.0])
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT([7.1.0])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
2005-11-22 14:54:08 +08:00
|
|
|
# Macros from the top-level gcc directory.
|
2010-07-02 18:05:49 +08:00
|
|
|
m4_include([../config/gc++filt.m4])
|
2005-11-22 14:54:08 +08:00
|
|
|
m4_include([../config/tls.m4])
|
2012-10-15 21:10:30 +08:00
|
|
|
m4_include([../config/gthr.m4])
|
2017-11-18 05:28:10 +08:00
|
|
|
m4_include([../config/cet.m4])
|