From patchwork Thu Aug 15 17:17:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Arsen_Arsenovi=C4=87?= X-Patchwork-Id: 1972859 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; unprotected) header.d=aarsen.me header.i=@aarsen.me header.a=rsa-sha256 header.s=MBO0001 header.b=CNoZrDdw; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4WlBg320NHz1yYl for ; Fri, 16 Aug 2024 03:18:50 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9939D385B505 for ; Thu, 15 Aug 2024 17:18:48 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [IPv6:2001:67c:2050:0:465::202]) by sourceware.org (Postfix) with ESMTPS id D25463858D34 for ; Thu, 15 Aug 2024 17:18:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D25463858D34 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=aarsen.me Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=aarsen.me ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D25463858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:67c:2050:0:465::202 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723742298; cv=none; b=v2zYQB2gwL4WT1r0V0r5JoWqps1sWlOKy4v1DomsWj9OkfzVqHiCSxhx/lG4zvLtcJ/8eHgrcGJihmoSq5U1sQIZLOs/SkTwe8i22s+OVTnSunBStxQ4/sgWRIdc4OTci9xCyiXpZ+cmlsaquAAqiVmZOG9NA7L8SPkawW//E9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723742298; c=relaxed/simple; bh=UdO2k1Y35GPkalTsxOCVF4a6p9VtWj3ASaBqZYdA0go=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=IF1e6DnPnnBmoXkb9/EWynniva2iBUFduMiqgqmw7DYbRRoklc7r1Yh043Ri5gD4AtKKQQe8y2Suzxj2GUjy7cAH+SKkS2HllKTsHnWcyjp/8WDpoymmHeC/5RsTksKfo+36sHpCZFMf/2djRF/MJpywpR5/DoyvKzW8gVarnJY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4WlBf36lNnz9spL; Thu, 15 Aug 2024 19:18:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1723742284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=mpJ2Z6jOWW8ZBNUlOU0Hm8/RlSXVTPxcj0zStB77Doo=; b=CNoZrDdwhdEwoZeWn39ywvXyEDL19TV5XknOezClHMVezN/z+tfTQ6G6+kU5n9xDw2wc5c Okah69et+jPC3EdXUZza/7Oxf7/QtrojDcK+nOU/N8wohR6GlHUAGOPQBfRUootbqXR4pV 77KU7yCtX9v4uHWHsNseVxjLNZlhz2QK2CmFKp9dSikDmGPMAlt1q4hmu7y0fhLnnVrZpV LEhR8JuHUne8zKL8WyC+eSqcaakXMxZZBgypNSyuuI5CMfp2dZl+lTxuO0SXxZvOjIZW2J akuD+JPJy57KyniCxsLt6VM7HraNRt+vEE5bATCkUyQdTB1iB7e70GcluauJLw== From: =?utf-8?q?Arsen_Arsenovi=C4=87?= To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Cc: gcc-patches@gcc.gnu.org, =?utf-8?q?Arsen_Arsenovi=C4=87?= Subject: [PATCH] gnat: fix lto-type-mismatch between C_Version_String and gnat_version_string [PR115917] Date: Thu, 15 Aug 2024 19:17:41 +0200 Message-ID: <20240815171753.1630083-1-arsen@aarsen.me> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4WlBf36lNnz9spL X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_INFOUSMEBIZ, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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 Reg-tested on x86_64-pc-linux-gnu with all languages and yes,rtl,extra checking. OK for trunk? TIA, have a lovely day. ---------- >8 ---------- gcc/ada/ChangeLog: PR ada/115917 * gnatvsn.ads: Add note about the duplication of this value in verrsion.c. * version.c (VER_LEN_MAX): Define to the same value as Gnatvsn.Ver_Len_Max. (gnat_version_string): Use VER_LEN_MAX as bound. --- gcc/ada/gnatvsn.ads | 3 ++- gcc/ada/version.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/ada/gnatvsn.ads b/gcc/ada/gnatvsn.ads index 29238362cc04..f2082ece0965 100644 --- a/gcc/ada/gnatvsn.ads +++ b/gcc/ada/gnatvsn.ads @@ -83,7 +83,8 @@ package Gnatvsn is -- space to store any possible version string value for checks. This -- value should never be decreased in the future, but it would be -- OK to increase it if absolutely necessary. If it is increased, - -- be sure to increase GNAT.Compiler.Version.Ver_Len_Max as well. + -- be sure to increase GNAT.Compiler.Version.Ver_Len_Max, and to update + -- the VER_LEN_MAX define in version.c as well. Ver_Prefix : constant String := "GNAT Version: "; -- Prefix generated by binder. If it is changed, be sure to change diff --git a/gcc/ada/version.c b/gcc/ada/version.c index 5e64edd0b17d..2fa9b8c2c859 100644 --- a/gcc/ada/version.c +++ b/gcc/ada/version.c @@ -31,4 +31,7 @@ #include "version.h" -char gnat_version_string[] = version_string; +/* Logically a reference to Gnatvsn.Ver_Len_Max. Please keep in sync. */ +#define VER_LEN_MAX 256 + +char gnat_version_string[VER_LEN_MAX] = version_string;