From 00fc1bf6c76bfad31ba34dfb188e32b75153a2f4 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 8 Jul 2011 08:49:57 +0000 Subject: [PATCH] configure.host (abi_baseline_subdir_switch): Describe. * configure.host (abi_baseline_subdir_switch): Describe. Provide default. (*-*-solaris2.[89], *-*-solaris2.1[0-9]): Override. * acinclude.m4 (GLIBCXX_CONFIGURE_TESTSUITE): Substitute baseline_subdir_switch. * testsuite/Makefile.am (site.exp): Emit it. (baseline_subdir): Use it. * testsuite/libstdc++-abi/abi.exp: Use it. * configure: Regenerate. * Makefile.in: Regenerate. * doc/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * libsupc++/Makefile.in: Regenerate. * po/Makefile.in: Regenerate. * python/Makefile.in: Regenerate. * src/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. From-SVN: r176032 --- libstdc++-v3/ChangeLog | 20 ++++++++++++++++++++ libstdc++-v3/Makefile.in | 1 + libstdc++-v3/acinclude.m4 | 3 +++ libstdc++-v3/configure | 19 +++++++++++-------- libstdc++-v3/configure.host | 8 ++++++++ libstdc++-v3/doc/Makefile.in | 1 + libstdc++-v3/include/Makefile.in | 1 + libstdc++-v3/libsupc++/Makefile.in | 1 + libstdc++-v3/po/Makefile.in | 1 + libstdc++-v3/python/Makefile.in | 1 + libstdc++-v3/src/Makefile.in | 1 + libstdc++-v3/testsuite/Makefile.am | 3 ++- libstdc++-v3/testsuite/Makefile.in | 4 +++- libstdc++-v3/testsuite/libstdc++-abi/abi.exp | 4 ++-- 14 files changed, 56 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cd0b2934008..c6af2be9903 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,23 @@ +2011-07-08 Rainer Orth + + * configure.host (abi_baseline_subdir_switch): Describe. + Provide default. + (*-*-solaris2.[89], *-*-solaris2.1[0-9]): Override. + * acinclude.m4 (GLIBCXX_CONFIGURE_TESTSUITE): Substitute + baseline_subdir_switch. + * testsuite/Makefile.am (site.exp): Emit it. + (baseline_subdir): Use it. + * testsuite/libstdc++-abi/abi.exp: Use it. + * configure: Regenerate. + * Makefile.in: Regenerate. + * doc/Makefile.in: Regenerate. + * include/Makefile.in: Regenerate. + * libsupc++/Makefile.in: Regenerate. + * po/Makefile.in: Regenerate. + * python/Makefile.in: Regenerate. + * src/Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. + 2011-06-29 François Dumont * include/debug/set.h, unordered_map, multiset.h, forward_list, diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index af62df5a639..3a6e9f24f9e 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -216,6 +216,7 @@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ baseline_dir = @baseline_dir@ +baseline_subdir_switch = @baseline_subdir_switch@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index bedb585f13f..8ebb3b5e593 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -590,6 +590,7 @@ dnl GLIBCXX_TEST_WCHAR_T dnl GLIBCXX_TEST_THREAD dnl Substs: dnl baseline_dir +dnl baseline_subdir_switch dnl AC_DEFUN([GLIBCXX_CONFIGURE_TESTSUITE], [ if $GLIBCXX_IS_NATIVE ; then @@ -617,6 +618,8 @@ AC_DEFUN([GLIBCXX_CONFIGURE_TESTSUITE], [ # Export file names for ABI checking. baseline_dir="$glibcxx_srcdir/config/abi/post/${abi_baseline_pair}" AC_SUBST(baseline_dir) + baseline_subdir_switch="$abi_baseline_subdir_switch" + AC_SUBST(baseline_subdir_switch) ]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 8f871114b67..d3f9527c0e3 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -639,6 +639,7 @@ DOT DOXYGEN BUILD_INFO_FALSE BUILD_INFO_TRUE +baseline_subdir_switch baseline_dir GLIBCXX_LDBL_COMPAT_FALSE GLIBCXX_LDBL_COMPAT_TRUE @@ -11488,7 +11489,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11491 "configure" +#line 11492 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11594,7 +11595,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11597 "configure" +#line 11598 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14952,7 +14953,7 @@ fi # # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF -#line 14955 "configure" +#line 14956 "configure" struct S { ~S(); }; void bar(); void foo() @@ -15320,7 +15321,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF -#line 15323 "configure" +#line 15324 "configure" int main() { typedef bool atomic_type; @@ -15357,7 +15358,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15360 "configure" +#line 15361 "configure" int main() { typedef short atomic_type; @@ -15394,7 +15395,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15397 "configure" +#line 15398 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -15432,7 +15433,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15435 "configure" +#line 15436 "configure" int main() { typedef long long atomic_type; @@ -15508,7 +15509,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15511 "configure" +#line 15512 "configure" int main() { _Decimal32 d1; @@ -65011,6 +65012,8 @@ done # Export file names for ABI checking. baseline_dir="$glibcxx_srcdir/config/abi/post/${abi_baseline_pair}" + baseline_subdir_switch="$abi_baseline_subdir_switch" + # Define documentation rules conditionally. diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host index e29404c026f..a9575403a7f 100644 --- a/libstdc++-v3/configure.host +++ b/libstdc++-v3/configure.host @@ -30,6 +30,11 @@ # abi_baseline_pair directory name for ABI compat testing, # defaults to host_cpu-host_os (as per config.guess) # +# abi_baseline_subdir_switch +# g++ switch to determine ABI baseline subdir for +# multilibbed targets, +# defaults to --print-multi-directory +# # abi_tweaks_dir location of cxxabi_tweaks.h, # defaults to cpu_include_dir # @@ -78,6 +83,7 @@ atomic_flags="" atomicity_dir="cpu/generic" cpu_defines_dir="cpu/generic" try_cpu=generic +abi_baseline_subdir_switch=--print-multi-directory abi_tweaks_dir="cpu/generic" error_constants_dir="os/generic" @@ -332,8 +338,10 @@ case "${host}" in ;; *-*-solaris2.[89]) abi_baseline_pair=solaris2.8 + abi_baseline_subdir_switch=--print-multi-os-directory ;; *-*-solaris2.1[0-9]) abi_baseline_pair=solaris2.10 + abi_baseline_subdir_switch=--print-multi-os-directory ;; esac diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index 8247b60a91a..db89253044b 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -192,6 +192,7 @@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ baseline_dir = @baseline_dir@ +baseline_subdir_switch = @baseline_subdir_switch@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 7fdf182f2d2..750e67f89f4 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -190,6 +190,7 @@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ baseline_dir = @baseline_dir@ +baseline_subdir_switch = @baseline_subdir_switch@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 18ba840180e..5e7651bb455 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -249,6 +249,7 @@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ baseline_dir = @baseline_dir@ +baseline_subdir_switch = @baseline_subdir_switch@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in index f552c6bf96b..407e2821acb 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -190,6 +190,7 @@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ baseline_dir = @baseline_dir@ +baseline_subdir_switch = @baseline_subdir_switch@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in index b8ea31a8e02..4b7404039d1 100644 --- a/libstdc++-v3/python/Makefile.in +++ b/libstdc++-v3/python/Makefile.in @@ -214,6 +214,7 @@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ baseline_dir = @baseline_dir@ +baseline_subdir_switch = @baseline_subdir_switch@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 88dca846948..c8063b14808 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -254,6 +254,7 @@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ baseline_dir = @baseline_dir@ +baseline_subdir_switch = @baseline_subdir_switch@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index 792c8313050..e9774512dc3 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -59,6 +59,7 @@ site.exp: Makefile @echo 'set target_triplet $(target_triplet)' >>site.tmp @echo 'set libiconv "$(LIBICONV)"' >>site.tmp @echo 'set baseline_dir "$(baseline_dir)"' >> site.tmp + @echo 'set baseline_subdir_switch "$(baseline_subdir_switch)"' >> site.tmp @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp @test ! -f site.exp || \ sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp @@ -69,7 +70,7 @@ site.exp: Makefile extract_symvers = $(glibcxx_builddir)/scripts/extract_symvers -baseline_subdir := $(shell $(CXX) --print-multi-dir) +baseline_subdir := $(shell $(CXX) $(baseline_subdir_switch)) baseline_symbols: -@(output=${baseline_dir}/${baseline_subdir}/baseline_symbols.txt; \ diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index a76772e60c5..f3f65946888 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -190,6 +190,7 @@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ baseline_dir = @baseline_dir@ +baseline_subdir_switch = @baseline_subdir_switch@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -286,7 +287,7 @@ lists_of_files = \ testsuite_files_performance extract_symvers = $(glibcxx_builddir)/scripts/extract_symvers -baseline_subdir := $(shell $(CXX) --print-multi-dir) +baseline_subdir := $(shell $(CXX) $(baseline_subdir_switch)) check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3 4 5 6 7 8 9) # Runs the testsuite, but in compile only mode. @@ -502,6 +503,7 @@ site.exp: Makefile @echo 'set target_triplet $(target_triplet)' >>site.tmp @echo 'set libiconv "$(LIBICONV)"' >>site.tmp @echo 'set baseline_dir "$(baseline_dir)"' >> site.tmp + @echo 'set baseline_subdir_switch "$(baseline_subdir_switch)"' >> site.tmp @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp @test ! -f site.exp || \ sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp diff --git a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp index d05851f0ab8..eea39cf6a07 100644 --- a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp +++ b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2005, 2009, 2010, 2011 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ if { [string match "*-*-darwin*" $target_triplet] } { set lib $blddir/src/.libs/libstdc++.so } -set baseline_subdir "[eval exec $cxx --print-multi-dir]" +set baseline_subdir "[eval exec $cxx $baseline_subdir_switch]" # Build the support objects. v3-build_support -- 2.30.2