From patchwork Tue May 21 09:13:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Botcazou X-Patchwork-Id: 90560 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 581AA3858C33 for ; Tue, 21 May 2024 09:21:07 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id 7AE823858414 for ; Tue, 21 May 2024 09:13:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7AE823858414 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 7AE823858414 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::334 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716282799; cv=none; b=dcXK3HOX5kwrjF6NBqM68gmFPGWiTfO21NTQFmWNiUbsmq7K4ZeFOF+2bi9wt4IgV84j51/BhLzCdvfBpxoeKxPPM+9CCNpGiegJndCdhBEbrIE3jGJOALKcooUpddDYTWDq88y+c81psQgPpjUpPvORkxKAxoEI8Wf6710rQpg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716282799; c=relaxed/simple; bh=VwW7ya/HJhUc9cEGRMeEZ2g+EXrl5WhwlJa46fzJthc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=bf1MHqlAqLvaNp2YxlQbmd9XHZ30hj4kGNMfLiRDbP/XNntK1bHrW5s8eFQSGVCmpKrJCp0HUB+cpqnfy91YtTeHpoipJ567vvh9HFGcpKRmGmeix2a4a+rRSyerCDKqjb2p8fYxyi5aWBH/9fk2YEcJqfo12oaBeK4lixXg1OE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-42016c8daa7so27822645e9.2 for ; Tue, 21 May 2024 02:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1716282796; x=1716887596; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=RvrsyKMv8wDJ19nKaIZbPxxLA8wTSk2kI87ah/8YACE=; b=bYRhh7VUF19DGFOxEJUxYVtqdjRazdeqBgFpAoj9ccgP2atFPCKuDlRjxoAgFat/Ov +xRCh3iTiQO8F+Q/wt9b+1pG8LQXVaJvs+JeMu2kVjo2GbvJLSqnFQx8nmH16Rz/IzlN fMoGT9YV9FGbGY0noxBkz9b7CBrA9FqDdxtkRIVkw4Or815hhNJ0Z1hHxlnR1VRwWXJ2 1XjwWmp84GaCB3q6r40fZysfjSzR0kP8Vj7JPl/PXn7wMJwvVivLCp8fzUImDl7my5At 8EI3Gtx1EIJnsHjHTL0mzM5GKZtb0jMlmBBWuWW2GBybhiuR7XK8zMwWKEcN8DmXeRTJ 1OvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716282796; x=1716887596; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RvrsyKMv8wDJ19nKaIZbPxxLA8wTSk2kI87ah/8YACE=; b=AbjLWxxFI3JYrdxZ+uOPgmGpjztKNA9ovZeutHru837u+G1Uqf7Cw565QwL6wq/RUh 7uvHi6wVYgPvPWMOTw3to2lmuvFrdd2+dvRXcZHF6DLaQ3QcwoCPyZxbe/ASjzFDU92m NBsSr80t6nfiZoMIi2j7fIORmvg668UXp/JsJhLzIiv6ocoNjHv1jSAxUdzZ8qJEuEQd fzPcx5fhveDbuHPIoQavm2ls1/Zd9DqJRymvp7yaclmxQiOKSfZ28vkYOpSV8h34CS+Q jiHT7r5gepnGD0LycV1UFk+tlW04KLkforEJrhur1BpZMZyfCytQOZlus5xMpQUxWPtg Sx6Q== X-Gm-Message-State: AOJu0YxQVLLjIK4wVxaxpwMHP6cy3hP38TGbUE2+UyBhpCz6cwAaSHd9 0spqt5cOzatiJSBXQU2Z3UIZA+QQqebOYsDOmFdj7RlV3oJ3nqAmScdxuKBzWBPED5pix+Toer4 = X-Google-Smtp-Source: AGHT+IGSHnzSs7d+xQ6V1/y88HEm2qgvdrv/qnOAq8HupuekliaI0Nti9c6NOLM2kNYhfhNkU3/o/w== X-Received: by 2002:a05:600c:4e8c:b0:41a:408b:dbaa with SMTP id 5b1f17b1804b1-41fea539875mr253437505e9.0.1716282795939; Tue, 21 May 2024 02:13:15 -0700 (PDT) Received: from fomalhaut.localnet ([2a01:e0a:8d5:d990:e654:e8ff:fe8f:2ce6]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fe518a8fasm430747595e9.33.2024.05.21.02.13.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 02:13:15 -0700 (PDT) From: Eric Botcazou X-Google-Original-From: Eric Botcazou To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix PR ada/115168 Date: Tue, 21 May 2024 11:13:14 +0200 Message-ID: <4567970.LvFx2qVVIh@fomalhaut> MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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 Recent changes made to the runtime library broke again its build on Solaris because it uses Solaris threads instead of POSIX threads on this platform. Tested by Rainer, applied on the mainline. 2024-05-21 Eric Botcazou PR ada/115168 * libgnarl/s-taprop__solaris.adb (Initialize): Fix pasto. * libgnat/s-oslock__solaris.ads (Owner_Int): Delete. (Owner_ID): Change the designated type to Integer. diff --git a/gcc/ada/libgnarl/s-taprop__solaris.adb b/gcc/ada/libgnarl/s-taprop__solaris.adb index 09f90e6e204..6d05e8db004 100644 --- a/gcc/ada/libgnarl/s-taprop__solaris.adb +++ b/gcc/ada/libgnarl/s-taprop__solaris.adb @@ -424,7 +424,7 @@ package body System.Task_Primitives.Operations is begin Environment_Task_Id := Environment_Task; - Self_ID.Common.LL.Thread := thr_self; + Environment_Task.Common.LL.Thread := thr_self; Interrupt_Management.Initialize; diff --git a/gcc/ada/libgnat/s-oslock__solaris.ads b/gcc/ada/libgnat/s-oslock__solaris.ads index cc5a83df02e..56a242c8070 100644 --- a/gcc/ada/libgnat/s-oslock__solaris.ads +++ b/gcc/ada/libgnat/s-oslock__solaris.ads @@ -42,10 +42,7 @@ package System.OS_Locks is type Private_Task_Serial_Number is mod 2 ** Long_Long_Integer'Size; -- Used to give each task a unique serial number - type Owner_Int is new Integer; - for Owner_Int'Alignment use Standard'Maximum_Alignment; - - type Owner_ID is access all Owner_Int; + type Owner_ID is access all Integer; function To_Owner_ID is new Ada.Unchecked_Conversion (System.Address, Owner_ID);