From patchwork Mon Apr 29 15:01:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 1929040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=MBmKaxju; 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 4VSml04X1Pz1ymX for ; Tue, 30 Apr 2024 01:02:03 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BB2AB385E83A for ; Mon, 29 Apr 2024 15:02:01 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id E75513858D35 for ; Mon, 29 Apr 2024 15:01:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E75513858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E75513858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714402904; cv=none; b=qTybBoxLA+YUutCb6UCs6A5l6P1dHNswV+Fruyaclz0pEHFermwMeWc/OAK61w5k0O5YO5jVRnxD58ZrG5uF2QUwQn6NcUsLtFLRT3S3ykBOD0lE+3AtCBKs1zI7bAAP4dyu2xjk8lHzjxCyi2EMTuAXugAr0h7Qd+Kyq70Ro8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714402904; c=relaxed/simple; bh=KCqp/46cXy8kBF4vs1tnf8cc2AkxAfQLvNImhMmaivY=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=YyypdIIa6AR14VNnNdCvX8F8brfuSJjoMddxd2pnyIUdGgYqzGmZULgu2DxQZz1SQUycllEQueh8Q02GuA/h5j91lobk+bI9Qhd448tH1nyaL++7dFqns10ItBibmeDAPQY0lLRvnVZsviPdoTaUkwCY8aNiVjMOPkEelkGDYjA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714402901; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=m1Io9JVZtLzXKuwZ4DqY8tFkL/htMZas216wnNdb5RU=; b=MBmKaxjuaxEYWb3yeO/CWOxQ9NohOm/2Xe7H8jQj3BG57e1d0YUhapSJLo7WJa3j44wILR nbJ49/wVT0rsWHCzPUCGVgPxBEvsVIw/+6iKzFA2tZ4qyIGlRTwjihd+DyVb7Ohj7d3Kcq /evZ+/Y7Y5NKG4KeCzHESxpe+cHF7qY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-304-hyvdQICPNa-c5K2YWU8XrQ-1; Mon, 29 Apr 2024 11:01:38 -0400 X-MC-Unique: hyvdQICPNa-c5K2YWU8XrQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D39718FDD34; Mon, 29 Apr 2024 15:01:36 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.45.224.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E49D1C271B3; Mon, 29 Apr 2024 15:01:35 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 43TF1XDD4193423 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 29 Apr 2024 17:01:33 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 43TF1XtK4193422; Mon, 29 Apr 2024 17:01:33 +0200 Date: Mon, 29 Apr 2024 17:01:32 +0200 From: Jakub Jelinek To: Joseph Myers , Richard Biener Cc: gcc-patches@gcc.gnu.org, Jonathan Wakely , Florian Weimer Subject: [PATCH] libgcc: Do use weakrefs for glibc 2.34 on GNU Hurd Message-ID: References: <8eaa4872-ee98-c4dd-312-498687ccfffb@redhat.com> MIME-Version: 1.0 In-Reply-To: <8eaa4872-ee98-c4dd-312-498687ccfffb@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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: , Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org On Mon, Apr 29, 2024 at 01:44:24PM +0000, Joseph Myers wrote: > > glibc 2.34 and later doesn't have separate libpthread (libpthread.so.0 is a > > dummy shared library with just some symbol versions for compatibility, but > > all the pthread_* APIs are in libc.so.6). > > I suspect this has caused link failures in the glibc testsuite for Hurd, > which still has separate libpthread. > > https://sourceware.org/pipermail/libc-testresults/2024q2/012556.html So like this then? I can't really test it on Hurd, but will certainly test on x86_64-linux/i686-linux. 2024-04-29 Jakub Jelinek * gthr.h (GTHREAD_USE_WEAK): Don't redefine to 0 for glibc 2.34+ on GNU Hurd. Jakub --- libgcc/gthr.h.jj 2024-04-25 20:43:10.555694952 +0200 +++ libgcc/gthr.h 2024-04-29 16:57:40.734062691 +0200 @@ -142,7 +142,7 @@ see the files COPYING3 and COPYING.RUNTI #endif #ifdef __GLIBC_PREREQ -#if __GLIBC_PREREQ(2, 34) +#if __GLIBC_PREREQ(2, 34) && !defined(__gnu_hurd__) /* glibc 2.34 and later has all pthread_* APIs inside of libc, no need to link separately with -lpthread. */ #undef GTHREAD_USE_WEAK