From patchwork Tue Jun 2 08:45:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 136276 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 89B114BA23CE for ; Tue, 2 Jun 2026 09:23:39 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id D91EE4BA2E2C for ; Tue, 2 Jun 2026 08:46:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D91EE4BA2E2C 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 D91EE4BA2E2C Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::335 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780389988; cv=none; b=niHNprlqJv9/M6JIZD5T9vOld46FsTayebsaFF8zqGTYLOfTIliD16NXAeHd1qHJz6+s9jduFJ1hsXh3kXa72qhgecf3xeG+WHAUQuyNk/GNAJZyFbbsyR8hH5zZVkY/YB1mgbVIODgPoghS/z1DmST4mqbHvUFSqlsKLTb1S3M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780389988; c=relaxed/simple; bh=3TKgGDrs3eEv6dmAuivD94IiXOO9KoY6rC8M4stmSl0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=XNRyTkiG4EHWiJViUDFFsFhsRctXUHAt43zb3TZ46XszKd0MGWmGI8WXyl4AqvhF6UNYGVamptUdj6qMfijUm6mbAYpjFdm5OqrHPctVZKBuQGhoNJsFlQyEshyUcBvHvOL04ME+d6gSraGvQ4AgeDZ3C1Os4drWyXpMiHL/Htw= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=as/M0RC9 DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D91EE4BA2E2C Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=as/M0RC9 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4909e3fa4b2so39355715e9.0 for ; Tue, 02 Jun 2026 01:46:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1780389987; x=1780994787; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5dv/QIhWhFtI/Of4iW/9jQnPPDccnj1WFxGTvtsnZq8=; b=as/M0RC9M1kA8SojV+bvYVsVyibQ7HGkXos2mwdPBBCsMGpClH5QxvFs4UEd15fJ5Y BX9btWcfxDzOdnFb4Smtk33dBKmTuCsv6bNgkPLOpej0MPi67pvpzFjDDNaDKTliXgY4 byTKH2KxmmRtvG417pUE3L5ItuwfddTe4+Uq7IkfyphfK2W8SSwhn4RCvkAO56dyoVxk UpyYN69MZ9RIQxqkaFTA5XxQxgfk9trWT6eh5Vel5/gZFVR02Mk4kKxK4WURGB2aS8Vs Sr5gFdlbIoqQWUDqiyElAQwh7s80bRH94cOp/VKWCfaGfCHha7GMprRv4mr/pEHuhqsa 6uJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780389987; x=1780994787; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5dv/QIhWhFtI/Of4iW/9jQnPPDccnj1WFxGTvtsnZq8=; b=so6BAdlHCSp3uhrss8+O7YJTShJEGTUFfi89se7jRAbGbUNdb0ds4xWazsHuSD0Hww CpRYUtabq77CcpJKm4wv5q6EsLIqSLuSH77fWeov2QL+PYfWBslZYYYZcR9QbTtB01wb 3KTC8t2F47whXDp04xBp2Fy2FPA09UHzn6rKOvSOqOJTSAElxcL2qx5NfpjjJw51Vj87 HowEdiMzzeL4ZVVWN+UkQaQlRTXGgsay4VwMUiPf1YfdlSUIy3aqpTSYG3KqSyiIoX5R /yzX4svno9ftTGVtmBHDRuNs2jtfH3qNJw6rjUmiCs2IKc4eA5ndtznRcPdsNUxzQcpp 5UuQ== X-Gm-Message-State: AOJu0YyxJj0/3QBJmdi4hA/L2xdhSV+00aoI3Wvc+OMr9KhFBVKVwyer GtAOBH18eGXUONBZsqrKAPhBsKFqKdpV+74UqOjb6FuWWl/tG5uoi4P41QKnkp3046neau4Vrd3 1Jqk= X-Gm-Gg: Acq92OFjBr1TYI7Vv4Dy9DWmDK9gvsNJEQbXU9IURGOk37PbysdMNJn8vTVl8PvBmLk eAZnYQ6O+Wc6iAwBeuEZ/aesbhCu0ycF3QRYy8f7J2pmPK8lE8jTenYlzDbBN6KzqWbZ8tkp2AZ yDcayIMMKD7MhW8P29Qa3BJzzTfu1SjUDGnubeF5KPLwFFjDbvaMPPCpWGc8lKSPeLPNu4Vl0mN 3X3nALyBgNf1xSSDea/6nuV5kA2niYNhpZPQW7/2NWfpol+0xNYKRCkjveiuSJNRwvHoMMm0Bxx +G0c1xcKymoYQ1Z/RrQDI5zNHFt9qF5i2SiIQt5y50hYOErmXIsKza3vGuiBU4wW/30nPmlyHxs +N4Myhjggyua/LtIQ6TAknsUWpXjoHkDEvVBDGcQGwG6fEWINUeG/hn97TmGoh2SZoPuxpef22P FowZYQLpTeS10ETNwTguHB7qvfXAVVFyo+Y3br4clIW+rsZYHudrq/gWrG8oK0p+G/ol4i0LVTE PiCmMa8UTubxpVugCJFJzmUF3HpzIU= X-Received: by 2002:a05:600d:8444:20b0:490:7136:ad02 with SMTP id 5b1f17b1804b1-490b078f2d5mr45753915e9.7.1780389986706; Tue, 02 Jun 2026 01:46:26 -0700 (PDT) Received: from mecano.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490ab55d39csm33907625e9.35.2026.06.02.01.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 01:46:25 -0700 (PDT) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED 36/51] ada: Simplify host and target suffix queries Date: Tue, 2 Jun 2026 10:45:24 +0200 Message-ID: <20260602084541.3829876-36-poulhies@adacore.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260602084541.3829876-1-poulhies@adacore.com> References: <20260602084541.3829876-1-poulhies@adacore.com> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_PBL, SPF_HELO_NONE, SPF_PASS, TXREP shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on 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~patchwork=sourceware.org@gcc.gnu.org From: Piotr Trojanek Code cleanup for host and target suffixes, which are stored in C runtime code. gcc/ada/ChangeLog: * libgnat/s-os_lib.adb (Get_Debuggable_Suffix, Get_Executable_Suffix, Get_Object_Suffix, Get_Target_Debuggable_Suffix, Get_Target_Executable_Suffix, Get_Target_Object_Suffix): Access strings like we do in Gnatlink. * adaint.c (__gnat_object_suffix, __gnat_executable_suffix, __gnat_debuggable_suffix): Now constants, just like the ones for target suffixes. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/adaint.c | 45 ++------------- gcc/ada/libgnat/s-os_lib.adb | 106 +++++++---------------------------- 2 files changed, 25 insertions(+), 126 deletions(-) diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 5fb25571774..cf885126067 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -698,51 +698,18 @@ __gnat_get_current_dir (char *dir, int *length) dir[*length] = '\0'; } -/* Return the suffix for object files. */ +/* Suffix for object files. */ -void -__gnat_get_object_suffix_ptr (int *len, const char **value) -{ - *value = HOST_OBJECT_SUFFIX; +const char *__gnat_object_suffix = HOST_OBJECT_SUFFIX; - if (*value == 0) - *len = 0; - else - *len = strlen (*value); +/* Suffix for executable files. */ - return; -} +const char *__gnat_executable_suffix = HOST_EXECUTABLE_SUFFIX; -/* Return the suffix for executable files. */ - -void -__gnat_get_executable_suffix_ptr (int *len, const char **value) -{ - *value = HOST_EXECUTABLE_SUFFIX; - - if (!*value) - *len = 0; - else - *len = strlen (*value); - - return; -} - -/* Return the suffix for debuggable files. Usually this is the same as the +/* Suffix for debuggable files. Usually this is the same as the executable extension. */ -void -__gnat_get_debuggable_suffix_ptr (int *len, const char **value) -{ - *value = HOST_EXECUTABLE_SUFFIX; - - if (*value == 0) - *len = 0; - else - *len = strlen (*value); - - return; -} +const char *__gnat_debuggable_suffix = HOST_EXECUTABLE_SUFFIX; /* Returns the OS filename and corresponding encoding. */ diff --git a/gcc/ada/libgnat/s-os_lib.adb b/gcc/ada/libgnat/s-os_lib.adb index ae8ef2b1a08..0caab7e045e 100644 --- a/gcc/ada/libgnat/s-os_lib.adb +++ b/gcc/ada/libgnat/s-os_lib.adb @@ -35,6 +35,7 @@ with System.Case_Util; with System.CRTL; with System.Soft_Links; with Interfaces.C; +with Interfaces.C.Strings; package body System.OS_Lib is @@ -1034,22 +1035,11 @@ package body System.OS_Lib is --------------------------- function Get_Debuggable_Suffix return String_Access is - procedure Get_Suffix_Ptr (Length, Ptr : Address); - pragma Import (C, Get_Suffix_Ptr, "__gnat_get_debuggable_suffix_ptr"); - - Result : String_Access; - Suffix_Length : Integer; - Suffix_Ptr : Address; + Suffix : constant Interfaces.C.Strings.chars_ptr; + pragma Import (C, Suffix, "__gnat_debuggable_suffix"); begin - Get_Suffix_Ptr (Suffix_Length'Address, Suffix_Ptr'Address); - Result := new String (1 .. Suffix_Length); - - if Suffix_Length > 0 then - Strncpy (Result.all'Address, Suffix_Ptr, size_t (Suffix_Length)); - end if; - - return Result; + return new String'(Interfaces.C.Strings.Value (Suffix)); end Get_Debuggable_Suffix; --------------------------- @@ -1057,22 +1047,11 @@ package body System.OS_Lib is --------------------------- function Get_Executable_Suffix return String_Access is - procedure Get_Suffix_Ptr (Length, Ptr : Address); - pragma Import (C, Get_Suffix_Ptr, "__gnat_get_executable_suffix_ptr"); - - Result : String_Access; - Suffix_Length : Integer; - Suffix_Ptr : Address; + Suffix : constant Interfaces.C.Strings.chars_ptr; + pragma Import (C, Suffix, "__gnat_executable_suffix"); begin - Get_Suffix_Ptr (Suffix_Length'Address, Suffix_Ptr'Address); - Result := new String (1 .. Suffix_Length); - - if Suffix_Length > 0 then - Strncpy (Result.all'Address, Suffix_Ptr, size_t (Suffix_Length)); - end if; - - return Result; + return new String'(Interfaces.C.Strings.Value (Suffix)); end Get_Executable_Suffix; ----------------------- @@ -1080,22 +1059,11 @@ package body System.OS_Lib is ----------------------- function Get_Object_Suffix return String_Access is - procedure Get_Suffix_Ptr (Length, Ptr : Address); - pragma Import (C, Get_Suffix_Ptr, "__gnat_get_object_suffix_ptr"); - - Result : String_Access; - Suffix_Length : Integer; - Suffix_Ptr : Address; + Suffix : constant Interfaces.C.Strings.chars_ptr; + pragma Import (C, Suffix, "__gnat_object_suffix"); begin - Get_Suffix_Ptr (Suffix_Length'Address, Suffix_Ptr'Address); - Result := new String (1 .. Suffix_Length); - - if Suffix_Length > 0 then - Strncpy (Result.all'Address, Suffix_Ptr, size_t (Suffix_Length)); - end if; - - return Result; + return new String'(Interfaces.C.Strings.Value (Suffix)); end Get_Object_Suffix; ---------------------------------- @@ -1103,23 +1071,11 @@ package body System.OS_Lib is ---------------------------------- function Get_Target_Debuggable_Suffix return String_Access is - Target_Exec_Ext_Ptr : Address; - pragma Import - (C, Target_Exec_Ext_Ptr, "__gnat_target_debuggable_extension"); - - Result : String_Access; - Suffix_Length : Integer; + Suffix : constant Interfaces.C.Strings.chars_ptr; + pragma Import (C, Suffix, "__gnat_target_debuggable_extension"); begin - Suffix_Length := Integer (CRTL.strlen (Target_Exec_Ext_Ptr)); - Result := new String (1 .. Suffix_Length); - - if Suffix_Length > 0 then - Strncpy - (Result.all'Address, Target_Exec_Ext_Ptr, size_t (Suffix_Length)); - end if; - - return Result; + return new String'(Interfaces.C.Strings.Value (Suffix)); end Get_Target_Debuggable_Suffix; ---------------------------------- @@ -1127,23 +1083,11 @@ package body System.OS_Lib is ---------------------------------- function Get_Target_Executable_Suffix return String_Access is - Target_Exec_Ext_Ptr : Address; - pragma Import - (C, Target_Exec_Ext_Ptr, "__gnat_target_executable_extension"); - - Result : String_Access; - Suffix_Length : Integer; + Suffix : constant Interfaces.C.Strings.chars_ptr; + pragma Import (C, Suffix, "__gnat_target_executable_extension"); begin - Suffix_Length := Integer (CRTL.strlen (Target_Exec_Ext_Ptr)); - Result := new String (1 .. Suffix_Length); - - if Suffix_Length > 0 then - Strncpy - (Result.all'Address, Target_Exec_Ext_Ptr, size_t (Suffix_Length)); - end if; - - return Result; + return new String'(Interfaces.C.Strings.Value (Suffix)); end Get_Target_Executable_Suffix; ------------------------------ @@ -1151,23 +1095,11 @@ package body System.OS_Lib is ------------------------------ function Get_Target_Object_Suffix return String_Access is - Target_Object_Ext_Ptr : Address; - pragma Import - (C, Target_Object_Ext_Ptr, "__gnat_target_object_extension"); - - Result : String_Access; - Suffix_Length : Integer; + Suffix : constant Interfaces.C.Strings.chars_ptr; + pragma Import (C, Suffix, "__gnat_target_object_extension"); begin - Suffix_Length := Integer (CRTL.strlen (Target_Object_Ext_Ptr)); - Result := new String (1 .. Suffix_Length); - - if Suffix_Length > 0 then - Strncpy - (Result.all'Address, Target_Object_Ext_Ptr, size_t (Suffix_Length)); - end if; - - return Result; + return new String'(Interfaces.C.Strings.Value (Suffix)); end Get_Target_Object_Suffix; ------------