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
This commit is contained in:
Rainer Orth
Rainer Orth
parent
e3fe54189f
commit
00fc1bf6c7
|
|
@ -1,3 +1,23 @@
|
|||
2011-07-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
|
||||
|
||||
* 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 <francois.cppdevs@free.fr>
|
||||
|
||||
* include/debug/set.h, unordered_map, multiset.h, forward_list,
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
])
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -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; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue