From patchwork Wed Aug 7 09:00:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 1969897 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=cebitec.uni-bielefeld.de header.i=@cebitec.uni-bielefeld.de header.a=rsa-sha256 header.s=20200306 header.b=Hp6VRxst; 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 4Wf40M0mV3z1ybS for ; Wed, 7 Aug 2024 19:01:07 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 476CF385DDDC for ; Wed, 7 Aug 2024 09:01:05 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.CeBiTec.Uni-Bielefeld.DE (smtp.CeBiTec.Uni-Bielefeld.DE [129.70.160.84]) by sourceware.org (Postfix) with ESMTPS id DFC543858C41 for ; Wed, 7 Aug 2024 09:00:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DFC543858C41 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=CeBiTec.Uni-Bielefeld.DE Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cebitec.uni-bielefeld.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DFC543858C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=129.70.160.84 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723021238; cv=none; b=fwWAT1z9sqdGdbqZl7IoGwgzfe45CH9MbbPQQwGIXAvF7S31dWrqjwBsKb55zvOmceBZXTcTYOjJhAfAEqqkIsl9qPKTQD95cEy9U8PofoZ74GBxJFbpEqhgEVFr2vZTnO41djlSaWpyu6kdFBGw4HN2uPCm1hLW+NavVwS5f10= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723021238; c=relaxed/simple; bh=Ua1ydQoEK9o7SsOqYYki0WRw183SVw207PA9LGTxmQ4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=G8yzlRWPcwECkF5kJBS3cr9b141W3BvLBxtkkzW5lue5+3d1ofXxqBlDj8RxEYGgUNTTtocF0+59G/NHP/ILMc02BpAoqr3virzxhAyZR9s8b6gys9W5XXfwGXjB8SAlsVrvLBDMUccB7aXirylUal1xIRnD+BjN6NQHSVlnd+E= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id D2A0DB9CBC; Wed, 7 Aug 2024 11:00:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= cebitec.uni-bielefeld.de; h=content-type:content-type :mime-version:user-agent:message-id:date:date:subject:subject :from:from:received:received; s=20200306; t=1723021230; bh=Ua1yd QoEK9o7SsOqYYki0WRw183SVw207PA9LGTxmQ4=; b=Hp6VRxstqL+mV8frB8d1y ZIg4d1zpRVsFf8xXCf2i5Xun/MgWycZBDvA+MTsQXT3uYvpL6X4mBe7oQxWkvJlO mOyhm0Atmu7cQHeze7FJQ9U55lR9o8xLiXv5szxP3/WaZVtu5dFBczh730bCAk91 tV1acrdkUEVNv8mgsfmJZXaMd1JnJJOgcjNbn7PWgKtIKEqWqgeQqYlvyYXSsLuL KCTktsi0ZtHFskt4QzSEM6wUwEJnhOnPmglbXOQkXI8N5OkBpr4ScB2fnEPYPVEp 8E6ARPZS78UAecOiMKmVSe7TqYDPY0RXj1NTfpvzcj6awztt2b/KC3G/Jrh5GZjh g== X-Virus-Scanned: amavisd-new at cebitec.uni-bielefeld.de Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (smtp.cebitec.uni-bielefeld.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id OAPoxL7tbkky; Wed, 7 Aug 2024 11:00:30 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (p4fddbbe4.dip0.t-ipconnect.de [79.221.187.228]) (Authenticated sender: ro) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPSA id 29EB3B9CBB; Wed, 7 Aug 2024 11:00:30 +0200 (CEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou , Marc =?utf-8?b?UG91bGhpw6hz?= Subject: [PATCH] ada: Fix s-taprop__solaris.adb compilation Date: Wed, 07 Aug 2024 11:00:29 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Spam-Status: No, score=-3788.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, 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: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Solaris Ada bootstrap is broken as of 2024-08-06 with s-taprop.adb:1971:23: error: "int" is not visible s-taprop.adb:1971:23: error: multiple use clauses cause hiding s-taprop.adb:1971:23: error: hidden declaration at s-osinte.ads:51 s-taprop.adb:1971:23: error: hidden declaration at i-c.ads:62 because one instance of int isn't qualified. This patch fixes this. Bootstrapped without regressions on i386-pc-solaris2.11 and sparc-sun-solaris2.11. Ok for trunk? Rainer # HG changeset patch # Parent e1cd3c7e6ffeab6f837a999725875174ac45a9ce ada: Fix s-taprop__solaris.adb compilation diff --git a/gcc/ada/libgnarl/s-taprop__solaris.adb b/gcc/ada/libgnarl/s-taprop__solaris.adb --- a/gcc/ada/libgnarl/s-taprop__solaris.adb +++ b/gcc/ada/libgnarl/s-taprop__solaris.adb @@ -1968,7 +1968,7 @@ package body System.Task_Primitives.Oper then declare CPU_Set : aliased psetid_t; - Result : int; + Result : Interfaces.C.int; begin Result := pset_create (CPU_Set'Access);