From patchwork Tue Aug 6 09:02:37 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: 95363 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3F1B0385DDC0 for ; Tue, 6 Aug 2024 09:06:32 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 8FA8C385E44D for ; Tue, 6 Aug 2024 09:03:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8FA8C385E44D 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 8FA8C385E44D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::329 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722935011; cv=none; b=lFVtgu7ZRfJQmK40PfDezhC/xO3pV+1QaSUSz7Wv+U3d6OjNLSULcb8BcUVBZdVNn94u4oq/HaDqU15spFSZmgdT9lM5FP4baT3DqBVQxZs6+us1C+Es4uvjG+5zLADkqS5bJ42kk9pA1z0clRke5V0wKEJZJTzvXUFqxGWyJxo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722935011; c=relaxed/simple; bh=NeHFqN4/wxB+kRb1m3RGsjVaIPY7XQVolk5oT20+imM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=EHLkjuJIo/LgQCFhVKZCIoiq1ckSRiwQSgYPSkaTmDdmDw0UojQ0Qs66Nt06YEY5JI0/jnyBaJi589bwAV1OU2omlF9QejEjtzc2dgphfTBNZDhky5O0VyimQCQi41OCF1OKksa5sB5iDlam3eQmEgAPmE2MoZuZItxzvLNAPrk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-42816ca782dso3084715e9.2 for ; Tue, 06 Aug 2024 02:03:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1722935007; x=1723539807; 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=2pkU0onNx3urbJSsZ4PgJiBrt37e5xxyfgyahfTU79A=; b=Z5I4RWySE1EhKb+H0HlfR4vgjh3vk1sJ5OV2ywZcA6Mpo2sDLj2lOTyS6PELJ5qsxe /N27V+Z7nYTZzf/g+xi5EkB965U0gzCU0y3eorQBT2lg03TOGgTuw2bm6Zb/XMXZgLnS ONRqQxTB/6xE4BZcn2aL/EcOqZLavQMZwZdD91fpo+mePhphHKGyJ1A8ELuetFBal+wa HfTYSW/18Gmr4Kg/YveHiZLn6atGldwzFom3D8XPJ4dDbrbzoEmOK1/SFVe3qyyr+nDH fuhtX2mxgDhaP/kQzCx8dn73BhTPgVjr1Kf/7UWL9aL4WCpj9X/hCwxYUFtX68Nzyxm1 cGCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722935007; x=1723539807; 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=2pkU0onNx3urbJSsZ4PgJiBrt37e5xxyfgyahfTU79A=; b=qVpyd0/mI92980pQBgc0MHw6ni2D09zF/oacyOmBFCS6EyxqQ+tTE3k7uTc7FSl0IZ XLeXwXvw3bjoFYuQGIziStJtpfBPMsOxtLlkNz9oaZQx5eqWJ+zfKQCY0syty9sitUaI /6iQ5sULKVoo5/QvoApQQfy2fM15pFTV7gsvdnS7vQo4kvQ9Ca7r55YLPiZNHhMBqcD2 nGbKe9TJa+Sw7ITgBoxKbJndK0+dMhapsfaDHlp/yscLjYY6XeCXhocaVCCdWOyC6Lxx y4R4qgmoajD1zfDkE5rArLj51RB44MkzU042pfTjgaTRrzQdUw3FhRJHgc/ecNwoOpby koRQ== X-Gm-Message-State: AOJu0YwCZvZCD6L+xvYhM2yGs13vmwlc5PhgFhR/pq8CX1/aiMN55WDq 6/lQttUCgbvyt2B71x25nZN/ehIJckmNIyDJ1Xz98p5viUfRxyfs76MMb6BBQrT8qa+HYgKYX7b phg== X-Google-Smtp-Source: AGHT+IHZqkC9dm+/pcqLnZpykQHou9q/usBE4LuLuikjVCRMYk5cjB/F/n2HW4REw5ftaI+jcAzJsw== X-Received: by 2002:a05:600c:4507:b0:428:2433:1a07 with SMTP id 5b1f17b1804b1-428e6b93494mr94621115e9.34.1722934976842; Tue, 06 Aug 2024 02:02:56 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 02:02:56 -0700 (PDT) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Viljar Indus Subject: [COMMITTED 5/9] ada: Use fully qualified in more library files Date: Tue, 6 Aug 2024 11:02:37 +0200 Message-ID: <20240806090241.576862-5-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~patchwork=sourceware.org@gcc.gnu.org From: Viljar Indus gcc/ada/ * libgnarl/s-interr__hwint.adb: Use fully qualified names to avoid ambiguity. * libgnarl/s-taprop__qnx.adb: Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/libgnarl/s-interr__hwint.adb | 11 ++++++----- gcc/ada/libgnarl/s-taprop__qnx.adb | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gcc/ada/libgnarl/s-interr__hwint.adb b/gcc/ada/libgnarl/s-interr__hwint.adb index 12dde452ff4..0cccf6fd294 100644 --- a/gcc/ada/libgnarl/s-interr__hwint.adb +++ b/gcc/ada/libgnarl/s-interr__hwint.adb @@ -482,9 +482,10 @@ package body System.Interrupts is Handler : System.OS_Interface.Interrupt_Handler) is Vec : constant Interrupt_Vector := - Interrupt_Number_To_Vector (int (Interrupt)); + Interrupt_Number_To_Vector + (Interfaces.C.int (Interrupt)); - Status : int; + Status : Interfaces.C.int; begin -- Only install umbrella handler when no Ada handler has already been @@ -613,7 +614,7 @@ package body System.Interrupts is procedure Notify_Interrupt (Param : System.Address) is Interrupt : constant Interrupt_ID := Interrupt_ID (Param); Id : constant Binary_Semaphore_Id := Semaphore_ID_Map (Interrupt); - Status : int; + Status : Interfaces.C.int; begin if Id /= 0 then Status := Binary_Semaphore_Release (Id); @@ -744,7 +745,7 @@ package body System.Interrupts is -------------------- procedure Unbind_Handler (Interrupt : Interrupt_ID) is - Status : int; + Status : Interfaces.C.int; begin -- Flush server task off semaphore, allowing it to terminate @@ -1024,7 +1025,7 @@ package body System.Interrupts is Tmp_Handler : Parameterless_Handler; Tmp_ID : Task_Id; Tmp_Entry_Index : Task_Entry_Index; - Status : int; + Status : Interfaces.C.int; begin Semaphore_ID_Map (Interrupt) := Int_Sema; diff --git a/gcc/ada/libgnarl/s-taprop__qnx.adb b/gcc/ada/libgnarl/s-taprop__qnx.adb index 39e6983f438..d6680b58dba 100644 --- a/gcc/ada/libgnarl/s-taprop__qnx.adb +++ b/gcc/ada/libgnarl/s-taprop__qnx.adb @@ -300,7 +300,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;