There doesn't seem to be much benefit to writing the symbols to
baseline_symbols.txt.new when an existing file is already present. It
just adds a manual step for maintainers to move the .txt.new file to
replace the .txt one. Overwriting the file directly allows you to use
git diff to see what changed immediately, and you can easly use git
commands to revert to the original file too.
libstdc++-v3/ChangeLog:
* testsuite/Makefile.am (new-abi-baseline): Overwrite existing
file instead of creating baseline_symbols.txt.new.
* testsuite/Makefile.in: Regenerate.
---
Does anybody prefer the way it works now? I don't, but I'd like to hear
from target maintainers who do most of the work to update the baseline
files.
Tested x86_64-linux.
No doc updates needed as far as I can tell, we don't mention the .new
file in the manual, we just say "written to a file under
libsrcdir/config/abi/post/target/"
libstdc++-v3/testsuite/Makefile.am | 8 +-------
libstdc++-v3/testsuite/Makefile.in | 8 +-------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/libstdc++-v3/testsuite/Makefile.am
b/libstdc++-v3/testsuite/Makefile.am
index 270b6886df4c..e8b6eb9e8ad4 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -84,13 +84,7 @@ baseline_symbols:
new-abi-baseline:
-@$(mkinstalldirs) ${baseline_dir}/${baseline_subdir}
- -@(output=${baseline_dir}/${baseline_subdir}/baseline_symbols.txt; \
- if test -f $${output}; then \
- output=$${output}.new; \
- t=`echo $${output} | sed 's=.*config/abi/=='`; \
- echo "Baseline file already exists, writing to $${t} instead."; \
- fi; \
- ${extract_symvers} ../src/.libs/libstdc++.so $${output})
+ -@${extract_symvers} ../src/.libs/libstdc++.so
${baseline_dir}/${baseline_subdir}/baseline_symbols.txt
%/site.exp: site.exp
-@test -d $* || mkdir $*
diff --git a/libstdc++-v3/testsuite/Makefile.in
b/libstdc++-v3/testsuite/Makefile.in
index 65ec4e7fb146..3aed09d10492 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -645,13 +645,7 @@ baseline_symbols:
new-abi-baseline:
-@$(mkinstalldirs) ${baseline_dir}/${baseline_subdir}
- -@(output=${baseline_dir}/${baseline_subdir}/baseline_symbols.txt; \
- if test -f $${output}; then \
- output=$${output}.new; \
- t=`echo $${output} | sed 's=.*config/abi/=='`; \
- echo "Baseline file already exists, writing to $${t} instead."; \
- fi; \
- ${extract_symvers} ../src/.libs/libstdc++.so $${output})
+ -@${extract_symvers} ../src/.libs/libstdc++.so
${baseline_dir}/${baseline_subdir}/baseline_symbols.txt
%/site.exp: site.exp
-@test -d $* || mkdir $*
--
2.52.0
