* testsuite/Makefile.am: Remove use of baseline_file.

	* testsuite/Makefile.in: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@154114 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c075117..2721405 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-11  Jason Merrill  <jason@redhat.com>
 
 2009-11-11  Jason Merrill  <jason@redhat.com>
 

+       * testsuite/Makefile.am: Remove use of baseline_file.
+       * testsuite/Makefile.in: Likewise.
+

        PR c++/39131
        * config/abi/pre/gnu.ver: Add DFP types.
        * testsuite/util/testsuite_abi.cc (check_version): Add CXXABI_1.3.4.
        PR c++/39131
        * config/abi/pre/gnu.ver: Add DFP types.
        * testsuite/util/testsuite_abi.cc (check_version): Add CXXABI_1.3.4.

diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index c817607..a2f4fa4 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -70,7 +70,7 @@ site.exp: Makefile
 extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers
 
 baseline_symbols:
 extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers
 
 baseline_symbols:

-       -@(output=${baseline_file}; \
+       -@(output=${baseline_dir}/baseline_symbols.txt; \

          if test ! -f $${output}; then \
            echo "Baseline file doesn't exist."; \
            echo "Try 'make new-abi-baseline' to create it."; \
          if test ! -f $${output}; then \
            echo "Baseline file doesn't exist."; \
            echo "Try 'make new-abi-baseline' to create it."; \


@@ -79,7 +79,7 @@ baseline_symbols:
 
 new-abi-baseline:
        -@$(mkinstalldirs) ${baseline_dir}
 
 new-abi-baseline:
        -@$(mkinstalldirs) ${baseline_dir}

-       -@(output=${baseline_file}; \
+       -@(output=${baseline_dir}/baseline_symbols.txt; \

          if test -f $${output}; then \
            output=$${output}.new; \
            t=`echo $${output} | sed 's=.*config/abi/=='`; \
          if test -f $${output}; then \
            output=$${output}.new; \
            t=`echo $${output} | sed 's=.*config/abi/=='`; \

diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index cae3d6c..bf767cd 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -527,7 +527,7 @@ site.exp: Makefile
        @mv site.tmp site.exp
 
 baseline_symbols:
        @mv site.tmp site.exp
 
 baseline_symbols:

-       -@(output=${baseline_file}; \
+       -@(output=${baseline_dir}/baseline_symbols.txt; \

          if test ! -f $${output}; then \
            echo "Baseline file doesn't exist."; \
            echo "Try 'make new-abi-baseline' to create it."; \
          if test ! -f $${output}; then \
            echo "Baseline file doesn't exist."; \
            echo "Try 'make new-abi-baseline' to create it."; \


@@ -536,7 +536,7 @@ baseline_symbols:
 
 new-abi-baseline:
        -@$(mkinstalldirs) ${baseline_dir}
 
 new-abi-baseline:
        -@$(mkinstalldirs) ${baseline_dir}

-       -@(output=${baseline_file}; \
+       -@(output=${baseline_dir}/baseline_symbols.txt; \

          if test -f $${output}; then \
            output=$${output}.new; \
            t=`echo $${output} | sed 's=.*config/abi/=='`; \
          if test -f $${output}; then \
            output=$${output}.new; \
            t=`echo $${output} | sed 's=.*config/abi/=='`; \