From patchwork Tue Aug 6 09:02:35 2024 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: 1969382 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=EsQrvaVT; 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 4WdS5k132sz1yYD for ; Tue, 6 Aug 2024 19:03:38 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D9AED385700F for ; Tue, 6 Aug 2024 09:03:35 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by sourceware.org (Postfix) with ESMTPS id 1A8ED385841C for ; Tue, 6 Aug 2024 09:02:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1A8ED385841C 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 1A8ED385841C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::234 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722934979; cv=none; b=Pye/ZvRcRmjgDOzM+hi19XklepnZNvfuUibrK5Bb7WJs7TSZ/aN1C+ZnIzccukA45VmxgS2bf8JKWkMKsQn2bLtPQcOTWxb8r9XH38fGpo++PsrY/U4hSggTupcu00pX3PUQFz8zTVze5l0Tp6fN0Xtl/1gcKSKlvNEc02UfKKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722934979; c=relaxed/simple; bh=eU0n6GV+UwSfcoSTuEwvHDuqasS/p9pX/7eSO2gAjZI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=L6gypo0Cu+3CFUNf9AGhEwmZ4KUEsBGD08+L69KIhU2gqWmdZDZGgoosW5p32D6hfmseKh8FmcVAy3mlMvxElF9a9pWMMH95O260jAiufVVquncXO/rMaskPzOeZry3kSnkH8XRnmHsGf23LD8Oz80736lzXx+F46eTkM1J9GH4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2ef2c56da6cso3439151fa.1 for ; Tue, 06 Aug 2024 02:02:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1722934975; x=1723539775; 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=ndq8PN1PmCKhCne+XOiZRdJedHfwFtUEzyLgItmrHk8=; b=EsQrvaVTHnFltck9Zt74NgYjIBY1OZVDpw4Wd/S0pxhEnVFi5vFpzDOYUIpSo4W1OE EAYddoY9uidusag1y5DLUyClOqWL0XAKVFE1X/rjEjz9TzfB//hW8hAA/s2tHASjCh7p 07/sjQ+YLhhd56DI/p0PSfMglN5Xk6su1atxOaGGKm7O7Ly+OqXBqm9zkOd9bT0hwKqb 8p+trYEFDDl4/P0hGkknsuT/TJj+zTRUFWVhrBpXFBQGFTN240ZwREvWPBhgVBla6Zho JVCVWNrm483cBFSiOx85Re8lnga/1tKZDjlZIzZWcl0DdEAlVY1p14FxuA1C9LOsAcZZ lKSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722934975; x=1723539775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ndq8PN1PmCKhCne+XOiZRdJedHfwFtUEzyLgItmrHk8=; b=Mx0qqic8nOR00yJ8izNY4WuC8qnQj6DSG4p3ki+6n8NvOdcqVpVLQO9PFU3rKD9n8/ umVdgPqTwzrD6hworCLq2GQwMGkqx33d4JctnmN050LcIVwbnbbbVlIaVcQN/8AMpHYv rnqGvdi02w1R0cjHVUD67ZVnUxqn0oZdNA6SeG2I3168Of6/vOCnpUVVNw1BYkXrDHBz KoMrO1uFJA/jJSlZFtJTwCjq5eX3DddmO+I/oomzrjmaSEFLidgrPOqERlL0bXxH0tn/ N6P61Ra32HiQX9X6PM2dEYIHxK9+VqtBqWsZIOgKyYLvc5g8WOZgirSGSBzk+G9pSUih 8I5A== X-Gm-Message-State: AOJu0YxMvhad2HPDmwJbIeM3XkAFRNw40FWu8hriErmpNcmD93Ffz61J QbhBy251UFxjsgI1J1rbNv4KhQMfbVmJcCXOYnIAWUtABRJS9PDlWEKvvHafAC4PFMrvNTd7lyi I7w== X-Google-Smtp-Source: AGHT+IHvuuoYa2wtW8kdoTA5ZkkQkk+2/8SDFigUkligwWt4F4w39VPdnv52wnA5dMyzuB22dcYvMA== X-Received: by 2002:a2e:be94:0:b0:2f1:6cd4:a820 with SMTP id 38308e7fff4ca-2f16cd4a8eemr84308871fa.31.1722934975358; Tue, 06 Aug 2024 02:02:55 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-428e6e03c4csm173461085e9.13.2024.08.06.02.02.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 02:02:54 -0700 (PDT) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Viljar Indus Subject: [COMMITTED 3/9] ada: Use fully qualified in the runtime library Date: Tue, 6 Aug 2024 11:02:35 +0200 Message-ID: <20240806090241.576862-3-poulhies@adacore.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240806090241.576862-1-poulhies@adacore.com> References: <20240806090241.576862-1-poulhies@adacore.com> MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 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 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 From: Viljar Indus gcc/ada/ * libgnarl/s-taprop__mingw.adb: Use fully qualified names to avoid ambiguity. * libgnarl/s-taprop__posix.adb: Likewise. * libgnarl/s-taprop__qnx.adb: Likewise. * libgnarl/s-taprop__rtems.adb: Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/libgnarl/s-taprop__mingw.adb | 2 +- gcc/ada/libgnarl/s-taprop__posix.adb | 2 +- gcc/ada/libgnarl/s-taprop__qnx.adb | 16 ++++++++-------- gcc/ada/libgnarl/s-taprop__rtems.adb | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gcc/ada/libgnarl/s-taprop__mingw.adb b/gcc/ada/libgnarl/s-taprop__mingw.adb index f77d71970b8..8c7f59f1c5d 100644 --- a/gcc/ada/libgnarl/s-taprop__mingw.adb +++ b/gcc/ada/libgnarl/s-taprop__mingw.adb @@ -1035,7 +1035,7 @@ package body System.Task_Primitives.Operations is ------------------- function RT_Resolution return Duration is - Ticks_Per_Second : aliased LARGE_INTEGER; + Ticks_Per_Second : aliased System.OS_Interface.LARGE_INTEGER; begin QueryPerformanceFrequency (Ticks_Per_Second'Access); return Duration (1.0 / Ticks_Per_Second); diff --git a/gcc/ada/libgnarl/s-taprop__posix.adb b/gcc/ada/libgnarl/s-taprop__posix.adb index fb70aaf4976..3d76679ad4a 100644 --- a/gcc/ada/libgnarl/s-taprop__posix.adb +++ b/gcc/ada/libgnarl/s-taprop__posix.adb @@ -209,7 +209,7 @@ package body System.Task_Primitives.Operations is new Ada.Unchecked_Conversion (Task_Id, System.Address); function GNAT_pthread_condattr_setup - (attr : access pthread_condattr_t) return int; + (attr : access pthread_condattr_t) return Interfaces.C.int; pragma Import (C, GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup"); diff --git a/gcc/ada/libgnarl/s-taprop__qnx.adb b/gcc/ada/libgnarl/s-taprop__qnx.adb index f475c05c562..39e6983f438 100644 --- a/gcc/ada/libgnarl/s-taprop__qnx.adb +++ b/gcc/ada/libgnarl/s-taprop__qnx.adb @@ -119,7 +119,7 @@ package body System.Task_Primitives.Operations is function Initialize_Lock (L : not null access RTS_Lock; - Prio : Any_Priority) return int; + Prio : Any_Priority) return Interfaces.C.int; -- Initialize the lock L. If Ceiling_Support is True, then set the ceiling -- to Prio. Returns 0 for success, or ENOMEM for out-of-memory. @@ -220,7 +220,7 @@ package body System.Task_Primitives.Operations is new Ada.Unchecked_Conversion (Task_Id, System.Address); function GNAT_pthread_condattr_setup - (attr : access pthread_condattr_t) return int; + (attr : access pthread_condattr_t) return Interfaces.C.int; pragma Import (C, GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup"); @@ -333,11 +333,11 @@ package body System.Task_Primitives.Operations is function Initialize_Lock (L : not null access RTS_Lock; - Prio : Any_Priority) return int + Prio : Any_Priority) return Interfaces.C.int is Attributes : aliased pthread_mutexattr_t; - Result : int; - Result_2 : aliased int; + Result : Interfaces.C.int; + Result_2 : aliased Interfaces.C.int; begin Result := pthread_mutexattr_init (Attributes'Access); @@ -425,9 +425,9 @@ package body System.Task_Primitives.Operations is (L : not null access Lock; Ceiling_Violation : out Boolean) is Self : constant pthread_t := pthread_self; - Result : int; - Policy : aliased int; - Ceiling : aliased int; + Result : Interfaces.C.int; + Policy : aliased Interfaces.C.int; + Ceiling : aliased Interfaces.C.int; Sched : aliased struct_sched_param; begin diff --git a/gcc/ada/libgnarl/s-taprop__rtems.adb b/gcc/ada/libgnarl/s-taprop__rtems.adb index ea8422cb454..0a33c194ec1 100644 --- a/gcc/ada/libgnarl/s-taprop__rtems.adb +++ b/gcc/ada/libgnarl/s-taprop__rtems.adb @@ -200,7 +200,7 @@ package body System.Task_Primitives.Operations is new Ada.Unchecked_Conversion (Task_Id, System.Address); function GNAT_pthread_condattr_setup - (attr : access pthread_condattr_t) return int; + (attr : access pthread_condattr_t) return Interfaces.C.int; pragma Import (C, GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup"); @@ -304,7 +304,7 @@ package body System.Task_Primitives.Operations is Res := mprotect (Stack_Base - (Stack_Base mod Page_Size) + Page_Size, - size_t (Page_Size), + Interfaces.C.size_t (Page_Size), prot => (if On then PROT_ON else PROT_OFF)); pragma Assert (Res = 0); end if;