2002-12-13 Benjamin Kosnik 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-12 Benjamin Kosnik * 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. Index: acinclude.m4 =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v retrieving revision 1.223 diff -c -p -r1.223 acinclude.m4 *** acinclude.m4 21 Nov 2002 07:34:27 -0000 1.223 --- acinclude.m4 13 Dec 2002 14:41:30 -0000 *************** AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES *** 267,274 **** # this is the suspicious part CXXFLAGS='' fi ! if test x"$ac_fdsections" = x"yes" && ! test x"$enable_debug" = x"no"; then SECTION_FLAGS='-ffunction-sections -fdata-sections' fi AC_MSG_RESULT($ac_fdsections) --- 267,273 ---- # this is the suspicious part CXXFLAGS='' fi ! if test x"$ac_fdsections" = x"yes"; then SECTION_FLAGS='-ffunction-sections -fdata-sections' fi AC_MSG_RESULT($ac_fdsections) *************** AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, *** 361,367 **** fi # Set linker optimization flags. ! if test x"$with_gnu_ld" = x"yes" && test x"$enable_debug" = x"no"; then OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS" fi --- 360,366 ---- fi # Set linker optimization flags. ! if test x"$with_gnu_ld" = x"yes"; then OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS" fi *************** AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPP *** 911,917 **** --- 910,920 ---- 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) ]) *************** AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, *** 1043,1056 **** dnl ! dnl Check for special debugging mode; not for production use. 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 + Usage: GLIBCPP_ENABLE_DEBUG[(DEFAULT)] dnl Where DEFAULT is either `yes' or `no'. If ommitted, it dnl defaults to `no'. --- 1046,1065 ---- dnl ! dnl Check to see if debugging libraries are to be built. dnl dnl GLIBCPP_ENABLE_DEBUG ! 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'. *************** changequote([, ])dnl *** 1066,1082 **** *) AC_MSG_ERROR([Unknown argument to enable/disable extra debugging]) ;; esac], enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl dnl Option parsed, now set things appropriately ! case "${enable_debug}" in ! yes) ! DEBUG_FLAGS='-O0 -ggdb3' ;; ! no) ! DEBUG_FLAGS='-g' ;; esac AC_SUBST(DEBUG_FLAGS) ]) --- 1075,1130 ---- *) 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 x"$enable_debug" in ! xyes) ! case "$enable_debug_flags" in ! none) ! DEBUG_FLAGS="-g3 -O0";; ! -*) #valid input ! DEBUG_FLAGS="${enableval}" ! esac ;; ! xno) ! DEBUG_FLAGS="" ;; esac AC_SUBST(DEBUG_FLAGS) + + AC_MSG_CHECKING([for debug build flags]) + AC_MSG_RESULT($DEBUG_FLAGS) ]) *************** dnl If "default flags" is an empty *** 1097,1121 **** 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, changequote(<<, >>)dnl << --enable-cxx-flags=FLAGS pass compiler FLAGS when building library; [default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], changequote([, ])dnl ! [case "x$enableval" in xyes) AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;; ! xno|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 dnl Run through flags (either default or command-line) and set anything dnl extra (e.g., #defines) that must accompany particular g++ options. --- 1145,1165 ---- 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, changequote(<<, >>)dnl << --enable-cxx-flags=FLAGS pass compiler FLAGS when building library; [default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], changequote([, ])dnl ! 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 | xnone | x) enable_cxx_flags='' ;; *) enable_cxx_flags="$enableval" ;; ! esac dnl Run through flags (either default or command-line) and set anything dnl extra (e.g., #defines) that must accompany particular g++ options. *************** AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ *** 1291,1313 **** 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) ]) --- 1335,1353 ---- glibcpp_localedir=${glibcpp_builddir}/po/share/locale AC_SUBST(glibcpp_localedir) AC_SUBST(USE_NLS) AC_SUBST(CLOCALE_H) AC_SUBST(CCODECVT_H) AC_SUBST(CMESSAGES_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) ]) *************** AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ *** 1408,1414 **** esac AC_SUBST(CSTDIO_H) AC_SUBST(BASIC_FILE_H) ! AC_LINK_FILES($BASIC_FILE_CC, src/basic_file.cc) # 2000-08-04 bkoz hack CCODECVT_C=config/io/c_io_libio_codecvt.c --- 1448,1454 ---- esac AC_SUBST(CSTDIO_H) AC_SUBST(BASIC_FILE_H) ! AC_SUBST(BASIC_FILE_CC) # 2000-08-04 bkoz hack CCODECVT_C=config/io/c_io_libio_codecvt.c *************** AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl *** 1727,1733 **** dnl ! dnl Check for what kind of C headers to use. dnl dnl GLIBCPP_ENABLE_CHEADERS dnl --enable-cheaders= [does stuff]. --- 1767,1773 ---- dnl ! dnl Check for what type of C headers to use. dnl dnl GLIBCPP_ENABLE_CHEADERS dnl --enable-cheaders= [does stuff]. *************** define([GLIBCPP_ENABLE_CHEADERS_DEFAULT] *** 1740,1746 **** 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], changequote([, ]) [case "$enableval" in c) --- 1780,1786 ---- AC_MSG_CHECKING([for c header strategy to use]) AC_ARG_ENABLE(cheaders, changequote(<<, >>)dnl ! << --enable-cheaders=MODEL construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT], changequote([, ]) [case "$enableval" in c) *************** fi *** 2235,2249 **** dnl Everything parsed; figure out what file to use. case $enable_symvers in no) ! LINKER_MAP=config/linker-map.dummy ;; gnu) ! LINKER_MAP=config/linker-map.gnu AC_DEFINE(_GLIBCPP_SYMVER) ;; esac ! AC_LINK_FILES($LINKER_MAP, src/linker.map) AM_CONDITIONAL(GLIBCPP_BUILD_VERSIONED_SHLIB, test $enable_symvers != no) AC_MSG_CHECKING([versioning on shared library symbols]) AC_MSG_RESULT($enable_symvers) --- 2275,2289 ---- dnl Everything parsed; figure out what file to use. case $enable_symvers in no) ! SYMVER_MAP=config/linker-map.dummy ;; gnu) ! SYMVER_MAP=config/linker-map.gnu AC_DEFINE(_GLIBCPP_SYMVER) ;; esac ! 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) Index: configure.in =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.in,v retrieving revision 1.110 diff -c -p -r1.110 configure.in *** configure.in 2 Dec 2002 19:24:11 -0000 1.110 --- configure.in 13 Dec 2002 14:41:31 -0000 *************** AC_SUBST(enable_static) *** 54,71 **** 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_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 # Check for headers necessary for libsupc++ using dyn-string.c/cxa_demangle.c AC_CHECK_HEADERS(string.h stdlib.h) --- 54,72 ---- GLIBCPP_CHECK_GNU_MAKE # Enable all the variable C++ stuff. C_MBCHAR must come early. 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_THREADS 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) *************** fi *** 451,457 **** # Export all the install information GLIBCPP_EXPORT_INSTALL_INFO ! # Export all the include and flag information to makefiles. GLIBCPP_EXPORT_INCLUDES GLIBCPP_EXPORT_FLAGS --- 452,458 ---- # Export all the install information GLIBCPP_EXPORT_INSTALL_INFO ! # Export all the include and flag information to Makefiles. GLIBCPP_EXPORT_INCLUDES GLIBCPP_EXPORT_FLAGS *************** AC_OUTPUT(Makefile \ *** 473,483 **** 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 fi chmod +x mkcheck chmod +x testsuite_flags --- 474,487 ---- include/Makefile src/Makefile \ libmath/Makefile libio/Makefile libsupc++/Makefile \ po/Makefile testsuite/Makefile mkcheck testsuite_flags, ! [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 Index: include/Makefile.am =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/include/Makefile.am,v retrieving revision 1.43 diff -c -p -r1.43 Makefile.am *** include/Makefile.am 26 Sep 2002 05:25:12 -0000 1.43 --- include/Makefile.am 13 Dec 2002 14:41:31 -0000 *************** target_headers = \ *** 312,317 **** --- 312,322 ---- ${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 \ *************** thread_target_headers = \ *** 331,338 **** # 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 # Here are the rules for building the headers --- 336,342 ---- # CLEANFILES and all-local are kept up-to-date. allstamps = \ stamp-std stamp-bits stamp-c_base stamp-c_compatibility \ ! stamp-backward stamp-ext stamp-target # Here are the rules for building the headers *************** stamp-${target_alias}: *** 400,415 **** fi # Target includes static. ! ${target_builddir}/stamp-target: ${target_headers} stamp-${target_alias} ! @cd ${target_builddir} ;\ ! if [ ! -f stamp-target ]; then \ @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}/@CMESSAGES_H@ messages_members.h || true ;\ ! @LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true ;\ ! echo `date` > stamp-target; \ fi # Target includes dynamic. --- 404,421 ---- fi # Target includes static. ! # 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 ; \ fi # Target includes dynamic. Index: libio/ChangeLog =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/libio/ChangeLog,v retrieving revision 1.20 diff -c -p -r1.20 ChangeLog *** libio/ChangeLog 3 Feb 2001 09:01:44 -0000 1.20 --- libio/ChangeLog 13 Dec 2002 14:41:35 -0000 *************** *** 1,3 **** --- 1,7 ---- + 2002-12-13 Benjamin Kosnik + + * Makefile.am (AM_CFLAGS): Remove DEBUG_FLAGS. + 2001-02-03 Alexandre Oliva Gerald Pfeifer Index: libio/Makefile.am =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/libio/Makefile.am,v retrieving revision 1.21 diff -c -p -r1.21 Makefile.am *** libio/Makefile.am 13 Jul 2001 16:47:55 -0000 1.21 --- libio/Makefile.am 13 Dec 2002 14:41:35 -0000 *************** EXTRA_DIST = iostreamP.h *** 64,67 **** libio_la_SOURCES = $(LIBIO_SRCS) $(LIBIO_WSRCS) ! AM_CFLAGS = -D_GNU_SOURCE @DEBUG_FLAGS@ --- 64,67 ---- libio_la_SOURCES = $(LIBIO_SRCS) $(LIBIO_WSRCS) ! AM_CFLAGS = -D_GNU_SOURCE Index: libsupc++/Makefile.am =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/libsupc++/Makefile.am,v retrieving revision 1.36 diff -c -p -r1.36 Makefile.am *** libsupc++/Makefile.am 25 Nov 2002 23:17:31 -0000 1.36 --- libsupc++/Makefile.am 13 Dec 2002 14:41:35 -0000 *************** OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ *** 49,55 **** # 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@ # Warning flags to use. WARN_CXXFLAGS = \ --- 49,55 ---- # 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@ # Warning flags to use. WARN_CXXFLAGS = \ Index: src/Makefile.am =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/src/Makefile.am,v retrieving revision 1.113 diff -c -p -r1.113 Makefile.am *** src/Makefile.am 12 Sep 2002 23:27:30 -0000 1.113 --- src/Makefile.am 13 Dec 2002 14:41:35 -0000 *************** mkinstalldirs = $(SHELL) $(toplevel_srcd *** 29,47 **** # Cross compiler support. CXX = @glibcpp_CXX@ toolexecdir = @glibcpp_toolexecdir@ toolexeclibdir = @glibcpp_toolexeclibdir@ toolexeclib_LTLIBRARIES = libstdc++.la # 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@ # Warning flags to use. WARN_CXXFLAGS = \ --- 29,58 ---- # 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 CONFIG_CXXFLAGS = \ ! @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ # Warning flags to use. WARN_CXXFLAGS = \ *************** INCLUDES = \ *** 60,66 **** $(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \ $(TOPLEVEL_INCLUDES) ! # Source files linked in via configuration magic for a particular target. target_sources = \ codecvt_members.cc \ collate_members.cc \ --- 71,78 ---- $(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \ $(TOPLEVEL_INCLUDES) ! # Source files linked in via configuration/make substitution for a ! # particular target. target_sources = \ codecvt_members.cc \ collate_members.cc \ *************** target_sources = \ *** 70,81 **** numeric_members.cc \ time_members.cc ! # Source files linked in via configuration magic for a particular ! # target, but with ad hoc naming rules. target_sources_extra = \ basic_file.cc \ c++locale.cc # Sources present in the src directory. sources = \ bitset.cc \ --- 82,120 ---- numeric_members.cc \ time_members.cc ! 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 \ *************** VPATH = $(top_srcdir)/src:$(top_srcdir) *** 114,133 **** libstdc___la_SOURCES = $(sources) libstdc___la_LIBADD = \ ! ../libmath/libmath.la @libio_la@ \ ! ../libsupc++/libsupc++convenience.la ! if GLIBCPP_BUILD_VERSIONED_SHLIB ! version_arg=-Wl,--version-script=linker.map ! else ! version_arg= ! endif 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. --- 153,167 ---- libstdc___la_SOURCES = $(sources) libstdc___la_LIBADD = \ ! $(top_builddir)/libmath/libmath.la @libio_la@ \ ! $(top_builddir)/libsupc++/libsupc++convenience.la ! libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD) libstdc___la_LDFLAGS = \ -version-info @libtool_VERSION@ ${version_arg} \ -lm @LIBUNWIND_FLAG@ # Use special rules for the deprecated source files so that they find # deprecated include files. *************** AM_CXXFLAGS = \ *** 156,162 **** $(LIBSUPCXX_CXXFLAGS) \ $(WARN_CXXFLAGS) \ $(OPTIMIZE_CXXFLAGS) \ ! $(CONFIG_CXXFLAGS) # libstdc++ libtool notes --- 190,196 ---- $(LIBSUPCXX_CXXFLAGS) \ $(WARN_CXXFLAGS) \ $(OPTIMIZE_CXXFLAGS) \ ! $(CONFIG_CXXFLAGS) # libstdc++ libtool notes *************** LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mo *** 188,190 **** --- 222,259 ---- # 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: Makefile + if test ! -d ${debugdir}; then \ + mkdir -p ${debugdir}; \ + (cd ${debugdir}; \ + cp ../Makefile .; \ + sed 's/(CONFIG_CXXFLAGS)/(CONFIG_CXXFLAGS) @DEBUG_FLAGS@/g' < Makefile > temp.1; \ + sed 's/top_builddir = ../top_builddir = ..\/../g' < temp.1 > temp.2;\ + sed 's/all-local: build_debug/all-local:/g' < temp.2 > temp.3; \ + sed 's/install-data-local: install_debug/install-data-local:/g' < temp.3 > temp.4; \ + sed 's/}\/lib/}\/lib\/debug/g' < temp.4 > temp.5; \ + sed 's/lib\/debugexec/libexec\/debug/g' < temp.5 > temp.6; \ + mv temp.6 Makefile) ; \ + echo `date` > stamp-debug; \ + fi + + build_debug: stamp-debug + (cd ${debugdir} && $(MAKE) all) + + # Install debug library here. + install_debug: build_debug + (cd ${debugdir} && $(MAKE) install) Index: config/locale/generic/codecvt_members.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/generic/codecvt_members.cc,v retrieving revision 1.1 diff -c -p -r1.1 codecvt_members.cc *** config/locale/generic/codecvt_members.cc 11 Sep 2002 03:36:44 -0000 1.1 --- config/locale/generic/codecvt_members.cc 13 Dec 2002 14:41:35 -0000 *************** *** 34,40 **** // Written by Benjamin Kosnik #include - #include "c++locale_internal.h" namespace std { --- 34,39 ---- Index: config/locale/gnu/c_locale.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/gnu/c_locale.cc,v retrieving revision 1.5 diff -c -p -r1.5 c_locale.cc *** config/locale/gnu/c_locale.cc 28 Nov 2002 12:23:53 -0000 1.5 --- config/locale/gnu/c_locale.cc 13 Dec 2002 14:41:35 -0000 *************** *** 36,42 **** #include #include #include ! #include "c++locale_internal.h" namespace std { --- 36,42 ---- #include #include #include ! #include namespace std { Index: config/locale/gnu/codecvt_members.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/gnu/codecvt_members.cc,v retrieving revision 1.1 diff -c -p -r1.1 codecvt_members.cc *** config/locale/gnu/codecvt_members.cc 11 Sep 2002 03:36:44 -0000 1.1 --- config/locale/gnu/codecvt_members.cc 13 Dec 2002 14:41:35 -0000 *************** *** 34,40 **** // Written by Benjamin Kosnik #include ! #include "c++locale_internal.h" namespace std { --- 34,40 ---- // Written by Benjamin Kosnik #include ! #include namespace std { Index: config/locale/gnu/collate_members.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/gnu/collate_members.cc,v retrieving revision 1.4 diff -c -p -r1.4 collate_members.cc *** config/locale/gnu/collate_members.cc 5 Sep 2002 07:46:15 -0000 1.4 --- config/locale/gnu/collate_members.cc 13 Dec 2002 14:41:36 -0000 *************** *** 34,40 **** // Written by Benjamin Kosnik #include ! #include "c++locale_internal.h" namespace std { --- 34,40 ---- // Written by Benjamin Kosnik #include ! #include namespace std { Index: config/locale/gnu/ctype_members.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/gnu/ctype_members.cc,v retrieving revision 1.6 diff -c -p -r1.6 ctype_members.cc *** config/locale/gnu/ctype_members.cc 8 Oct 2002 23:32:22 -0000 1.6 --- config/locale/gnu/ctype_members.cc 13 Dec 2002 14:41:37 -0000 *************** *** 34,40 **** // Written by Benjamin Kosnik #include ! #include "c++locale_internal.h" namespace std { --- 34,40 ---- // Written by Benjamin Kosnik #include ! #include namespace std { Index: config/locale/gnu/messages_members.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/gnu/messages_members.cc,v retrieving revision 1.6 diff -c -p -r1.6 messages_members.cc *** config/locale/gnu/messages_members.cc 5 Sep 2002 07:46:15 -0000 1.6 --- config/locale/gnu/messages_members.cc 13 Dec 2002 14:41:37 -0000 *************** *** 34,40 **** // Written by Benjamin Kosnik #include ! #include "c++locale_internal.h" namespace std { --- 34,40 ---- // Written by Benjamin Kosnik #include ! #include namespace std { Index: config/locale/gnu/monetary_members.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/gnu/monetary_members.cc,v retrieving revision 1.7 diff -c -p -r1.7 monetary_members.cc *** config/locale/gnu/monetary_members.cc 8 Nov 2002 17:05:40 -0000 1.7 --- config/locale/gnu/monetary_members.cc 13 Dec 2002 14:41:37 -0000 *************** *** 34,40 **** // Written by Benjamin Kosnik #include ! #include "c++locale_internal.h" namespace std { --- 34,40 ---- // Written by Benjamin Kosnik #include ! #include namespace std { Index: config/locale/gnu/numeric_members.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/gnu/numeric_members.cc,v retrieving revision 1.4 diff -c -p -r1.4 numeric_members.cc *** config/locale/gnu/numeric_members.cc 8 Oct 2002 23:32:22 -0000 1.4 --- config/locale/gnu/numeric_members.cc 13 Dec 2002 14:41:37 -0000 *************** *** 34,40 **** // Written by Benjamin Kosnik #include ! #include "c++locale_internal.h" namespace std { --- 34,40 ---- // Written by Benjamin Kosnik #include ! #include namespace std { Index: config/locale/gnu/time_members.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/gnu/time_members.cc,v retrieving revision 1.8 diff -c -p -r1.8 time_members.cc *** config/locale/gnu/time_members.cc 17 Oct 2002 01:19:58 -0000 1.8 --- config/locale/gnu/time_members.cc 13 Dec 2002 14:41:37 -0000 *************** *** 35,41 **** // Written by Benjamin Kosnik #include ! #include "c++locale_internal.h" namespace std { --- 35,41 ---- // Written by Benjamin Kosnik #include ! #include namespace std {