configure.in (GLIBCPP_ENABLE_DEBUG): Default to none.
2002-12-16 Benjamin Kosnik <bkoz@redhat.com> * configure.in (GLIBCPP_ENABLE_DEBUG): Default to none. Call GLIBCPP_ENABLE_DEBUG_FLAGS. * acinclude.m4 (GLIBCPP_ENABLE_DEBUG): GLIBCPP_BUILD_DEBUG, new conditional if --enable-debug is yes. Rework. (GLIBCPP_ENABLE_DEBUG_FLAGS): New. * aclocal.m4: Regenerate. * libio/Makefile.am: Remove DEBUG_FLAGS. * libio/Makefile.in: Regenerate. * libsupc++/Makefile.am: Remove DEBUG_FLAGS. * libsupc++/Makefile.in: Regenerate. * docs/html/configopts.html: Add docs for --enable-debug, --enable-debug-flags. 2002-12-16 Benjamin Kosnik <bkoz@redhat.com> Correct dependency tracking, build warts. * configure.in: Correct repeated AC_OUTPUT thrashing by config-ml.in * configure: Regenerate. * include/Makefile.am (stamp-target): Stamp in top_builddir. * include/Makefile.in: Regenerate. * src/Makefile.am (codecvt_members.cc): New rule. (collate_members.cc): Same. (ctype_members.cc): Same. (messages_members.cc): Same. (monetary_members.cc): Same. (numeric_members.cc): Same. (time_members.cc): Same. (c++locale.cc): Same. (basic_file.cc): Same. * src/Makefile.in: Regenerate. * acinclude.m4 (CCTYPE_CHAR_CC): Remove. (CCCODECVT_CC): Don't link, AC_SUBST. (CCOLLATE_CC): Same. (CCTYPE_CC): Same. (CMESSAGES_CC): Same. (CMONEY_CC): Same. (CNUMERIC_CC): Same. (CTIME_CC): Same. (CLOCALE_CC): Same. * aclocal.m4: Regenerate. * src/Makefile.am (libstdc___la_LIBADD): Use top_builddir for convenience libraries. (version_arg): Rename linker.map to libstdc++.ver. (libstdc___la_DEPENDENCIES): Remove linker.map, add libstdc++-symbol.ver as a dependency. (libstdc++-symbol.ver): Add rule. * acinclude.m4 (GLIBCPP_ENABLE_SYMVERS): Change LINKER_MAP to SYMVER_MAP. Don't link, AC_SUBST. * include/Makefile.am (target_headers_noinst): New. (stamp-target): Add CLOCALE_INTERNAL_H. * acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Don't link CLOCALE_INTERNAL_H, AC_SUBST. * config/locale/gnu/c_locale.cc: Modify c++locale_internal.h include. * config/locale/gnu/time_members.cc: Same. * config/locale/gnu/numeric_members.cc: Same. * config/locale/gnu/monetary_members.cc: Same. * config/locale/gnu/messages_members.cc: Same. * config/locale/gnu/ctype_members.cc: Same. * config/locale/gnu/collate_members.cc: Same. * config/locale/gnu/codecvt_members.cc: Same. * config/locale/generic/codecvt_members.cc: Remove. From-SVN: r60177
This commit is contained in:
parent
27eaa70873
commit
6aa43d99a3
28 changed files with 2630 additions and 2142 deletions
|
@ -1,3 +1,71 @@
|
|||
2002-12-16 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* configure.in (GLIBCPP_ENABLE_DEBUG): Default to none.
|
||||
Call GLIBCPP_ENABLE_DEBUG_FLAGS.
|
||||
* acinclude.m4 (GLIBCPP_ENABLE_DEBUG): GLIBCPP_BUILD_DEBUG, new
|
||||
conditional if --enable-debug is yes. Rework.
|
||||
(GLIBCPP_ENABLE_DEBUG_FLAGS): New.
|
||||
* aclocal.m4: Regenerate.
|
||||
* libio/Makefile.am: Remove DEBUG_FLAGS.
|
||||
* libio/Makefile.in: Regenerate.
|
||||
* libsupc++/Makefile.am: Remove DEBUG_FLAGS.
|
||||
* libsupc++/Makefile.in: Regenerate.
|
||||
* docs/html/configopts.html: Add docs for --enable-debug,
|
||||
--enable-debug-flags.
|
||||
|
||||
2002-12-16 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
Correct dependency tracking, build warts.
|
||||
* configure.in: Correct repeated AC_OUTPUT thrashing by
|
||||
config-ml.in
|
||||
* configure: Regenerate.
|
||||
* include/Makefile.am (stamp-target): Stamp in top_builddir.
|
||||
* include/Makefile.in: Regenerate.
|
||||
* src/Makefile.am (codecvt_members.cc): New rule.
|
||||
(collate_members.cc): Same.
|
||||
(ctype_members.cc): Same.
|
||||
(messages_members.cc): Same.
|
||||
(monetary_members.cc): Same.
|
||||
(numeric_members.cc): Same.
|
||||
(time_members.cc): Same.
|
||||
(c++locale.cc): Same.
|
||||
(basic_file.cc): Same.
|
||||
* src/Makefile.in: Regenerate.
|
||||
* acinclude.m4 (CCTYPE_CHAR_CC): Remove.
|
||||
(CCCODECVT_CC): Don't link, AC_SUBST.
|
||||
(CCOLLATE_CC): Same.
|
||||
(CCTYPE_CC): Same.
|
||||
(CMESSAGES_CC): Same.
|
||||
(CMONEY_CC): Same.
|
||||
(CNUMERIC_CC): Same.
|
||||
(CTIME_CC): Same.
|
||||
(CLOCALE_CC): Same.
|
||||
* aclocal.m4: Regenerate.
|
||||
|
||||
* src/Makefile.am (libstdc___la_LIBADD): Use top_builddir
|
||||
for convenience libraries.
|
||||
(version_arg): Rename linker.map to libstdc++.ver.
|
||||
(libstdc___la_DEPENDENCIES): Remove linker.map, add
|
||||
libstdc++-symbol.ver as a dependency.
|
||||
(libstdc++-symbol.ver): Add rule.
|
||||
* acinclude.m4 (GLIBCPP_ENABLE_SYMVERS): Change LINKER_MAP to
|
||||
SYMVER_MAP. Don't link, AC_SUBST.
|
||||
|
||||
* include/Makefile.am (target_headers_noinst): New.
|
||||
(stamp-target): Add CLOCALE_INTERNAL_H.
|
||||
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Don't link
|
||||
CLOCALE_INTERNAL_H, AC_SUBST.
|
||||
* config/locale/gnu/c_locale.cc: Modify c++locale_internal.h
|
||||
include.
|
||||
* config/locale/gnu/time_members.cc: Same.
|
||||
* config/locale/gnu/numeric_members.cc: Same.
|
||||
* config/locale/gnu/monetary_members.cc: Same.
|
||||
* config/locale/gnu/messages_members.cc: Same.
|
||||
* config/locale/gnu/ctype_members.cc: Same.
|
||||
* config/locale/gnu/collate_members.cc: Same.
|
||||
* config/locale/gnu/codecvt_members.cc: Same.
|
||||
* config/locale/generic/codecvt_members.cc: Remove.
|
||||
|
||||
2002-12-11 Paolo Carlini <pcarlini@unitus.it>
|
||||
|
||||
PR libstdc++/8887
|
||||
|
|
|
@ -67,14 +67,24 @@ AR = @AR@
|
|||
AS = @AS@
|
||||
ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
|
||||
AWK = @AWK@
|
||||
BASIC_FILE_CC = @BASIC_FILE_CC@
|
||||
BASIC_FILE_H = @BASIC_FILE_H@
|
||||
CC = @CC@
|
||||
CCODECVT_C = @CCODECVT_C@
|
||||
CCODECVT_CC = @CCODECVT_CC@
|
||||
CCODECVT_H = @CCODECVT_H@
|
||||
CCOLLATE_CC = @CCOLLATE_CC@
|
||||
CCTYPE_CC = @CCTYPE_CC@
|
||||
CLOCALE_CC = @CLOCALE_CC@
|
||||
CLOCALE_H = @CLOCALE_H@
|
||||
CLOCALE_INTERNAL_H = @CLOCALE_INTERNAL_H@
|
||||
CMESSAGES_CC = @CMESSAGES_CC@
|
||||
CMESSAGES_H = @CMESSAGES_H@
|
||||
CMONEY_CC = @CMONEY_CC@
|
||||
CNUMERIC_CC = @CNUMERIC_CC@
|
||||
CPP = @CPP@
|
||||
CSTDIO_H = @CSTDIO_H@
|
||||
CTIME_CC = @CTIME_CC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
C_INCLUDE_DIR = @C_INCLUDE_DIR@
|
||||
|
@ -106,6 +116,7 @@ RANLIB = @RANLIB@
|
|||
SECTION_FLAGS = @SECTION_FLAGS@
|
||||
SECTION_LDFLAGS = @SECTION_LDFLAGS@
|
||||
STRIP = @STRIP@
|
||||
SYMVER_MAP = @SYMVER_MAP@
|
||||
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
|
|
|
@ -267,8 +267,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES, [
|
|||
# this is the suspicious part
|
||||
CXXFLAGS=''
|
||||
fi
|
||||
if test x"$ac_fdsections" = x"yes" &&
|
||||
test x"$enable_debug" = x"no"; then
|
||||
if test x"$ac_fdsections" = x"yes"; then
|
||||
SECTION_FLAGS='-ffunction-sections -fdata-sections'
|
||||
fi
|
||||
AC_MSG_RESULT($ac_fdsections)
|
||||
|
@ -361,7 +360,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
|
|||
fi
|
||||
|
||||
# Set linker optimization flags.
|
||||
if test x"$with_gnu_ld" = x"yes" && test x"$enable_debug" = x"no"; then
|
||||
if test x"$with_gnu_ld" = x"yes"; then
|
||||
OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
|
||||
fi
|
||||
|
||||
|
@ -911,7 +910,11 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
|
|||
AC_CHECK_FUNCS([__signbitl], , [LIBMATHOBJS="$LIBMATHOBJS signbitl.lo"])
|
||||
fi
|
||||
|
||||
if test -n "$LIBMATHOBJS"; then
|
||||
need_libmath=yes
|
||||
fi
|
||||
AC_SUBST(LIBMATHOBJS)
|
||||
AM_CONDITIONAL(GLIBCPP_BUILD_LIBMATH, test "$need_libmath" = yes)
|
||||
])
|
||||
|
||||
|
||||
|
@ -1043,14 +1046,20 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
|
|||
|
||||
|
||||
dnl
|
||||
dnl Check for special debugging mode; not for production use.
|
||||
dnl Check to see if debugging libraries are to be built.
|
||||
dnl
|
||||
dnl GLIBCPP_ENABLE_DEBUG
|
||||
dnl --enable-debug sets '-ggdb3 -O0'.
|
||||
dnl --disable-debug sets '-g' and whatever optimization options the
|
||||
dnl compiler can handle.
|
||||
dnl + --enable-maintainer-mode automatically defaults this to on.
|
||||
dnl + Perhaps -D/-U of NDEBUG, DEBUG, DEBUG_ASSERT, ...?
|
||||
dnl
|
||||
dnl --enable-debug
|
||||
dnl builds a separate set of debugging libraries in addition to the
|
||||
dnl normal (shared, static) libstdc++ binaries.
|
||||
dnl
|
||||
dnl --disable-debug
|
||||
dnl builds only one (non-debug) version of libstdc++.
|
||||
dnl
|
||||
dnl --enable-debug-flags=FLAGS
|
||||
dnl iff --enable-debug == yes, then use FLAGS to build the debug library.
|
||||
dnl
|
||||
dnl + Usage: GLIBCPP_ENABLE_DEBUG[(DEFAULT)]
|
||||
dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
|
||||
dnl defaults to `no'.
|
||||
|
@ -1066,17 +1075,56 @@ changequote([, ])dnl
|
|||
*) AC_MSG_ERROR([Unknown argument to enable/disable extra debugging]) ;;
|
||||
esac],
|
||||
enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
|
||||
AC_MSG_CHECKING([for additional debug build])
|
||||
AC_MSG_RESULT($enable_debug)
|
||||
AM_CONDITIONAL(GLIBCPP_BUILD_DEBUG, test "$enable_debug" = yes)
|
||||
])
|
||||
|
||||
|
||||
dnl Check for explicit debug flags.
|
||||
dnl
|
||||
dnl GLIBCPP_ENABLE_DEBUG_FLAGS
|
||||
dnl
|
||||
dnl --enable-debug-flags='-O1'
|
||||
dnl is a general method for passing flags to be used when
|
||||
dnl building debug libraries with --enable-debug.
|
||||
dnl
|
||||
dnl --disable-debug-flags does nothing.
|
||||
dnl + Usage: GLIBCPP_ENABLE_DEBUG_FLAGS(default flags)
|
||||
dnl If "default flags" is an empty string (or "none"), the effect is
|
||||
dnl the same as --disable or --enable=no.
|
||||
AC_DEFUN(GLIBCPP_ENABLE_DEBUG_FLAGS, [dnl
|
||||
define([GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
|
||||
AC_ARG_ENABLE(debug_flags,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-debug-flags=FLAGS pass compiler FLAGS when building debug
|
||||
library;[default=>>GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT],
|
||||
changequote([, ])dnl
|
||||
[case "${enableval}" in
|
||||
none) ;;
|
||||
-*) enable_debug_flags="${enableval}" ;;
|
||||
*) AC_MSG_ERROR([Unknown argument to extra debugging flags]) ;;
|
||||
esac],
|
||||
enable_debug_flags=GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT)dnl
|
||||
|
||||
dnl Option parsed, now set things appropriately
|
||||
case "${enable_debug}" in
|
||||
yes)
|
||||
DEBUG_FLAGS='-O0 -ggdb3'
|
||||
case x"$enable_debug" in
|
||||
xyes)
|
||||
case "$enable_debug_flags" in
|
||||
none)
|
||||
DEBUG_FLAGS="-g3 -O0";;
|
||||
-*) #valid input
|
||||
DEBUG_FLAGS="${enableval}"
|
||||
esac
|
||||
;;
|
||||
no)
|
||||
DEBUG_FLAGS='-g'
|
||||
xno)
|
||||
DEBUG_FLAGS=""
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(DEBUG_FLAGS)
|
||||
|
||||
AC_MSG_CHECKING([for debug build flags])
|
||||
AC_MSG_RESULT($DEBUG_FLAGS)
|
||||
])
|
||||
|
||||
|
||||
|
@ -1097,25 +1145,21 @@ dnl If "default flags" is an empty string (or "none"), the effect is
|
|||
dnl the same as --disable or --enable=no.
|
||||
AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl
|
||||
define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
|
||||
AC_ARG_ENABLE(cxx-flags,
|
||||
AC_ARG_ENABLE(cxx_flags,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-cxx-flags=FLAGS pass compiler FLAGS when building library;
|
||||
[default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT],
|
||||
changequote([, ])dnl
|
||||
[case "x$enableval" in
|
||||
enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT')
|
||||
|
||||
case "x$enable_cxx_flags" in
|
||||
xyes)
|
||||
AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;;
|
||||
xno|x)
|
||||
xno | xnone | x)
|
||||
enable_cxx_flags='' ;;
|
||||
*)
|
||||
enable_cxx_flags="$enableval" ;;
|
||||
esac],
|
||||
enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT')
|
||||
|
||||
dnl Thinko on my part during design. This kludge is the workaround.
|
||||
if test "$enable_cxx_flags" = "none"; then
|
||||
enable_cxx_flags='';
|
||||
fi
|
||||
esac
|
||||
|
||||
dnl Run through flags (either default or command-line) and set anything
|
||||
dnl extra (e.g., #defines) that must accompany particular g++ options.
|
||||
|
@ -1291,23 +1335,19 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
|||
glibcpp_localedir=${glibcpp_builddir}/po/share/locale
|
||||
AC_SUBST(glibcpp_localedir)
|
||||
|
||||
# For the time being, transform ctype_noninline.h to ctype_members_char.cc
|
||||
# CCTYPE_CHAR_CC=config/${os_include_dir}/ctype_noninline.h
|
||||
|
||||
AC_SUBST(USE_NLS)
|
||||
AC_SUBST(CLOCALE_H)
|
||||
AC_SUBST(CCODECVT_H)
|
||||
AC_SUBST(CMESSAGES_H)
|
||||
AC_LINK_FILES($CLOCALE_CC, src/c++locale.cc)
|
||||
AC_LINK_FILES($CCODECVT_CC, src/codecvt_members.cc)
|
||||
AC_LINK_FILES($CCOLLATE_CC, src/collate_members.cc)
|
||||
# AC_LINK_FILES($CCTYPE_CHAR_CC, src/ctype_members_char.cc)
|
||||
AC_LINK_FILES($CCTYPE_CC, src/ctype_members.cc)
|
||||
AC_LINK_FILES($CMESSAGES_CC, src/messages_members.cc)
|
||||
AC_LINK_FILES($CMONEY_CC, src/monetary_members.cc)
|
||||
AC_LINK_FILES($CNUMERIC_CC, src/numeric_members.cc)
|
||||
AC_LINK_FILES($CTIME_CC, src/time_members.cc)
|
||||
AC_LINK_FILES($CLOCALE_INTERNAL_H, src/c++locale_internal.h)
|
||||
AC_SUBST(CCODECVT_CC)
|
||||
AC_SUBST(CCOLLATE_CC)
|
||||
AC_SUBST(CCTYPE_CC)
|
||||
AC_SUBST(CMESSAGES_CC)
|
||||
AC_SUBST(CMONEY_CC)
|
||||
AC_SUBST(CNUMERIC_CC)
|
||||
AC_SUBST(CTIME_CC)
|
||||
AC_SUBST(CLOCALE_CC)
|
||||
AC_SUBST(CLOCALE_INTERNAL_H)
|
||||
])
|
||||
|
||||
|
||||
|
@ -1408,7 +1448,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
|
|||
esac
|
||||
AC_SUBST(CSTDIO_H)
|
||||
AC_SUBST(BASIC_FILE_H)
|
||||
AC_LINK_FILES($BASIC_FILE_CC, src/basic_file.cc)
|
||||
AC_SUBST(BASIC_FILE_CC)
|
||||
|
||||
# 2000-08-04 bkoz hack
|
||||
CCODECVT_C=config/io/c_io_libio_codecvt.c
|
||||
|
@ -1727,7 +1767,7 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
|
|||
|
||||
|
||||
dnl
|
||||
dnl Check for what kind of C headers to use.
|
||||
dnl Check for what type of C headers to use.
|
||||
dnl
|
||||
dnl GLIBCPP_ENABLE_CHEADERS
|
||||
dnl --enable-cheaders= [does stuff].
|
||||
|
@ -1740,7 +1780,7 @@ define([GLIBCPP_ENABLE_CHEADERS_DEFAULT], ifelse($1, c_std, c_std, c_std))dnl
|
|||
AC_MSG_CHECKING([for c header strategy to use])
|
||||
AC_ARG_ENABLE(cheaders,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-cheaders construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT],
|
||||
<< --enable-cheaders=MODEL construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT],
|
||||
changequote([, ])
|
||||
[case "$enableval" in
|
||||
c)
|
||||
|
@ -2235,15 +2275,15 @@ fi
|
|||
dnl Everything parsed; figure out what file to use.
|
||||
case $enable_symvers in
|
||||
no)
|
||||
LINKER_MAP=config/linker-map.dummy
|
||||
SYMVER_MAP=config/linker-map.dummy
|
||||
;;
|
||||
gnu)
|
||||
LINKER_MAP=config/linker-map.gnu
|
||||
SYMVER_MAP=config/linker-map.gnu
|
||||
AC_DEFINE(_GLIBCPP_SYMVER)
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_LINK_FILES($LINKER_MAP, src/linker.map)
|
||||
AC_SUBST(SYMVER_MAP)
|
||||
AM_CONDITIONAL(GLIBCPP_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
|
||||
AC_MSG_CHECKING([versioning on shared library symbols])
|
||||
AC_MSG_RESULT($enable_symvers)
|
||||
|
|
126
libstdc++-v3/aclocal.m4
vendored
126
libstdc++-v3/aclocal.m4
vendored
|
@ -279,8 +279,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES, [
|
|||
# this is the suspicious part
|
||||
CXXFLAGS=''
|
||||
fi
|
||||
if test x"$ac_fdsections" = x"yes" &&
|
||||
test x"$enable_debug" = x"no"; then
|
||||
if test x"$ac_fdsections" = x"yes"; then
|
||||
SECTION_FLAGS='-ffunction-sections -fdata-sections'
|
||||
fi
|
||||
AC_MSG_RESULT($ac_fdsections)
|
||||
|
@ -373,7 +372,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
|
|||
fi
|
||||
|
||||
# Set linker optimization flags.
|
||||
if test x"$with_gnu_ld" = x"yes" && test x"$enable_debug" = x"no"; then
|
||||
if test x"$with_gnu_ld" = x"yes"; then
|
||||
OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
|
||||
fi
|
||||
|
||||
|
@ -923,7 +922,11 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
|
|||
AC_CHECK_FUNCS([__signbitl], , [LIBMATHOBJS="$LIBMATHOBJS signbitl.lo"])
|
||||
fi
|
||||
|
||||
if test -n "$LIBMATHOBJS"; then
|
||||
need_libmath=yes
|
||||
fi
|
||||
AC_SUBST(LIBMATHOBJS)
|
||||
AM_CONDITIONAL(GLIBCPP_BUILD_LIBMATH, test "$need_libmath" = yes)
|
||||
])
|
||||
|
||||
|
||||
|
@ -1055,14 +1058,20 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
|
|||
|
||||
|
||||
dnl
|
||||
dnl Check for special debugging mode; not for production use.
|
||||
dnl Check to see if debugging libraries are to be built.
|
||||
dnl
|
||||
dnl GLIBCPP_ENABLE_DEBUG
|
||||
dnl --enable-debug sets '-ggdb3 -O0'.
|
||||
dnl --disable-debug sets '-g' and whatever optimization options the
|
||||
dnl compiler can handle.
|
||||
dnl + --enable-maintainer-mode automatically defaults this to on.
|
||||
dnl + Perhaps -D/-U of NDEBUG, DEBUG, DEBUG_ASSERT, ...?
|
||||
dnl
|
||||
dnl --enable-debug
|
||||
dnl builds a separate set of debugging libraries in addition to the
|
||||
dnl normal (shared, static) libstdc++ binaries.
|
||||
dnl
|
||||
dnl --disable-debug
|
||||
dnl builds only one (non-debug) version of libstdc++.
|
||||
dnl
|
||||
dnl --enable-debug-flags=FLAGS
|
||||
dnl iff --enable-debug == yes, then use FLAGS to build the debug library.
|
||||
dnl
|
||||
dnl + Usage: GLIBCPP_ENABLE_DEBUG[(DEFAULT)]
|
||||
dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
|
||||
dnl defaults to `no'.
|
||||
|
@ -1078,17 +1087,56 @@ changequote([, ])dnl
|
|||
*) AC_MSG_ERROR([Unknown argument to enable/disable extra debugging]) ;;
|
||||
esac],
|
||||
enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
|
||||
AC_MSG_CHECKING([for additional debug build])
|
||||
AC_MSG_RESULT($enable_debug)
|
||||
AM_CONDITIONAL(GLIBCPP_BUILD_DEBUG, test "$enable_debug" = yes)
|
||||
])
|
||||
|
||||
|
||||
dnl Check for explicit debug flags.
|
||||
dnl
|
||||
dnl GLIBCPP_ENABLE_DEBUG_FLAGS
|
||||
dnl
|
||||
dnl --enable-debug-flags='-O1'
|
||||
dnl is a general method for passing flags to be used when
|
||||
dnl building debug libraries with --enable-debug.
|
||||
dnl
|
||||
dnl --disable-debug-flags does nothing.
|
||||
dnl + Usage: GLIBCPP_ENABLE_DEBUG_FLAGS(default flags)
|
||||
dnl If "default flags" is an empty string (or "none"), the effect is
|
||||
dnl the same as --disable or --enable=no.
|
||||
AC_DEFUN(GLIBCPP_ENABLE_DEBUG_FLAGS, [dnl
|
||||
define([GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
|
||||
AC_ARG_ENABLE(debug_flags,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-debug-flags=FLAGS pass compiler FLAGS when building debug
|
||||
library;[default=>>GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT],
|
||||
changequote([, ])dnl
|
||||
[case "${enableval}" in
|
||||
none) ;;
|
||||
-*) enable_debug_flags="${enableval}" ;;
|
||||
*) AC_MSG_ERROR([Unknown argument to extra debugging flags]) ;;
|
||||
esac],
|
||||
enable_debug_flags=GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT)dnl
|
||||
|
||||
dnl Option parsed, now set things appropriately
|
||||
case "${enable_debug}" in
|
||||
yes)
|
||||
DEBUG_FLAGS='-O0 -ggdb3'
|
||||
case x"$enable_debug" in
|
||||
xyes)
|
||||
case "$enable_debug_flags" in
|
||||
none)
|
||||
DEBUG_FLAGS="-g3 -O0";;
|
||||
-*) #valid input
|
||||
DEBUG_FLAGS="${enableval}"
|
||||
esac
|
||||
;;
|
||||
no)
|
||||
DEBUG_FLAGS='-g'
|
||||
xno)
|
||||
DEBUG_FLAGS=""
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(DEBUG_FLAGS)
|
||||
|
||||
AC_MSG_CHECKING([for debug build flags])
|
||||
AC_MSG_RESULT($DEBUG_FLAGS)
|
||||
])
|
||||
|
||||
|
||||
|
@ -1109,25 +1157,21 @@ dnl If "default flags" is an empty string (or "none"), the effect is
|
|||
dnl the same as --disable or --enable=no.
|
||||
AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl
|
||||
define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
|
||||
AC_ARG_ENABLE(cxx-flags,
|
||||
AC_ARG_ENABLE(cxx_flags,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-cxx-flags=FLAGS pass compiler FLAGS when building library;
|
||||
[default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT],
|
||||
changequote([, ])dnl
|
||||
[case "x$enableval" in
|
||||
enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT')
|
||||
|
||||
case "x$enable_cxx_flags" in
|
||||
xyes)
|
||||
AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;;
|
||||
xno|x)
|
||||
xno | xnone | x)
|
||||
enable_cxx_flags='' ;;
|
||||
*)
|
||||
enable_cxx_flags="$enableval" ;;
|
||||
esac],
|
||||
enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT')
|
||||
|
||||
dnl Thinko on my part during design. This kludge is the workaround.
|
||||
if test "$enable_cxx_flags" = "none"; then
|
||||
enable_cxx_flags='';
|
||||
fi
|
||||
esac
|
||||
|
||||
dnl Run through flags (either default or command-line) and set anything
|
||||
dnl extra (e.g., #defines) that must accompany particular g++ options.
|
||||
|
@ -1303,23 +1347,19 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
|||
glibcpp_localedir=${glibcpp_builddir}/po/share/locale
|
||||
AC_SUBST(glibcpp_localedir)
|
||||
|
||||
# For the time being, transform ctype_noninline.h to ctype_members_char.cc
|
||||
# CCTYPE_CHAR_CC=config/${os_include_dir}/ctype_noninline.h
|
||||
|
||||
AC_SUBST(USE_NLS)
|
||||
AC_SUBST(CLOCALE_H)
|
||||
AC_SUBST(CCODECVT_H)
|
||||
AC_SUBST(CMESSAGES_H)
|
||||
AC_LINK_FILES($CLOCALE_CC, src/c++locale.cc)
|
||||
AC_LINK_FILES($CCODECVT_CC, src/codecvt_members.cc)
|
||||
AC_LINK_FILES($CCOLLATE_CC, src/collate_members.cc)
|
||||
# AC_LINK_FILES($CCTYPE_CHAR_CC, src/ctype_members_char.cc)
|
||||
AC_LINK_FILES($CCTYPE_CC, src/ctype_members.cc)
|
||||
AC_LINK_FILES($CMESSAGES_CC, src/messages_members.cc)
|
||||
AC_LINK_FILES($CMONEY_CC, src/monetary_members.cc)
|
||||
AC_LINK_FILES($CNUMERIC_CC, src/numeric_members.cc)
|
||||
AC_LINK_FILES($CTIME_CC, src/time_members.cc)
|
||||
AC_LINK_FILES($CLOCALE_INTERNAL_H, src/c++locale_internal.h)
|
||||
AC_SUBST(CCODECVT_CC)
|
||||
AC_SUBST(CCOLLATE_CC)
|
||||
AC_SUBST(CCTYPE_CC)
|
||||
AC_SUBST(CMESSAGES_CC)
|
||||
AC_SUBST(CMONEY_CC)
|
||||
AC_SUBST(CNUMERIC_CC)
|
||||
AC_SUBST(CTIME_CC)
|
||||
AC_SUBST(CLOCALE_CC)
|
||||
AC_SUBST(CLOCALE_INTERNAL_H)
|
||||
])
|
||||
|
||||
|
||||
|
@ -1420,7 +1460,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
|
|||
esac
|
||||
AC_SUBST(CSTDIO_H)
|
||||
AC_SUBST(BASIC_FILE_H)
|
||||
AC_LINK_FILES($BASIC_FILE_CC, src/basic_file.cc)
|
||||
AC_SUBST(BASIC_FILE_CC)
|
||||
|
||||
# 2000-08-04 bkoz hack
|
||||
CCODECVT_C=config/io/c_io_libio_codecvt.c
|
||||
|
@ -1739,7 +1779,7 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
|
|||
|
||||
|
||||
dnl
|
||||
dnl Check for what kind of C headers to use.
|
||||
dnl Check for what type of C headers to use.
|
||||
dnl
|
||||
dnl GLIBCPP_ENABLE_CHEADERS
|
||||
dnl --enable-cheaders= [does stuff].
|
||||
|
@ -1752,7 +1792,7 @@ define([GLIBCPP_ENABLE_CHEADERS_DEFAULT], ifelse($1, c_std, c_std, c_std))dnl
|
|||
AC_MSG_CHECKING([for c header strategy to use])
|
||||
AC_ARG_ENABLE(cheaders,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-cheaders construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT],
|
||||
<< --enable-cheaders=MODEL construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT],
|
||||
changequote([, ])
|
||||
[case "$enableval" in
|
||||
c)
|
||||
|
@ -2247,15 +2287,15 @@ fi
|
|||
dnl Everything parsed; figure out what file to use.
|
||||
case $enable_symvers in
|
||||
no)
|
||||
LINKER_MAP=config/linker-map.dummy
|
||||
SYMVER_MAP=config/linker-map.dummy
|
||||
;;
|
||||
gnu)
|
||||
LINKER_MAP=config/linker-map.gnu
|
||||
SYMVER_MAP=config/linker-map.gnu
|
||||
AC_DEFINE(_GLIBCPP_SYMVER)
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_LINK_FILES($LINKER_MAP, src/linker.map)
|
||||
AC_SUBST(SYMVER_MAP)
|
||||
AM_CONDITIONAL(GLIBCPP_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
|
||||
AC_MSG_CHECKING([versioning on shared library symbols])
|
||||
AC_MSG_RESULT($enable_symvers)
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
#include <locale>
|
||||
#include "c++locale_internal.h"
|
||||
|
||||
namespace std
|
||||
{
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include <locale>
|
||||
#include <stdexcept>
|
||||
#include <langinfo.h>
|
||||
#include "c++locale_internal.h"
|
||||
#include <bits/c++locale_internal.h>
|
||||
|
||||
namespace std
|
||||
{
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
#include <locale>
|
||||
#include "c++locale_internal.h"
|
||||
#include <bits/c++locale_internal.h>
|
||||
|
||||
namespace std
|
||||
{
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
#include <locale>
|
||||
#include "c++locale_internal.h"
|
||||
#include <bits/c++locale_internal.h>
|
||||
|
||||
namespace std
|
||||
{
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
#include <locale>
|
||||
#include "c++locale_internal.h"
|
||||
#include <bits/c++locale_internal.h>
|
||||
|
||||
namespace std
|
||||
{
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
#include <locale>
|
||||
#include "c++locale_internal.h"
|
||||
#include <bits/c++locale_internal.h>
|
||||
|
||||
namespace std
|
||||
{
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
#include <locale>
|
||||
#include "c++locale_internal.h"
|
||||
#include <bits/c++locale_internal.h>
|
||||
|
||||
namespace std
|
||||
{
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
#include <locale>
|
||||
#include "c++locale_internal.h"
|
||||
#include <bits/c++locale_internal.h>
|
||||
|
||||
namespace std
|
||||
{
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
#include <locale>
|
||||
#include "c++locale_internal.h"
|
||||
#include <bits/c++locale_internal.h>
|
||||
|
||||
namespace std
|
||||
{
|
||||
|
|
4016
libstdc++-v3/configure
vendored
4016
libstdc++-v3/configure
vendored
File diff suppressed because it is too large
Load diff
|
@ -54,18 +54,19 @@ AC_SUBST(enable_static)
|
|||
GLIBCPP_CHECK_GNU_MAKE
|
||||
|
||||
# Enable all the variable C++ stuff. C_MBCHAR must come early.
|
||||
GLIBCPP_ENABLE_DEBUG($USE_MAINTAINER_MODE)
|
||||
GLIBCPP_ENABLE_CSTDIO
|
||||
GLIBCPP_ENABLE_CLOCALE
|
||||
GLIBCPP_ENABLE_CHEADERS([$c_model])
|
||||
GLIBCPP_ENABLE_C_MBCHAR([yes])
|
||||
GLIBCPP_ENABLE_C99([yes])
|
||||
GLIBCPP_ENABLE_LONG_LONG([yes])
|
||||
GLIBCPP_ENABLE_CHEADERS([$c_model])
|
||||
GLIBCPP_ENABLE_THREADS
|
||||
GLIBCPP_ENABLE_CXX_FLAGS([none])
|
||||
GLIBCPP_ENABLE_SJLJ_EXCEPTIONS
|
||||
GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS
|
||||
GLIBCPP_ENABLE_CONCEPT_CHECKS
|
||||
GLIBCPP_ENABLE_CXX_FLAGS([none])
|
||||
GLIBCPP_ENABLE_DEBUG([no])
|
||||
GLIBCPP_ENABLE_DEBUG_FLAGS([none])
|
||||
|
||||
# Check for headers necessary for libsupc++ using dyn-string.c/cxa_demangle.c
|
||||
AC_CHECK_HEADERS(string.h stdlib.h)
|
||||
|
@ -451,7 +452,7 @@ fi
|
|||
# Export all the install information
|
||||
GLIBCPP_EXPORT_INSTALL_INFO
|
||||
|
||||
# Export all the include and flag information to makefiles.
|
||||
# Export all the include and flag information to Makefiles.
|
||||
GLIBCPP_EXPORT_INCLUDES
|
||||
GLIBCPP_EXPORT_FLAGS
|
||||
|
||||
|
@ -473,11 +474,14 @@ AC_OUTPUT(Makefile \
|
|||
include/Makefile src/Makefile \
|
||||
libmath/Makefile libio/Makefile libsupc++/Makefile \
|
||||
po/Makefile testsuite/Makefile mkcheck testsuite_flags,
|
||||
[if test -n "$CONFIG_FILES"; then
|
||||
LD="${ORIGINAL_LD_FOR_MULTILIBS}"
|
||||
ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
|
||||
grep '^MULTISUBDIR =' Makefile >> src/Makefile
|
||||
grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
|
||||
[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
|
||||
if test -n "$CONFIG_FILES"; then
|
||||
if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
|
||||
LD="${ORIGINAL_LD_FOR_MULTILIBS}"
|
||||
ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
|
||||
grep '^MULTISUBDIR =' Makefile >> src/Makefile
|
||||
grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
|
||||
fi
|
||||
fi
|
||||
chmod +x mkcheck
|
||||
chmod +x testsuite_flags
|
||||
|
|
|
@ -76,23 +76,11 @@ options</a></h1>
|
|||
<dd><p>Adds support for named libstdc++ include directory. For instance,
|
||||
the following puts all the libstdc++ headers into a directory
|
||||
called "2.97-20001008" instead of the usual
|
||||
"g++-v3".
|
||||
"c++/(version)".
|
||||
</p>
|
||||
<pre>
|
||||
--with-gxx-include-dir=/foo/H-x86-gcc-3-c-gxx-inc/include/2.97-20001008</pre> </dd>
|
||||
|
||||
<dt><code>--enable-debug </code></dt>
|
||||
<dd><p>The configure script will automatically detect the highest
|
||||
level of optimization that the compiler in use can use.
|
||||
This --enable flag will disable all optimizations and instruct
|
||||
the compiler to emit as much extra debugging information as it
|
||||
can, for use inside GDB. Note this make command, executed in
|
||||
the build directory, will do much the same thing, without the
|
||||
configuration difference:
|
||||
<code>make CXXFLAGS='-g -O0' all</code>
|
||||
</p>
|
||||
</dd>
|
||||
|
||||
<dt><code>--enable-cstdio </code></dt>
|
||||
<dd><p>This is an abbreviated form of <code>'--enable-cstdio=stdio'</code>
|
||||
(described next). This option can change the library ABI.
|
||||
|
@ -157,6 +145,34 @@ options</a></h1>
|
|||
</p>
|
||||
</dd>
|
||||
|
||||
<dt><code>--enable-debug </code></dt>
|
||||
<dd><p>Build separate debug libraries in addition to what is normally built.
|
||||
By default, the debug libraries are compiled with
|
||||
<code> CXXFLAGS='-g3 -O0'</code>
|
||||
, are installed in <code>${libdir}/debug</code>, and have the
|
||||
same names and versioning information as the non-debug
|
||||
libraries. This option is off by default.
|
||||
<p>
|
||||
Note this make command, executed in
|
||||
the build directory, will do much the same thing, without the
|
||||
configuration difference and without building everything twice:
|
||||
<code>make CXXFLAGS='-g3 -O0' all</code>
|
||||
</p>
|
||||
</p>
|
||||
</dd>
|
||||
|
||||
<dt><code>--enable-debug-flags=FLAGS</code></dt>
|
||||
|
||||
<dd><p>This option is only valid when <code> --enable-debug </code>
|
||||
is also specified, and applies to the debug builds only. With
|
||||
this option, you can pass a specific string of flags to the
|
||||
compiler to use when building the debug versions of libstdc++.
|
||||
FLAGS is a quoted string of options, like
|
||||
</p>
|
||||
<pre>
|
||||
--enable-debug-flags='-g3 -O1 -gdwarf-2'</pre>
|
||||
</dd>
|
||||
|
||||
<dt><code>--enable-cxx-flags=FLAGS</code></dt>
|
||||
<dd><p>With this option, you can pass a string of -f (functionality)
|
||||
flags to the compiler to use when building libstdc++. This
|
||||
|
@ -238,12 +254,13 @@ options</a></h1>
|
|||
</dd>
|
||||
|
||||
<dt><code>--enable-symvers[=style] </code></dt>
|
||||
<dd><p>In 3.1, tries to turn on symbol versioning in the shared library (if a
|
||||
shared library has been requested). The only 'style' currently
|
||||
supported is 'gnu' which requires that a recent version of the GNU
|
||||
linker be in use. With no style given, the configure script will
|
||||
try to guess if the 'gnu' style can be used, and if so, will turn it
|
||||
on. Hopefully people will volunteer to do other 'style' options.
|
||||
<dd><p>In 3.1 and later, tries to turn on symbol versioning in the
|
||||
shared library (if a shared library has been requested). The
|
||||
only 'style' currently supported is 'gnu' which requires that
|
||||
a recent version of the GNU linker be in use. With no style
|
||||
given, the configure script will try to guess if the 'gnu'
|
||||
style can be used, and if so, will turn it on. Hopefully
|
||||
people will volunteer to do other 'style' options.
|
||||
</p>
|
||||
</dd>
|
||||
</dl>
|
||||
|
|
|
@ -312,6 +312,11 @@ target_headers = \
|
|||
${target_srcdir}/ctype_noninline.h \
|
||||
${target_srcdir}/os_defines.h \
|
||||
${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h
|
||||
|
||||
# Non-installed target_header files.
|
||||
target_headers_noinst = \
|
||||
${glibcpp_srcdir}/@CLOCALE_INTERNAL_H@
|
||||
|
||||
# These target_headers_extra files are all built with ad hoc naming rules.
|
||||
target_headers_extra = \
|
||||
${target_builddir}/basic_file.h \
|
||||
|
@ -331,8 +336,7 @@ thread_target_headers = \
|
|||
# CLEANFILES and all-local are kept up-to-date.
|
||||
allstamps = \
|
||||
stamp-std stamp-bits stamp-c_base stamp-c_compatibility \
|
||||
stamp-backward stamp-ext \
|
||||
${target_builddir}/stamp-target
|
||||
stamp-backward stamp-ext stamp-target
|
||||
|
||||
|
||||
# Here are the rules for building the headers
|
||||
|
@ -400,16 +404,18 @@ stamp-${target_alias}:
|
|||
fi
|
||||
|
||||
# Target includes static.
|
||||
${target_builddir}/stamp-target: ${target_headers} stamp-${target_alias}
|
||||
@cd ${target_builddir} ;\
|
||||
if [ ! -f stamp-target ]; then \
|
||||
# XXX Missing dependency info for {target_headers_extra}
|
||||
stamp-target: ${target_headers} ${target_headers_noinst} stamp-${target_alias}
|
||||
@if [ ! -f stamp-target ]; then \
|
||||
(cd ${target_builddir} ;\
|
||||
@LN_S@ ${target_headers} . || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@CSTDIO_H@ c++io.h || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true ;\
|
||||
echo `date` > stamp-target; \
|
||||
@LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
|
||||
echo `date` > stamp-target ; \
|
||||
fi
|
||||
|
||||
# Target includes dynamic.
|
||||
|
|
|
@ -67,14 +67,24 @@ AR = @AR@
|
|||
AS = @AS@
|
||||
ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
|
||||
AWK = @AWK@
|
||||
BASIC_FILE_CC = @BASIC_FILE_CC@
|
||||
BASIC_FILE_H = @BASIC_FILE_H@
|
||||
CC = @CC@
|
||||
CCODECVT_C = @CCODECVT_C@
|
||||
CCODECVT_CC = @CCODECVT_CC@
|
||||
CCODECVT_H = @CCODECVT_H@
|
||||
CCOLLATE_CC = @CCOLLATE_CC@
|
||||
CCTYPE_CC = @CCTYPE_CC@
|
||||
CLOCALE_CC = @CLOCALE_CC@
|
||||
CLOCALE_H = @CLOCALE_H@
|
||||
CLOCALE_INTERNAL_H = @CLOCALE_INTERNAL_H@
|
||||
CMESSAGES_CC = @CMESSAGES_CC@
|
||||
CMESSAGES_H = @CMESSAGES_H@
|
||||
CMONEY_CC = @CMONEY_CC@
|
||||
CNUMERIC_CC = @CNUMERIC_CC@
|
||||
CPP = @CPP@
|
||||
CSTDIO_H = @CSTDIO_H@
|
||||
CTIME_CC = @CTIME_CC@
|
||||
CXXCPP = @CXXCPP@
|
||||
C_INCLUDE_DIR = @C_INCLUDE_DIR@
|
||||
DEBUG_FLAGS = @DEBUG_FLAGS@
|
||||
|
@ -105,6 +115,7 @@ RANLIB = @RANLIB@
|
|||
SECTION_FLAGS = @SECTION_FLAGS@
|
||||
SECTION_LDFLAGS = @SECTION_LDFLAGS@
|
||||
STRIP = @STRIP@
|
||||
SYMVER_MAP = @SYMVER_MAP@
|
||||
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
|
@ -415,6 +426,12 @@ target_headers = \
|
|||
${target_srcdir}/os_defines.h \
|
||||
${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h
|
||||
|
||||
|
||||
# Non-installed target_header files.
|
||||
target_headers_noinst = \
|
||||
${glibcpp_srcdir}/@CLOCALE_INTERNAL_H@
|
||||
|
||||
|
||||
# These target_headers_extra files are all built with ad hoc naming rules.
|
||||
target_headers_extra = \
|
||||
${target_builddir}/basic_file.h \
|
||||
|
@ -436,8 +453,7 @@ thread_target_headers = \
|
|||
# CLEANFILES and all-local are kept up-to-date.
|
||||
allstamps = \
|
||||
stamp-std stamp-bits stamp-c_base stamp-c_compatibility \
|
||||
stamp-backward stamp-ext \
|
||||
${target_builddir}/stamp-target
|
||||
stamp-backward stamp-ext stamp-target
|
||||
|
||||
|
||||
# Target includes for threads
|
||||
|
@ -620,16 +636,18 @@ stamp-${target_alias}:
|
|||
fi
|
||||
|
||||
# Target includes static.
|
||||
${target_builddir}/stamp-target: ${target_headers} stamp-${target_alias}
|
||||
@cd ${target_builddir} ;\
|
||||
if [ ! -f stamp-target ]; then \
|
||||
# XXX Missing dependency info for {target_headers_extra}
|
||||
stamp-target: ${target_headers} ${target_headers_noinst} stamp-${target_alias}
|
||||
@if [ ! -f stamp-target ]; then \
|
||||
(cd ${target_builddir} ;\
|
||||
@LN_S@ ${target_headers} . || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@CSTDIO_H@ c++io.h || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
|
||||
@LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true ;\
|
||||
echo `date` > stamp-target; \
|
||||
@LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
|
||||
echo `date` > stamp-target ; \
|
||||
fi
|
||||
|
||||
# Target includes dynamic.
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
2002-12-13 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* Makefile.am (AM_CFLAGS): Remove DEBUG_FLAGS.
|
||||
|
||||
2001-02-03 Alexandre Oliva <aoliva@redhat.com>
|
||||
Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
|
||||
|
||||
|
|
|
@ -64,4 +64,4 @@ EXTRA_DIST = iostreamP.h
|
|||
libio_la_SOURCES = $(LIBIO_SRCS) $(LIBIO_WSRCS)
|
||||
|
||||
|
||||
AM_CFLAGS = -D_GNU_SOURCE @DEBUG_FLAGS@
|
||||
AM_CFLAGS = -D_GNU_SOURCE
|
||||
|
|
|
@ -67,14 +67,24 @@ AR = @AR@
|
|||
AS = @AS@
|
||||
ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
|
||||
AWK = @AWK@
|
||||
BASIC_FILE_CC = @BASIC_FILE_CC@
|
||||
BASIC_FILE_H = @BASIC_FILE_H@
|
||||
CC = @CC@
|
||||
CCODECVT_C = @CCODECVT_C@
|
||||
CCODECVT_CC = @CCODECVT_CC@
|
||||
CCODECVT_H = @CCODECVT_H@
|
||||
CCOLLATE_CC = @CCOLLATE_CC@
|
||||
CCTYPE_CC = @CCTYPE_CC@
|
||||
CLOCALE_CC = @CLOCALE_CC@
|
||||
CLOCALE_H = @CLOCALE_H@
|
||||
CLOCALE_INTERNAL_H = @CLOCALE_INTERNAL_H@
|
||||
CMESSAGES_CC = @CMESSAGES_CC@
|
||||
CMESSAGES_H = @CMESSAGES_H@
|
||||
CMONEY_CC = @CMONEY_CC@
|
||||
CNUMERIC_CC = @CNUMERIC_CC@
|
||||
CPP = @CPP@
|
||||
CSTDIO_H = @CSTDIO_H@
|
||||
CTIME_CC = @CTIME_CC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
C_INCLUDE_DIR = @C_INCLUDE_DIR@
|
||||
|
@ -104,6 +114,7 @@ RANLIB = @RANLIB@
|
|||
SECTION_FLAGS = @SECTION_FLAGS@
|
||||
SECTION_LDFLAGS = @SECTION_LDFLAGS@
|
||||
STRIP = @STRIP@
|
||||
SYMVER_MAP = @SYMVER_MAP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
|
@ -160,7 +171,7 @@ EXTRA_DIST = iostreamP.h
|
|||
|
||||
libio_la_SOURCES = $(LIBIO_SRCS) $(LIBIO_WSRCS)
|
||||
|
||||
AM_CFLAGS = -D_GNU_SOURCE @DEBUG_FLAGS@
|
||||
AM_CFLAGS = -D_GNU_SOURCE
|
||||
CONFIG_HEADER = ../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
LTLIBRARIES = $(noinst_LTLIBRARIES)
|
||||
|
|
|
@ -67,14 +67,24 @@ AR = @AR@
|
|||
AS = @AS@
|
||||
ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
|
||||
AWK = @AWK@
|
||||
BASIC_FILE_CC = @BASIC_FILE_CC@
|
||||
BASIC_FILE_H = @BASIC_FILE_H@
|
||||
CC = @CC@
|
||||
CCODECVT_C = @CCODECVT_C@
|
||||
CCODECVT_CC = @CCODECVT_CC@
|
||||
CCODECVT_H = @CCODECVT_H@
|
||||
CCOLLATE_CC = @CCOLLATE_CC@
|
||||
CCTYPE_CC = @CCTYPE_CC@
|
||||
CLOCALE_CC = @CLOCALE_CC@
|
||||
CLOCALE_H = @CLOCALE_H@
|
||||
CLOCALE_INTERNAL_H = @CLOCALE_INTERNAL_H@
|
||||
CMESSAGES_CC = @CMESSAGES_CC@
|
||||
CMESSAGES_H = @CMESSAGES_H@
|
||||
CMONEY_CC = @CMONEY_CC@
|
||||
CNUMERIC_CC = @CNUMERIC_CC@
|
||||
CPP = @CPP@
|
||||
CSTDIO_H = @CSTDIO_H@
|
||||
CTIME_CC = @CTIME_CC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
C_INCLUDE_DIR = @C_INCLUDE_DIR@
|
||||
|
@ -105,6 +115,7 @@ RANLIB = @RANLIB@
|
|||
SECTION_FLAGS = @SECTION_FLAGS@
|
||||
SECTION_LDFLAGS = @SECTION_LDFLAGS@
|
||||
STRIP = @STRIP@
|
||||
SYMVER_MAP = @SYMVER_MAP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
|
|
|
@ -49,7 +49,7 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
|
|||
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
|
||||
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
|
||||
CONFIG_CXXFLAGS = \
|
||||
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@
|
||||
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@
|
||||
|
||||
# Warning flags to use.
|
||||
WARN_CXXFLAGS = \
|
||||
|
|
|
@ -67,13 +67,23 @@ AR = @AR@
|
|||
AS = @AS@
|
||||
ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
|
||||
AWK = @AWK@
|
||||
BASIC_FILE_CC = @BASIC_FILE_CC@
|
||||
BASIC_FILE_H = @BASIC_FILE_H@
|
||||
CCODECVT_C = @CCODECVT_C@
|
||||
CCODECVT_CC = @CCODECVT_CC@
|
||||
CCODECVT_H = @CCODECVT_H@
|
||||
CCOLLATE_CC = @CCOLLATE_CC@
|
||||
CCTYPE_CC = @CCTYPE_CC@
|
||||
CLOCALE_CC = @CLOCALE_CC@
|
||||
CLOCALE_H = @CLOCALE_H@
|
||||
CLOCALE_INTERNAL_H = @CLOCALE_INTERNAL_H@
|
||||
CMESSAGES_CC = @CMESSAGES_CC@
|
||||
CMESSAGES_H = @CMESSAGES_H@
|
||||
CMONEY_CC = @CMONEY_CC@
|
||||
CNUMERIC_CC = @CNUMERIC_CC@
|
||||
CPP = @CPP@
|
||||
CSTDIO_H = @CSTDIO_H@
|
||||
CTIME_CC = @CTIME_CC@
|
||||
CXXCPP = @CXXCPP@
|
||||
C_INCLUDE_DIR = @C_INCLUDE_DIR@
|
||||
DEBUG_FLAGS = @DEBUG_FLAGS@
|
||||
|
@ -101,6 +111,7 @@ RANLIB = @RANLIB@
|
|||
SECTION_FLAGS = @SECTION_FLAGS@
|
||||
SECTION_LDFLAGS = @SECTION_LDFLAGS@
|
||||
STRIP = @STRIP@
|
||||
SYMVER_MAP = @SYMVER_MAP@
|
||||
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
|
@ -153,7 +164,7 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
|
|||
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
|
||||
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
|
||||
CONFIG_CXXFLAGS = \
|
||||
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@
|
||||
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@
|
||||
|
||||
|
||||
# Warning flags to use.
|
||||
|
|
|
@ -67,14 +67,24 @@ AR = @AR@
|
|||
AS = @AS@
|
||||
ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
|
||||
AWK = @AWK@
|
||||
BASIC_FILE_CC = @BASIC_FILE_CC@
|
||||
BASIC_FILE_H = @BASIC_FILE_H@
|
||||
CC = @CC@
|
||||
CCODECVT_C = @CCODECVT_C@
|
||||
CCODECVT_CC = @CCODECVT_CC@
|
||||
CCODECVT_H = @CCODECVT_H@
|
||||
CCOLLATE_CC = @CCOLLATE_CC@
|
||||
CCTYPE_CC = @CCTYPE_CC@
|
||||
CLOCALE_CC = @CLOCALE_CC@
|
||||
CLOCALE_H = @CLOCALE_H@
|
||||
CLOCALE_INTERNAL_H = @CLOCALE_INTERNAL_H@
|
||||
CMESSAGES_CC = @CMESSAGES_CC@
|
||||
CMESSAGES_H = @CMESSAGES_H@
|
||||
CMONEY_CC = @CMONEY_CC@
|
||||
CNUMERIC_CC = @CNUMERIC_CC@
|
||||
CPP = @CPP@
|
||||
CSTDIO_H = @CSTDIO_H@
|
||||
CTIME_CC = @CTIME_CC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
C_INCLUDE_DIR = @C_INCLUDE_DIR@
|
||||
|
@ -105,6 +115,7 @@ RANLIB = @RANLIB@
|
|||
SECTION_FLAGS = @SECTION_FLAGS@
|
||||
SECTION_LDFLAGS = @SECTION_LDFLAGS@
|
||||
STRIP = @STRIP@
|
||||
SYMVER_MAP = @SYMVER_MAP@
|
||||
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
|
|
|
@ -29,19 +29,30 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
|
|||
|
||||
# Cross compiler support.
|
||||
CXX = @glibcpp_CXX@
|
||||
glibcpp_srcdir=@glibcpp_srcdir@
|
||||
glibcpp_builddir=@glibcpp_builddir@
|
||||
toolexecdir = @glibcpp_toolexecdir@
|
||||
toolexeclibdir = @glibcpp_toolexeclibdir@
|
||||
toolexeclib_LTLIBRARIES = libstdc++.la
|
||||
|
||||
# Symbol versioning for shared libraries.
|
||||
if GLIBCPP_BUILD_VERSIONED_SHLIB
|
||||
version_arg = -Wl,--version-script=libstdc++-symbol.ver
|
||||
libstdc++-symbol.ver: ${glibcpp_srcdir}/@SYMVER_MAP@
|
||||
@LN_S@ $< ./libstdc++-symbol.ver || true
|
||||
else
|
||||
version_arg =
|
||||
libstdc++-symbol.ver:
|
||||
endif
|
||||
|
||||
# Compile flags that should be constant throughout the build, both for
|
||||
# SUBDIRS and for libstdc++-v3 in general.
|
||||
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
|
||||
|
||||
# These bits are all figured out from configure. Look in acinclude.m4
|
||||
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
|
||||
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
|
||||
CONFIG_CXXFLAGS = \
|
||||
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@
|
||||
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@
|
||||
|
||||
# Warning flags to use.
|
||||
WARN_CXXFLAGS = \
|
||||
|
@ -60,7 +71,8 @@ INCLUDES = \
|
|||
$(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \
|
||||
$(TOPLEVEL_INCLUDES)
|
||||
|
||||
# Source files linked in via configuration magic for a particular target.
|
||||
# Source files linked in via configuration/make substitution for a
|
||||
# particular target.
|
||||
target_sources = \
|
||||
codecvt_members.cc \
|
||||
collate_members.cc \
|
||||
|
@ -70,12 +82,39 @@ target_sources = \
|
|||
numeric_members.cc \
|
||||
time_members.cc
|
||||
|
||||
# Source files linked in via configuration magic for a particular
|
||||
# target, but with ad hoc naming rules.
|
||||
codecvt_members.cc: ${glibcpp_srcdir}/@CCODECVT_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
collate_members.cc: ${glibcpp_srcdir}/@CCOLLATE_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
ctype_members.cc: ${glibcpp_srcdir}/@CCTYPE_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
messages_members.cc: ${glibcpp_srcdir}/@CMESSAGES_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
monetary_members.cc: ${glibcpp_srcdir}/@CMONEY_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
numeric_members.cc: ${glibcpp_srcdir}/@CNUMERIC_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
time_members.cc: ${glibcpp_srcdir}/@CTIME_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
# Source files linked in via configuration/make substitution for a
|
||||
# particular target, but with ad hoc naming rules.
|
||||
target_sources_extra = \
|
||||
basic_file.cc \
|
||||
c++locale.cc
|
||||
|
||||
c++locale.cc: ${glibcpp_srcdir}/@CLOCALE_CC@
|
||||
@LN_S@ $< ./$@ || true
|
||||
|
||||
basic_file.cc: ${glibcpp_srcdir}/@BASIC_FILE_CC@
|
||||
@LN_S@ $< ./$@ || true
|
||||
|
||||
# Sources present in the src directory.
|
||||
sources = \
|
||||
bitset.cc \
|
||||
|
@ -114,20 +153,15 @@ VPATH = $(top_srcdir)/src:$(top_srcdir)
|
|||
libstdc___la_SOURCES = $(sources)
|
||||
|
||||
libstdc___la_LIBADD = \
|
||||
../libmath/libmath.la @libio_la@ \
|
||||
../libsupc++/libsupc++convenience.la
|
||||
$(top_builddir)/libmath/libmath.la @libio_la@ \
|
||||
$(top_builddir)/libsupc++/libsupc++convenience.la
|
||||
|
||||
if GLIBCPP_BUILD_VERSIONED_SHLIB
|
||||
version_arg=-Wl,--version-script=linker.map
|
||||
else
|
||||
version_arg=
|
||||
endif
|
||||
libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD)
|
||||
|
||||
libstdc___la_LDFLAGS = \
|
||||
-version-info @libtool_VERSION@ ${version_arg} \
|
||||
-lm @LIBUNWIND_FLAG@
|
||||
|
||||
libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD) linker.map
|
||||
|
||||
# Use special rules for the deprecated source files so that they find
|
||||
# deprecated include files.
|
||||
|
@ -150,7 +184,7 @@ concept-inst.o: concept-inst.cc
|
|||
# modified in a per-library or per-sub-library way. Need to manually
|
||||
# set this option because CONFIG_CXXFLAGS has to be after
|
||||
# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
|
||||
# as the occasion call for it. (ie, --enable-debug)
|
||||
# as the occasion call for it.
|
||||
AM_CXXFLAGS = \
|
||||
-fno-implicit-templates \
|
||||
$(LIBSUPCXX_CXXFLAGS) \
|
||||
|
@ -188,3 +222,38 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
|
|||
# compilation driver.
|
||||
CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
|
||||
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
|
||||
# Added bits to build debug library.
|
||||
if GLIBCPP_BUILD_DEBUG
|
||||
all-local: build_debug
|
||||
install-data-local: install_debug
|
||||
else
|
||||
all-local:
|
||||
install-data-local:
|
||||
endif
|
||||
|
||||
debugdir = debug
|
||||
|
||||
# Build parallel set of debug objects here.
|
||||
stamp-debug:
|
||||
if test ! -d ${debugdir}; then \
|
||||
mkdir -p ${debugdir}; \
|
||||
(cd ${debugdir}; \
|
||||
cp ../Makefile .; \
|
||||
sed 's/top_builddir = ../top_builddir = ..\/../g' \
|
||||
< Makefile > temp.1; \
|
||||
sed 's/all-local: build_debug/all-local:/g' < temp.1 > temp.2; \
|
||||
sed 's/install-data-local: install_debug/install-data-local:/g' \
|
||||
< temp.2 > temp.3; \
|
||||
mv temp.3 Makefile) ; \
|
||||
fi; \
|
||||
echo `date` > stamp-debug;
|
||||
|
||||
build_debug: stamp-debug
|
||||
(cd ${debugdir} && $(MAKE) CXXFLAGS='@DEBUG_FLAGS@' all)
|
||||
|
||||
# Install debug library here.
|
||||
install_debug:
|
||||
(cd ${debugdir} && $(MAKE) \
|
||||
toolexeclibdir=@glibcpp_toolexeclibdir@/debug install)
|
||||
|
|
|
@ -66,14 +66,24 @@ AR = @AR@
|
|||
AS = @AS@
|
||||
ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
|
||||
AWK = @AWK@
|
||||
BASIC_FILE_CC = @BASIC_FILE_CC@
|
||||
BASIC_FILE_H = @BASIC_FILE_H@
|
||||
CC = @CC@
|
||||
CCODECVT_C = @CCODECVT_C@
|
||||
CCODECVT_CC = @CCODECVT_CC@
|
||||
CCODECVT_H = @CCODECVT_H@
|
||||
CCOLLATE_CC = @CCOLLATE_CC@
|
||||
CCTYPE_CC = @CCTYPE_CC@
|
||||
CLOCALE_CC = @CLOCALE_CC@
|
||||
CLOCALE_H = @CLOCALE_H@
|
||||
CLOCALE_INTERNAL_H = @CLOCALE_INTERNAL_H@
|
||||
CMESSAGES_CC = @CMESSAGES_CC@
|
||||
CMESSAGES_H = @CMESSAGES_H@
|
||||
CMONEY_CC = @CMONEY_CC@
|
||||
CNUMERIC_CC = @CNUMERIC_CC@
|
||||
CPP = @CPP@
|
||||
CSTDIO_H = @CSTDIO_H@
|
||||
CTIME_CC = @CTIME_CC@
|
||||
CXXCPP = @CXXCPP@
|
||||
C_INCLUDE_DIR = @C_INCLUDE_DIR@
|
||||
DEBUG_FLAGS = @DEBUG_FLAGS@
|
||||
|
@ -99,6 +109,7 @@ RANLIB = @RANLIB@
|
|||
SECTION_FLAGS = @SECTION_FLAGS@
|
||||
SECTION_LDFLAGS = @SECTION_LDFLAGS@
|
||||
STRIP = @STRIP@
|
||||
SYMVER_MAP = @SYMVER_MAP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
|
@ -111,10 +122,8 @@ glibcpp_CXX = @glibcpp_CXX@
|
|||
glibcpp_MOFILES = @glibcpp_MOFILES@
|
||||
glibcpp_POFILES = @glibcpp_POFILES@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
glibcpp_builddir = @glibcpp_builddir@
|
||||
glibcpp_localedir = @glibcpp_localedir@
|
||||
glibcpp_prefixdir = @glibcpp_prefixdir@
|
||||
glibcpp_srcdir = @glibcpp_srcdir@
|
||||
glibcpp_thread_h = @glibcpp_thread_h@
|
||||
glibcpp_toolexecdir = @glibcpp_toolexecdir@
|
||||
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
|
||||
|
@ -131,9 +140,13 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
|
|||
|
||||
# Cross compiler support.
|
||||
CXX = @glibcpp_CXX@
|
||||
glibcpp_srcdir = @glibcpp_srcdir@
|
||||
glibcpp_builddir = @glibcpp_builddir@
|
||||
toolexecdir = @glibcpp_toolexecdir@
|
||||
toolexeclibdir = @glibcpp_toolexeclibdir@
|
||||
toolexeclib_LTLIBRARIES = libstdc++.la
|
||||
@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_arg = @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@-Wl,--version-script=libstdc++-symbol.ver
|
||||
@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@version_arg =
|
||||
|
||||
# Compile flags that should be constant throughout the build, both for
|
||||
# SUBDIRS and for libstdc++-v3 in general.
|
||||
|
@ -141,9 +154,8 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
|
|||
|
||||
# These bits are all figured out from configure. Look in acinclude.m4
|
||||
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
|
||||
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
|
||||
CONFIG_CXXFLAGS = \
|
||||
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@
|
||||
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@
|
||||
|
||||
|
||||
# Warning flags to use.
|
||||
|
@ -165,7 +177,8 @@ INCLUDES = \
|
|||
$(TOPLEVEL_INCLUDES)
|
||||
|
||||
|
||||
# Source files linked in via configuration magic for a particular target.
|
||||
# Source files linked in via configuration/make substitution for a
|
||||
# particular target.
|
||||
target_sources = \
|
||||
codecvt_members.cc \
|
||||
collate_members.cc \
|
||||
|
@ -176,8 +189,8 @@ target_sources = \
|
|||
time_members.cc
|
||||
|
||||
|
||||
# Source files linked in via configuration magic for a particular
|
||||
# target, but with ad hoc naming rules.
|
||||
# Source files linked in via configuration/make substitution for a
|
||||
# particular target, but with ad hoc naming rules.
|
||||
target_sources_extra = \
|
||||
basic_file.cc \
|
||||
c++locale.cc
|
||||
|
@ -222,19 +235,17 @@ VPATH = $(top_srcdir)/src:$(top_srcdir)
|
|||
libstdc___la_SOURCES = $(sources)
|
||||
|
||||
libstdc___la_LIBADD = \
|
||||
../libmath/libmath.la @libio_la@ \
|
||||
../libsupc++/libsupc++convenience.la
|
||||
$(top_builddir)/libmath/libmath.la @libio_la@ \
|
||||
$(top_builddir)/libsupc++/libsupc++convenience.la
|
||||
|
||||
@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_arg = @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@-Wl,--version-script=linker.map
|
||||
@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@version_arg =
|
||||
|
||||
libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD)
|
||||
|
||||
libstdc___la_LDFLAGS = \
|
||||
-version-info @libtool_VERSION@ ${version_arg} \
|
||||
-lm @LIBUNWIND_FLAG@
|
||||
|
||||
|
||||
libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD) linker.map
|
||||
|
||||
# Use special rules for the deprecated source files so that they find
|
||||
# deprecated include files.
|
||||
GLIBCPP_INCLUDE_DIR = @glibcpp_builddir@/include
|
||||
|
@ -283,6 +294,8 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
|
|||
CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
|
||||
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
|
||||
debugdir = debug
|
||||
CONFIG_HEADER = ../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
|
||||
|
@ -460,7 +473,7 @@ install-info: install-info-am
|
|||
install-exec-am: install-toolexeclibLTLIBRARIES
|
||||
install-exec: install-exec-am
|
||||
|
||||
install-data-am:
|
||||
install-data-am: install-data-local
|
||||
install-data: install-data-am
|
||||
|
||||
install-am: all-am
|
||||
|
@ -468,7 +481,7 @@ install-am: all-am
|
|||
install: install-am
|
||||
uninstall-am: uninstall-toolexeclibLTLIBRARIES
|
||||
uninstall: uninstall-am
|
||||
all-am: Makefile $(LTLIBRARIES)
|
||||
all-am: Makefile $(LTLIBRARIES) all-local
|
||||
all-redirect: all-am
|
||||
install-strip:
|
||||
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
|
||||
|
@ -521,11 +534,42 @@ maintainer-clean-compile mostlyclean-libtool distclean-libtool \
|
|||
clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
|
||||
distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
|
||||
dvi-am dvi check check-am installcheck-am installcheck install-info-am \
|
||||
install-info install-exec-am install-exec install-data-am install-data \
|
||||
install-am install uninstall-am uninstall all-redirect all-am all \
|
||||
installdirs mostlyclean-generic distclean-generic clean-generic \
|
||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||
install-info install-exec-am install-exec install-data-local \
|
||||
install-data-am install-data install-am install uninstall-am uninstall \
|
||||
all-local all-redirect all-am all installdirs mostlyclean-generic \
|
||||
distclean-generic clean-generic maintainer-clean-generic clean \
|
||||
mostlyclean distclean maintainer-clean
|
||||
|
||||
@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver: ${glibcpp_srcdir}/@SYMVER_MAP@
|
||||
@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@ @LN_S@ $< ./libstdc++-symbol.ver || true
|
||||
@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@libstdc++-symbol.ver:
|
||||
|
||||
codecvt_members.cc: ${glibcpp_srcdir}/@CCODECVT_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
collate_members.cc: ${glibcpp_srcdir}/@CCOLLATE_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
ctype_members.cc: ${glibcpp_srcdir}/@CCTYPE_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
messages_members.cc: ${glibcpp_srcdir}/@CMESSAGES_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
monetary_members.cc: ${glibcpp_srcdir}/@CMONEY_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
numeric_members.cc: ${glibcpp_srcdir}/@CNUMERIC_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
time_members.cc: ${glibcpp_srcdir}/@CTIME_CC@
|
||||
@LN_S@ $< . || true
|
||||
|
||||
c++locale.cc: ${glibcpp_srcdir}/@CLOCALE_CC@
|
||||
@LN_S@ $< ./$@ || true
|
||||
|
||||
basic_file.cc: ${glibcpp_srcdir}/@BASIC_FILE_CC@
|
||||
@LN_S@ $< ./$@ || true
|
||||
strstream.lo: strstream.cc
|
||||
$(LTCXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated -c $<
|
||||
strstream.o: strstream.cc
|
||||
|
@ -539,6 +583,35 @@ concept-inst.lo: concept-inst.cc
|
|||
concept-inst.o: concept-inst.cc
|
||||
$(CXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
|
||||
|
||||
# Added bits to build debug library.
|
||||
@GLIBCPP_BUILD_DEBUG_TRUE@all-local: build_debug
|
||||
@GLIBCPP_BUILD_DEBUG_TRUE@install-data-local: install_debug
|
||||
@GLIBCPP_BUILD_DEBUG_FALSE@all-local:
|
||||
@GLIBCPP_BUILD_DEBUG_FALSE@install-data-local:
|
||||
|
||||
# Build parallel set of debug objects here.
|
||||
stamp-debug:
|
||||
if test ! -d ${debugdir}; then \
|
||||
mkdir -p ${debugdir}; \
|
||||
(cd ${debugdir}; \
|
||||
cp ../Makefile .; \
|
||||
sed 's/top_builddir = ../top_builddir = ..\/../g' \
|
||||
< Makefile > temp.1; \
|
||||
sed 's/all-local: build_debug/all-local:/g' < temp.1 > temp.2; \
|
||||
sed 's/install-data-local: install_debug/install-data-local:/g' \
|
||||
< temp.2 > temp.3; \
|
||||
mv temp.3 Makefile) ; \
|
||||
fi; \
|
||||
echo `date` > stamp-debug;
|
||||
|
||||
build_debug: stamp-debug
|
||||
(cd ${debugdir} && $(MAKE) CXXFLAGS='@DEBUG_FLAGS@' all)
|
||||
|
||||
# Install debug library here.
|
||||
install_debug:
|
||||
(cd ${debugdir} && $(MAKE) \
|
||||
toolexeclibdir=@glibcpp_toolexeclibdir@/debug install)
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
|
|
@ -67,14 +67,24 @@ AR = @AR@
|
|||
AS = @AS@
|
||||
ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
|
||||
AWK = @AWK@
|
||||
BASIC_FILE_CC = @BASIC_FILE_CC@
|
||||
BASIC_FILE_H = @BASIC_FILE_H@
|
||||
CC = @CC@
|
||||
CCODECVT_C = @CCODECVT_C@
|
||||
CCODECVT_CC = @CCODECVT_CC@
|
||||
CCODECVT_H = @CCODECVT_H@
|
||||
CCOLLATE_CC = @CCOLLATE_CC@
|
||||
CCTYPE_CC = @CCTYPE_CC@
|
||||
CLOCALE_CC = @CLOCALE_CC@
|
||||
CLOCALE_H = @CLOCALE_H@
|
||||
CLOCALE_INTERNAL_H = @CLOCALE_INTERNAL_H@
|
||||
CMESSAGES_CC = @CMESSAGES_CC@
|
||||
CMESSAGES_H = @CMESSAGES_H@
|
||||
CMONEY_CC = @CMONEY_CC@
|
||||
CNUMERIC_CC = @CNUMERIC_CC@
|
||||
CPP = @CPP@
|
||||
CSTDIO_H = @CSTDIO_H@
|
||||
CTIME_CC = @CTIME_CC@
|
||||
CXXCPP = @CXXCPP@
|
||||
C_INCLUDE_DIR = @C_INCLUDE_DIR@
|
||||
DEBUG_FLAGS = @DEBUG_FLAGS@
|
||||
|
@ -105,6 +115,7 @@ RANLIB = @RANLIB@
|
|||
SECTION_FLAGS = @SECTION_FLAGS@
|
||||
SECTION_LDFLAGS = @SECTION_LDFLAGS@
|
||||
STRIP = @STRIP@
|
||||
SYMVER_MAP = @SYMVER_MAP@
|
||||
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue