From patchwork Wed Aug 7 15:55:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 1970130 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=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=WZQtFj2Z; 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 4WfFCH22p7z1yXs for ; Thu, 8 Aug 2024 01:56:11 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E24E5385C6C7 for ; Wed, 7 Aug 2024 15:56:08 +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 5BF113858C41 for ; Wed, 7 Aug 2024 15:55:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5BF113858C41 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5BF113858C41 Authentication-Results: server2.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=1723046149; cv=none; b=GCn4OlL8xDaifqSDjdvYkhkyhLDzCwQ6BJeRIJQioP1yVw649iL3+fToBzQt43T2pUfcG6lJ6HxvAdqc9vKnQ8wVVTRBGvRraL1/epE6iui+8T2QYuDNWVJCwgVWVPt/gx5BEsbYIuVFnC0hUw14EYc9CF+/c3Fm4UvMPRE+6Ek= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723046149; c=relaxed/simple; bh=ewDqUvN1WLI8i5gVWlqe/V3IcARMeuvLa8VIUM0fTgQ=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=QTr08dzKenqYhVTBAPn7jHFbtg3dQWs0zrBjgwq7TCtuUVqV2CgTyS6nb1BPc4a0vz5k4XMrx50eD6g1yf/kIoAtpQHEoyxTeTaVL3Dl7m1Gem2v1HBPpa+/Ppx6eJ36hLpYLxxD3ARBZTfFp+aSwvp2/1dT0qjMmpQK9wQm+j8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4280ee5f1e3so295215e9.0 for ; Wed, 07 Aug 2024 08:55:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723046146; x=1723650946; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=RXwDExao+C6DHOGyXUsUzSZISaApePw8Bi9/6qlKSb4=; b=WZQtFj2Znxxdi578d8rf1yDEA22mf8d+c/VgyFrxQIQM/wNDmZwaWNQEkRHD4tay8S 6StOpuR3txezfeNjcQRyXWIW2Y9Vf9MJaGGDt4J1nV1cw2ao40jOSq8LTtwaL39ONyrz cwnHY2P9rjQejoAyXU+XW4TKPvWHeTRu+tdd0m/MvGirAjkHfr9FpcSGe2LyoCgTBge1 KrJxFnT8ldn1JWiik7cu5wy0Pq3NECBtCU8NEf7hWPwxBZkyF59+VXnkVADNW6QsHE+o w3+DfnDvushygRdQntP6Qmciu3FtIEzsli6eOT00wIC/rkzdgEm6MYp4F7Jy56Tna4bO FLSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723046146; x=1723650946; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=RXwDExao+C6DHOGyXUsUzSZISaApePw8Bi9/6qlKSb4=; b=hdqRAyDD8peGdyLWi0x+5LymmF/9YG20fMzkZbI4exI0xrEU5i+UCjl1/j3zy3TZ6N g9Z+I9/Ir9sKLSPiDh+caE9MrpfgywgupEyTL7mpLkhKS9WHUhhhf9CbNFrnMEyec8rb Kk0zjWuipG93t7GrdQZPtveIUhRUoThS80DMXQZX/2vwqxZ5h+MzHSo+EOtg7ezXDZiI skjXJcKyPpRWywby0iUIPJ7eAzJPWZvPY/Kz9xrb6P8xmO4IX0prAFe+0DLmgRf/wS2O Ow1+UMRiz0wrPHiAd6t1XYy/VHb5mwsS7RXTKAD1BYtsRqkfC/lgmLpb+8MRsDM1Sbcl d5yQ== X-Gm-Message-State: AOJu0YzplZcAsjo4OJK3VPAy7rdddiQcnHGl4RApozyWzHW5euOMT5jj sLOfG0C8OLq7sGa/4/QpE+UWCEBh3AqJy1yIOG99kN6I5ojEy12wFCZaAo05 X-Google-Smtp-Source: AGHT+IF4BUbfQrhGh08CDCv6EhIdfJ8mDIoXwZrboI9ymPK8dMxxwsllGAR5njRo1CEpjryerXDVoA== X-Received: by 2002:a05:600c:3506:b0:426:5e91:3920 with SMTP id 5b1f17b1804b1-428e6b7d042mr142374735e9.29.1723046145570; Wed, 07 Aug 2024 08:55:45 -0700 (PDT) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42905971d1dsm36091505e9.20.2024.08.07.08.55.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 07 Aug 2024 08:55:45 -0700 (PDT) From: Iain Sandoe X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Cc: poulhies@adacore.com, charlet@adacore.com Subject: [PATCH] Ada, libgnarl: Fix s-taprop__posix.adb compilation. Date: Wed, 7 Aug 2024 16:55:44 +0100 Message-Id: <20240807155544.16367-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, WEIRD_PORT 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: , Reply-To: iain@sandoe.co.uk Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Tested on x86_64-darwin21, OK for trunk? thanks Iain --- 8< --- Bootstrap on Darwin, and likely any other targets using the posix implementation of s-taprop was broken by commits between r15-2743 and r15-2747: s-taprop.adb:297:15: error: "size_t" is not visible s-taprop.adb:297:15: error: multiple use clauses cause hiding s-taprop.adb:297:15: error: hidden declaration at s-osinte.ads:58 s-taprop.adb:297:15: error: hidden declaration at i-c.ads:9 This seems to be caused by an omitted change to use Interfaces.C.size_t instead of just size_t. Fixed thus. gcc/ada/ChangeLog: * libgnarl/s-taprop__posix.adb (Stack_Guard): Use Interfaces.C.size_t for the type of Page_Size. Signed-off-by: Iain Sandoe --- gcc/ada/libgnarl/s-taprop__posix.adb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/ada/libgnarl/s-taprop__posix.adb b/gcc/ada/libgnarl/s-taprop__posix.adb index 3d76679ad4a..5f6a4d69c91 100644 --- a/gcc/ada/libgnarl/s-taprop__posix.adb +++ b/gcc/ada/libgnarl/s-taprop__posix.adb @@ -294,7 +294,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;