diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 1 | ||||
| -rwxr-xr-x | gcc/configure | 8 | ||||
| -rw-r--r-- | gcc/configure.in | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 27 | ||||
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/Makefile.in | 4 | ||||
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 2 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 2 | ||||
| -rw-r--r-- | libstdc++-v3/configure.in | 4 | ||||
| -rwxr-xr-x | libstdc++-v3/mkcheck.in | 3 |
12 files changed, 52 insertions, 22 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 588ac132318..25f59732367 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2000-10-25 Mark Mitchell <mark@codesourcery.com> + + * Makefile.in (site.exp): Define HAVE_LIBSTDCXX_V3. + * configure.in (enable-libstdcxx-v3): Arrange to have + HAVE_LIBSTDCXX_V3 substituted into the output files. + 2000-10-25 Richard Henderson <rth@redhat.com> * recog.c (constrain_operands): Initialize which_alternative diff --git a/gcc/Makefile.in b/gcc/Makefile.in index c7cab3c7aa0..380cfdfa18f 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2593,6 +2593,7 @@ site.exp: ./config.status Makefile # CFLAGS is set even though it's empty to show we reserve the right to set it. @echo "set CFLAGS \"\"" >> ./tmp0 @echo "set CXXFLAGS \"-I$(objdir)/../$(target_subdir)libio -I\$$srcdir/../libg++/src -I\$$srcdir/../libio -I\$$srcdir/../libstdc++ -I\$$srcdir/../libstdc++/stl -L$(objdir)/../$(target_subdir)libg++ -L$(objdir)/../$(target_subdir)libstdc++\"" >> ./tmp0 + @echo "set HAVE_LIBSTDCXX_V3 @HAVE_LIBSTDCXX_V3@" >> ./tmp0 # If newlib has been configured, we need to pass -B to gcc so it can find # newlib's crt0.o if it exists. This will cause a "path prefix not used" # message if it doesn't, but the testsuite is supposed to ignore the message - diff --git a/gcc/configure b/gcc/configure index f66d511d20e..95ae6fb09a8 100755 --- a/gcc/configure +++ b/gcc/configure @@ -1575,7 +1575,7 @@ esac # Find some useful tools -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9522,9 +9522,11 @@ fi if test x$enable_libstdcxx_v3 = xyes; then echo "$ac_t""v3" 1>&6 + HAVE_LIBSTDCXX_V3=1 ac_esn=1 else echo "$ac_t""v2" 1>&6 + HAVE_LIBSTDCXX_V3=0 ac_esn=0 fi cat >> confdefs.h <<EOF @@ -9533,8 +9535,9 @@ EOF + echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:9538: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:9541: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -10033,6 +10036,7 @@ s%@GGC@%$GGC%g s%@zlibdir@%$zlibdir%g s%@zlibinc@%$zlibinc%g s%@GXX_ABI_FLAG@%$GXX_ABI_FLAG%g +s%@HAVE_LIBSTDCXX_V3@%$HAVE_LIBSTDCXX_V3%g s%@MAINT@%$MAINT%g s%@build_canonical@%$build_canonical%g s%@host_canonical@%$host_canonical%g diff --git a/gcc/configure.in b/gcc/configure.in index ef1524a49c8..b05d5b57ad0 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -4907,13 +4907,16 @@ AC_ARG_ENABLE(libstdcxx-v3, if test x$enable_libstdcxx_v3 = xyes; then AC_MSG_RESULT(v3) + HAVE_LIBSTDCXX_V3=1 ac_esn=1 else AC_MSG_RESULT(v2) + HAVE_LIBSTDCXX_V3=0 ac_esn=0 fi AC_DEFINE_UNQUOTED(ENABLE_STD_NAMESPACE, $ac_esn, [Define to 1 if you want to enable namespaces (-fhonor-std) by default.]) +AC_SUBST(HAVE_LIBSTDCXX_V3) dnl Very limited version of automake's enable-maintainer-mode diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 72755e7a4e4..0790ff28a2c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2000-10-25 Mark Mitchell <mark@codesourcery.com> + + * lib/g++.exp (g++_include_flags): Trust HAVE_LIBSTDCXX_V3 + to tell us whether or not we are using V3. + 2000-10-26 Gabriel Dos Reis <gdr@codesourcery.com> * g++.old-deja/g++.pt/memtemp77.C (main): Adjust comparaison diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index fde457782a5..8fe1f2a4c4a 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -68,30 +68,29 @@ proc g++_version { } { # proc g++_include_flags { args } { global srcdir + global HAVE_LIBSTDCXX_V3 + + set flags "" if [is_remote host] { - return "" + return "${flags}" } - set gccpath [get_multilibs] - set libio_dir "" - set flags "" - set dir [lookfor_file ${srcdir} libg++] if { ${dir} != "" } { append flags "-I${dir} -I${dir}/src " } - set odir_v2 [lookfor_file ${gccpath} libstdc++] - set sdir_v2 [lookfor_file ${srcdir} libstdc++] - if { ${odir_v2} != "" } { - append flags "-I${sdir_v2} -I${sdir_v2}/stl " - } else { + + set gccpath [get_multilibs] + + if { ${HAVE_LIBSTDCXX_V3} } { set odir_v3 [lookfor_file ${gccpath} libstdc++-v3] set sdir_v3 [lookfor_file ${srcdir} libstdc++-v3] - if { ${odir_v3} != "" } { - append flags [exec ${odir_v3}/mkcheck 2 ${odir_v3} ${sdir_v3}] - } - # else we're probably testing an already-installed GCC. + append flags [exec ${odir_v3}/mkcheck 2 ${odir_v3} ${sdir_v3}] + } else { + set odir_v2 [lookfor_file ${gccpath} libstdc++] + set sdir_v2 [lookfor_file ${srcdir} libstdc++] + append flags "-I${sdir_v2} -I${sdir_v2}/stl " } return "$flags" diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 113e7ef4128..b1c0457498f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2000-10-25 Mark Mitchell <mark@codesourcery.com> + + * Makefile.in (check): Don't make mkcheck executable. + (check-install): Likewise. + * configure.in (AC_OUTPUT): Make mkcheck executable. + * mkcheck.in (top_srcdir): New variable. + (INC_PATH): Set the path to the backward and ext directories + correctly. + 2000-10-25 Phil Edwards <pme@sources.redhat.com> * configure.in: Check for gconv.h. diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 24c086f18b4..793b83c5159 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -1,6 +1,6 @@ # Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2000 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -407,11 +407,9 @@ mostlyclean distclean maintainer-clean # because then the paths will be full pathnames, not relative # pathnames. (-Wl,--rpath seems to like this better.) check: $(top_builddir)/mkcheck - chmod +x $(top_builddir)/mkcheck $(top_builddir)/mkcheck 0 `pwd` $(top_srcdir) check-install: $(top_builddir)/mkcheck - chmod +x $(top_builddir)/mkcheck $(top_builddir)/mkcheck 1 `pwd` $(top_srcdir) $(prefix) # Multilib Makefile bits. diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index e3c0fd57ffc..6a97f8b31ac 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1,6 +1,6 @@ dnl aclocal.m4 generated automatically by aclocal 1.4 -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl Copyright (C) 1994, 1995-8, 1999, 2000 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index d2603a27800..dda142fc13a 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -19327,6 +19327,8 @@ if test -n "$CONFIG_FILES"; then ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in grep '^MULTISUBDIR =' Makefile >> src/Makefile fi +chmod +x mkcheck + exit 0 EOF chmod +x $CONFIG_STATUS diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in index 1ffc0cb9c63..43156719c4b 100644 --- a/libstdc++-v3/configure.in +++ b/libstdc++-v3/configure.in @@ -223,7 +223,9 @@ AC_OUTPUT(mkcheck Makefile src/Makefile libmath/Makefile libio/Makefile libsupc+ [if test -n "$CONFIG_FILES"; then ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in grep '^MULTISUBDIR =' Makefile >> src/Makefile -fi], +fi +chmod +x mkcheck +], srcdir=${srcdir} host=${host} target=${target} diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in index ac74673bf02..a2e4e15fc4c 100755 --- a/libstdc++-v3/mkcheck.in +++ b/libstdc++-v3/mkcheck.in @@ -54,6 +54,7 @@ if [ $WHICH -eq 1 ]; then fi # INC_PATH == include path to new headers for use on gcc command-line +top_srcdir=@top_srcdir@ C_DIR="`basename @C_INCLUDE_DIR@`" if [ $WHICH != "1" ]; then INC_PATH="@CSHADOW_FLAGS@ -I$BUILD_DIR -I$BUILD_DIR/libio \ @@ -65,7 +66,7 @@ elif [ $WHICH -eq 1 ]; then fi if [ $WHICH -eq 2 ]; then - echo $INC_PATH -I$SRC_DIR/backward -I$SRC_DIR/ext + echo $INC_PATH -I$SRC_DIR/include/backward -I$SRC_DIR/include/ext exit 0; fi |