From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 631E03858D1E; Fri, 23 Dec 2022 13:46:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 631E03858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671803160; bh=g1zXG9l34Qtc11mPqt7pKHpBWy0hviT2VhsI1ig1Wqo=; h=From:To:Subject:Date:From; b=ZgGQ1m4SOf+56WF0q6TJJE310SfQyETZimNQIof+sb/0NWhPgCSsC8YaHOW6Qdeag 9isAf0S4ZNfysZwINpQI1BDg0E7Tk7Q9zmdNYW0m5bJ2j+cAjw7KatvDBL+b94+Km0 NZoHudBhzf5ZS+pYWmwYhpnMLQHnkDBb5HWi1YJE= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-4875] libstdc++: Fix Darwin bootstrap error in src/c++20/tzdb.cc X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 1e7d2b2d22c509abbd0a59840fae7c4ed26d273b X-Git-Newrev: b358521b608f36409281a51263ace3155d28f54d Message-Id: <20221223134600.631E03858D1E@sourceware.org> Date: Fri, 23 Dec 2022 13:46:00 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b358521b608f36409281a51263ace3155d28f54d commit r13-4875-gb358521b608f36409281a51263ace3155d28f54d Author: Jonathan Wakely Date: Fri Dec 23 13:43:52 2022 +0000 libstdc++: Fix Darwin bootstrap error in src/c++20/tzdb.cc Mach-O requires weak symbols to have a definition, so add a default implementation of __gnu_cxx::zoneinfo_dir_override. libstdc++-v3/ChangeLog: * src/c++20/tzdb.cc [__APPLE__] (zoneinfo_dir_override): Add definition. Diff: --- libstdc++-v3/src/c++20/tzdb.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc index a02bcd4aec7..5f5c4199f65 100644 --- a/libstdc++-v3/src/c++20/tzdb.cc +++ b/libstdc++-v3/src/c++20/tzdb.cc @@ -52,6 +52,10 @@ # endif #endif +#ifndef _GLIBCXX_ZONEINFO_DIR +# define _GLIBCXX_ZONEINFO_DIR "/usr/share/zoneinfo" +#endif + namespace __gnu_cxx { #ifdef _AIX @@ -59,6 +63,12 @@ namespace __gnu_cxx const char* (*zoneinfo_dir_override)() = nullptr; #else [[gnu::weak]] const char* zoneinfo_dir_override(); + +#ifdef __APPLE__ + // Need a weak definition for Mach-O. + [[gnu::weak]] const char* zoneinfo_dir_override() + { return _GLIBCXX_ZONEINFO_DIR; } +#endif #endif } @@ -934,9 +944,6 @@ namespace std::chrono return info; } -#ifndef _GLIBCXX_ZONEINFO_DIR -# define _GLIBCXX_ZONEINFO_DIR "/usr/share/zoneinfo" -#endif namespace { string