From d694a3d57535fbb3737dd583b15b69e0845a5846 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 16 Jan 2023 15:52:20 +0000 Subject: [PATCH] libstdc++: Fix --with-default-libstdcxx-abi=gcc4-compatible build When building src/c++20/tzdb.cc we currently get a build error for --with-default-libstdcxx-abi=gcc4-compatible because std::chrono::tzdb and related types are not declared for the gcc4-compatible ABI (unless --disable-libstdcxx-dual-abi is also used, so that the gcc4-compatible ABI is the only one built). Define _GLIBCXX_USE_CXX11_ABI in tzdb.cc so that for a dual-abi build we always build it for the cxx11 ABI. libstdc++-v3/ChangeLog: * src/c++20/tzdb.cc (_GLIBCXX_USE_CXX11_ABI): Define to 1. --- libstdc++-v3/src/c++20/tzdb.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc index 2ce53d387687..20399b91e470 100644 --- a/libstdc++-v3/src/c++20/tzdb.cc +++ b/libstdc++-v3/src/c++20/tzdb.cc @@ -25,6 +25,9 @@ // The -Wabi warnings in this file are all for non-exported symbols. #pragma GCC diagnostic ignored "-Wabi" +// In the usual dual-abi build, std::chrono::tzdb is only defined for cxx11. +#define _GLIBCXX_USE_CXX11_ABI 1 + #include #include // ifstream #include // istringstream -- 2.47.3