public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r13-5214] libstdc++: Fix --with-default-libstdcxx-abi=gcc4-compatible build
Date: Mon, 16 Jan 2023 16:09:49 +0000 (GMT)	[thread overview]
Message-ID: <20230116160949.73E303858CDB@sourceware.org> (raw)

https://gcc.gnu.org/g:d694a3d57535fbb3737dd583b15b69e0845a5846

commit r13-5214-gd694a3d57535fbb3737dd583b15b69e0845a5846
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Jan 16 15:52:20 2023 +0000

    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.

Diff:
---
 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 2ce53d38768..20399b91e47 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 <chrono>
 #include <fstream>    // ifstream
 #include <sstream>    // istringstream

                 reply	other threads:[~2023-01-16 16:09 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230116160949.73E303858CDB@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).