[PATCH] [gdb/build, c++20] Fix build with gcc 10

[Tom de Vries]

With gcc 10 and -std=c++20, we run into the same problem as reported in commit
6feae66da1d ("[gdb/build, c++20] Handle deprecated std::allocator::construct").

The problem was fixed using:
...
-template<typename T, typename A = std::allocator<T>>
+template<typename T,
+         typename A
+#if __cplusplus >= 202002L
+         = std::pmr::polymorphic_allocator<T>
+#else
+         = std::allocator<T>
+#endif
+        >
...
but that doesn't work for gcc 10, because it defines __cplusplus differently:
...
 $ echo | g++-10 -E -dD -x c++ - -std=c++20 2>&1 | grep __cplusplus
 #define __cplusplus 201709L
 $ echo | g++-11 -E -dD -x c++ - -std=c++20 2>&1 | grep __cplusplus
 #define __cplusplus 202002L
...

Fix this by using the library feature test macro
__cpp_lib_polymorphic_allocator [1], which is undefined for c++17 and defined
for c++20:
...
 $ echo | g++-10 -E -dD -x c++ - -include memory_resource -std=c++17 2>&1 \
   | grep __cpp_lib_polymorphic_allocator
 $ echo | g++-10 -E -dD -x c++ - -include memory_resource -std=c++20 2>&1 \
   | grep __cpp_lib_polymorphic_allocator
 #define __cpp_lib_polymorphic_allocator 201902L
 $
...

A similar problem exists for commit 3173529d7de ("[gdb/guile, c++20] Work
around Werror=volatile in libguile.h").  Fix this by testing for 201709L
instead.

Tested on x86_64-linux, by building gdb with
{gcc 10, clang 17.0.6} x {-std=c++17, -std=c++20}.

PR build/32503
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32503

[1] https://en.cppreference.com/w/cpp/feature_test#cpp_lib_polymorphic_allocator
---
 gdb/guile/guile-internal.h      | 2 +-
 gdbsupport/default-init-alloc.h | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gdb/guile/guile-internal.h b/gdb/guile/guile-internal.h
index 8d83b8b808a..f4dd800d4ac 100644
--- a/gdb/guile/guile-internal.h
+++ b/gdb/guile/guile-internal.h
@@ -30,7 +30,7 @@
 #include "objfiles.h"
 #include "top.h"
 
-#if __cplusplus >= 202002L
+#if __cplusplus >= 201709L
 /* Work around Werror=volatile in SCM_UNPACK for
    SCM_DEBUG_TYPING_STRICTNESS == 1.  Reported upstream:
    https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65333 .  */
diff --git a/gdbsupport/default-init-alloc.h b/gdbsupport/default-init-alloc.h
index e84110f128a..7a29e21035c 100644
--- a/gdbsupport/default-init-alloc.h
+++ b/gdbsupport/default-init-alloc.h
@@ -18,9 +18,7 @@
 #ifndef GDBSUPPORT_DEFAULT_INIT_ALLOC_H
 #define GDBSUPPORT_DEFAULT_INIT_ALLOC_H
 
-#if __cplusplus >= 202002L
 #include <memory_resource>
-#endif
 
 namespace gdb {
 
@@ -35,7 +33,7 @@ namespace gdb {
 
 template<typename T,
 	 typename A
-#if __cplusplus >= 202002L
+#if __cpp_lib_polymorphic_allocator
 	 = std::pmr::polymorphic_allocator<T>
 #else
 	 = std::allocator<T>

base-commit: d4efbce75f1f98db0837f3791a65d9cb433f7861
-- 
2.43.0