From patchwork Tue Apr 16 03:16:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 1923951 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=CKTItoyh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VJTjd5NXCz1yZC for ; Tue, 16 Apr 2024 13:17:09 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D37F73858C60 for ; Tue, 16 Apr 2024 03:17:07 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id 263523858D32 for ; Tue, 16 Apr 2024 03:16:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 263523858D32 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 263523858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::634 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713237408; cv=none; b=ctoW+8m85R+L2SgvU8exhk20bERx+CkLYL9RTvYbaE3DBQLqL9a4UJovs9R4qnKkgGxoBazyx61XFWoJGQtUgiNAA2Sp264AolhhlRzGnE/BMv8kmPeo+lgDNwg7iHBguckefSQrNn7paylZsm9rRafFoaI7wB893RcQ4hBd3ag= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713237408; c=relaxed/simple; bh=5/ySjQ/MYg2K8R9Y3dbl9/e6J4LIr0QFH7yI6k5tB8E=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=OiRTRp25kas9yEiClG9+z6WbVkhHzK1jBCuzPN63bkZ9I/BHq7ecenLbxSkJrMVCxHeEdVhrwsO1TPL/JSw4ZjmKuoqXmyM3qEbObTi+nI135+ZKdgy5setA4o6HZHXLwYGvWyYL5ObDFej9TGOD8wXxE9PPlk3ErkA8TAPwKiA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1e3ff14f249so30156055ad.1 for ; Mon, 15 Apr 2024 20:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1713237406; x=1713842206; darn=gcc.gnu.org; h=mime-version:user-agent:message-id:date:organization:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Opwt6Gy1XGbJ8dyso5lvi8sGKMYAZtNZ25ionLahOPs=; b=CKTItoyh9PqvX4UlOXT6xfz6JH/wyyMQi9N4yOaUEKOUffmCtdOAB47abDloiZyUvm OUc22T/mvkRwj9oim4YOc1wXMM2Lp80J3zI+4o7qKebntP8CVeAfo/V3E+xcrLRX29PR jqpZH3Trt+P6ZpR31hQT4Z61ipBbSTonm9o/xlnV1xU7XruiYVaHY34qVN4aZ983eEei hBYgaz+zYCT1hJuNX06veS+t/bGQwcNlPzbMg6Pm0Z36WSdBJqQOP2amSNFJMhWySS9I gvK+QY8CbXrOt3Sdwks9aDMKiheE5aa4O6d5sW5NwQF9D9Es2VR9YWqZ5vHkJhqWwNtZ mvPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713237406; x=1713842206; h=mime-version:user-agent:message-id:date:organization:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Opwt6Gy1XGbJ8dyso5lvi8sGKMYAZtNZ25ionLahOPs=; b=wPkiSld4vv8WoZoWtDgDsefll4Ej1jNImr+v0+be41KazrQ6Yv/RhXPHu8SFuafnFS W3a2/EhJJeTvDf+/l5Qm96cnuGq8+JLyBIjugag/Omy1LA3N+Yoaak9/GI/vXsjHgUxT f/7vOnkiYKM++DAQA1EtjMXpVzFkbBZ3nyUiWrUvZdwTFgaRsM9fYoMN6IbMu1DfgTIH ZsDEOACpf9lyRSPresoPI4Tc5J6PmD046bOZToh9loN6Z3a33cV1WMJlDSfwLoH3S5Rf Hpy/3PP7DOGDeJAiKTZuf+FpCLpSD1TIsbUN/2fM6LPm6wX6OP4aZII1kUa11Ce+Y2ls z0Pw== X-Gm-Message-State: AOJu0YxsRc2BoQ2CbI4P8kyRUmbV/xc8Z5W6bYxW7sS7o082bOSCaTv8 F768abHI6u8dFKFBSVRL9PklrAzTT0wcAX5i+zKLzFtE4a0Fn4SRyIhVybKEGm+t4VBI3QYbaUf IrA== X-Google-Smtp-Source: AGHT+IHsGBQdEUADA+bgRk/BJPF9LMD2I7wk/NArK1fURbIRmQHbLC5g/COa0jQXLzbvxsRB2FPZ4g== X-Received: by 2002:a17:903:234c:b0:1e2:58f:7ed4 with SMTP id c12-20020a170903234c00b001e2058f7ed4mr1527229plh.5.1713237405915; Mon, 15 Apr 2024 20:16:45 -0700 (PDT) Received: from free.home ([2804:7f1:218b:5e2:c43b:e0c4:71a:241b]) by smtp.gmail.com with ESMTPSA id p11-20020a170902e74b00b001e3c77db2aesm8643338plf.88.2024.04.15.20.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 20:16:45 -0700 (PDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 43G3GYIT2387053 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 16 Apr 2024 00:16:34 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH] [libstdc++] define zoneinfo_dir_override on vxworks Organization: Free thinker, does not speak for AdaCore Date: Tue, 16 Apr 2024 00:16:34 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, WEIRD_QUOTING autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org VxWorks fails to load kernel-mode modules with weak undefined symbols. In RTP mode modules, that undergo final linking, weak undefined symbols are not a problem. This patch adds kernel-mode VxWorks multilibs to the set of targets that don't support weak undefined symbols without special flags, in which tzdb's zoneinfo_dir_override is given a weak definition. Regstrapped on x86_64-linux-gnu. Also tested with gcc-13 on arm-, aarch64-, x86- and x86_64-vxworks7r2. Ok to install? for libstdc++-v3/ChangeLog * src/c++20/tzdb.cc (__gnu_cxx::zoneinfo_dir_override): Define on VxWorks non-RTP. --- libstdc++-v3/src/c++20/tzdb.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc index 890a4c53e2d44..639d1c440ba16 100644 --- a/libstdc++-v3/src/c++20/tzdb.cc +++ b/libstdc++-v3/src/c++20/tzdb.cc @@ -70,8 +70,9 @@ namespace __gnu_cxx #else [[gnu::weak]] const char* zoneinfo_dir_override(); -#if defined(__APPLE__) || defined(__hpux__) - // Need a weak definition for Mach-O. +#if defined(__APPLE__) || defined(__hpux__) \ + || (defined(__VXWORKS__) && !defined(__RTP__)) + // Need a weak definition for Mach-O et al. [[gnu::weak]] const char* zoneinfo_dir_override() { #ifdef _GLIBCXX_ZONEINFO_DIR