aboutsummaryrefslogtreecommitdiff
path: root/gdbsupport
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2025-01-10 08:40:11 +0100
committerTom de Vries <tdevries@suse.de>2025-01-10 08:40:11 +0100
commit6f04937e1d7db190ca96ec08d8aeb25f0ec6e994 (patch)
treede5d58cda64d3d65ef78eed7bc3216bcdaa0f2e2 /gdbsupport
parentad59259604f008e20490f9c82cf287d5a601a66c (diff)
downloadbinutils-6f04937e1d7db190ca96ec08d8aeb25f0ec6e994.zip
binutils-6f04937e1d7db190ca96ec08d8aeb25f0ec6e994.tar.gz
binutils-6f04937e1d7db190ca96ec08d8aeb25f0ec6e994.tar.bz2
[gdb/build, c++20] Fix build with gcc 10
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 Approved-By: Tom Tromey <tom@tromey.com> [1] https://en.cppreference.com/w/cpp/feature_test#cpp_lib_polymorphic_allocator
Diffstat (limited to 'gdbsupport')
-rw-r--r--gdbsupport/default-init-alloc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gdbsupport/default-init-alloc.h b/gdbsupport/default-init-alloc.h
index e84110f..1cb1dcf 100644
--- a/gdbsupport/default-init-alloc.h
+++ b/gdbsupport/default-init-alloc.h
@@ -18,7 +18,7 @@
#ifndef GDBSUPPORT_DEFAULT_INIT_ALLOC_H
#define GDBSUPPORT_DEFAULT_INIT_ALLOC_H
-#if __cplusplus >= 202002L
+#if __has_include(<memory_resource>)
#include <memory_resource>
#endif
@@ -35,7 +35,7 @@ namespace gdb {
template<typename T,
typename A
-#if __cplusplus >= 202002L
+#ifdef __cpp_lib_polymorphic_allocator
= std::pmr::polymorphic_allocator<T>
#else
= std::allocator<T>