From fa092570fbaf3bb4202e518eb8beba146c464d9f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 17 Jan 2022 11:24:35 +0000 Subject: [PATCH] libstdc++: Rename non-reserved macros in config header [PR103650] libstdc++-v3/ChangeLog: PR libstdc++/103650 * include/Makefile.am: Rename LT_OBJDIR and STDC_HEADERS. * include/Makefile.in: Regenerate. * testsuite/17_intro/headers/c++1998/103650.cc: New test. --- libstdc++-v3/include/Makefile.am | 2 ++ libstdc++-v3/include/Makefile.in | 2 ++ libstdc++-v3/testsuite/17_intro/headers/c++1998/103650.cc | 13 +++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 libstdc++-v3/testsuite/17_intro/headers/c++1998/103650.cc diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 8b1300e..65b2b4e 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1343,6 +1343,8 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \ -e 's/VERSION/_GLIBCXX_VERSION/g' \ -e 's/WORDS_/_GLIBCXX_WORDS_/g' \ + -e 's/LT_OBJDIR/_GLIBCXX_LT_OBJDIR/g' \ + -e 's/STDC_HEADERS/_GLIBCXX_STDC_HEADERS/g' \ -e 's/_DARWIN_USE_64_BIT_INODE/_GLIBCXX_DARWIN_USE_64_BIT_INODE/g' \ -e 's/_FILE_OFFSET_BITS/_GLIBCXX_FILE_OFFSET_BITS/g' \ -e 's/_LARGE_FILES/_GLIBCXX_LARGE_FILES/g' \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 3ff18fe..98d7021 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1830,6 +1830,8 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \ -e 's/VERSION/_GLIBCXX_VERSION/g' \ -e 's/WORDS_/_GLIBCXX_WORDS_/g' \ + -e 's/LT_OBJDIR/_GLIBCXX_LT_OBJDIR/g' \ + -e 's/STDC_HEADERS/_GLIBCXX_STDC_HEADERS/g' \ -e 's/_DARWIN_USE_64_BIT_INODE/_GLIBCXX_DARWIN_USE_64_BIT_INODE/g' \ -e 's/_FILE_OFFSET_BITS/_GLIBCXX_FILE_OFFSET_BITS/g' \ -e 's/_LARGE_FILES/_GLIBCXX_LARGE_FILES/g' \ diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/103650.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/103650.cc new file mode 100644 index 0000000..356ffa3 --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/103650.cc @@ -0,0 +1,13 @@ +// { dg-do preprocess } + +// PR libstdc++/103650 libstdc++ headers defined LT_OBJDIR and STDC_HEADERS + +#define LT_OBJDIR 99 +#define STDC_HEADERS 99 +#include +#if LT_OBJDIR != 99 +# error LT_OBJDIR redefined +#endif +#if STDC_HEADERS != 99 +# error STDC_HEADERS redefined +#endif -- 2.7.4