From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id qB+9DEfaGGQ8MwEASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 23:12:23 +0100 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id gG2/DEfaGGRpfgEA9RJhRA (envelope-from ) for ; Mon, 20 Mar 2023 23:12:23 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id DBB17393BB for ; Mon, 20 Mar 2023 23:12:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNjZ-0003mA-Kv; Mon, 20 Mar 2023 18:12:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peNjX-0003lA-Cu for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peNjX-0003GF-3X for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNjW-0007Mw-V7 for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates 03/15] gcc-11: Patch libstdc++ libpthread issue for Hurd only. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62307 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62307@debbugs.gnu.org, Josselin Poiret Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.167935027128122 (code B ref 62307); Mon, 20 Mar 2023 22:12:02 +0000 Received: (at 62307) by debbugs.gnu.org; 20 Mar 2023 22:11:11 +0000 Received: from localhost ([127.0.0.1]:56999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNig-0007JK-Bk for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:11 -0400 Received: from jpoiret.xyz ([206.189.101.64]:46686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNiZ-0007IM-Bi for 62307@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:04 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id CC69E184D6B; Mon, 20 Mar 2023 22:11:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679350262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lqklnJd6jyi9M9PpKKcfuZdLkJx2Xlye32NyDUz8aUI=; b=ibNbT8YMFwgem7r9hJ120d9q4zJ/pmsu9EFZvgYjUUv09zO/smQfEKdxbxz1dZKUqarH9H RelimEtpvdCVQCfGKBsHTpKCAOnIMFZanifdO90fe6uR+jilc8lOLfCSlxIS01qOuGRE2n O2pKhKt70xU93cboe76tmKi7RDTThjABa2zP1Mc+nSuUBZmAAkmCp2G7zDJaXOVprxIjPi IlsHoxNYKm79Hi4lmRFu3L59DDk4clye/TLIdu0jJs/U+ZMbZPyrpcIaxd6m7dh5yNLiet ITQIg1OL5Simk++aoTkHz/gCu8dOqFD00ydnwVBHZ0nX3Qty6W0Pn6ach+Jg4A== Date: Mon, 20 Mar 2023 23:10:38 +0100 Message-Id: <479a095a315dc959fc63e26c24d7cb8843b947be.1679349992.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ++++++++ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches From: Josselin Poiret via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679350343; a=rsa-sha256; cv=none; b=ARro2XZY1doOxkWrvewI8loP6wKqtASg7nDOfwI9NEXwzr4R5zgag1J+0Fbn7m2/MBWPUV e7qdfcziXVt8Pi59u/zx/0ojm/6LKnUuNUxKS7nctZAcFQdii7cZTS9NE6j1mYIp6jJO0S +X6DnH55QIJvZafxAh4vLnkkvhAo0ZxoHkmKQ89tHuO/NVk/BKV7T53UgD2s+tVRi92NOO NaxylGJSooKtHr+CpPqi4e/NBvQBRDfT3zJKOLgXnn+i3dnqLkm98ta/YT+5ETo6bxlkJU 14vLq7Bp5rhci1TChePzGxVCHL3A6gRyuZuFoZcUrpGQAeBKgJ1v4YERIL2sjw== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=ibNbT8YM; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679350343; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=lqklnJd6jyi9M9PpKKcfuZdLkJx2Xlye32NyDUz8aUI=; b=oQx0ymUsSqLeCOl8oy+u4pTD8TchUZ/BNZSB4jb4URMZUgBntbp5efQecnPR31Dj+Ffes+ ErWgiX+mnEMtNE91YWhcfv5vDwNx8cl+K9bc04CMU/18sPpcPMCbxDBJv6ZXcUTIog9nbe +Gx7yL6oZKwS8Rl01zlQG3K2uXCkrF926/xU3e1tP73R6o4QKC+elo6WVuYSjroWLr9WLv Ix805LGWpNIHTtKs0xJfd3A8c262yMGqx8ZEHNRW7qn004UM4YXCMMLCteQxQg6lC6STmN ciUJrlRIBL0Xxdmtc4Rrw5N4C6Opxa1PFghBnakl6Wxnfr2zw4B3bVrZWwQ51A== X-Migadu-Spam-Score: 1.75 X-Spam-Score: 1.75 X-Migadu-Queue-Id: DBB17393BB Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=ibNbT8YM; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: Y60vM0fDndck * gnu/packages/gcc.scm (gcc-11): Add ugly conditional patching, to avoid a world-rebuild. * gnu/packages/cross-base.scm (cross-gcc): * gnu/packages/commencement.scm (gcc-boot0): Pass the patch there as well. * gnu/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/commencement.scm | 10 ++- gnu/packages/cross-base.scm | 21 ++++--- gnu/packages/gcc.scm | 32 ++++++++++ .../gcc-11-libstdc++-hurd-libpthread.patch | 62 +++++++++++++++++++ 5 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0b2c8538c4..d0f89ace6c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1181,6 +1181,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \ %D%/packages/patches/gcc-12-strmov-store-file-names.patch \ %D%/packages/patches/gcc-10-cross-environment-variables.patch \ + %D%/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch \ %D%/packages/patches/gcc-12-cross-environment-variables.patch \ %D%/packages/patches/gcc-10-tree-sra-union-handling.patch \ %D%/packages/patches/gcolor3-update-libportal-usage.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 24cffc4252..2d947ea911 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2452,7 +2452,15 @@ (define gcc-boot0 ,@(alist-delete "libc" (%boot0-inputs)))) ;; No need for the native-inputs to build the documentation at this stage. - (native-inputs `()))) + (native-inputs + (cond + ;; FIXME This patch is not in the origin because it is conditionally + ;; applied, to avoid rebuilds at the end of the core-updates cycle. + ;; Move to gcc-11's origin ASAP. + ((target-hurd? (or (%current-target-system) + (%current-system))) + (list patch-boot0 (search-patch "gcc-11-libstdc++-hurd-libpthread.patch"))) + (#t '()))))) (define perl-boot0 (package diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 2959616af6..30bf1c6bd0 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -319,14 +319,21 @@ (define* (cross-gcc target ("libc" ,libc)) `(,@inputs ("mingw-source" ,(package-source mingw-w64))))) - (libc + (else `(,@inputs - ("libc" ,libc) - ("libc:static" ,libc "static") - ("xkernel-headers" ;the target headers - ,@(assoc-ref (package-propagated-inputs libc) - "kernel-headers")))) - (else inputs))))) + ;; FIXME Kludge to only apply the patch for hurd to avoid rebuilds + ;; remove ASAP, along with the accompanying changes. + ,@(if (target-hurd? target) + `(("patch" ,patch) + ("_" ,(search-patch "gcc-11-libstdc++-hurd-libpthread.patch"))) + '()) + ,@(if libc + `(("libc" ,libc) + ("libc:static" ,libc "static") + ("xkernel-headers" ;the target headers + ,@(assoc-ref (package-propagated-inputs libc) + "kernel-headers"))) + '()))))))) (inputs '()) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index ce6e3e7a83..55d0f7a162 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -707,6 +707,38 @@ (define-public gcc-11 (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) + (arguments + (cond + ;; FIXME We conditionally apply a patch passed in native-inputs, to avoid + ;; rebuilds at the end of the core-updates cycle. Move this to a regular + ;; patch ASAP. + ((target-hurd? (or (%current-target-system) + (%current-system))) + (substitute-keyword-arguments (package-arguments gcc-8) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-libpthread-hurd + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (define patch (search-input-file (or native-inputs inputs) "/bin/patch")) + (define the-patch + (cdr + (car + (filter (lambda (input) + (string-suffix? "gcc-11-libstdc++-hurd-libpthread.patch" + (cdr input))) + (or native-inputs inputs))))) + (invoke patch "--verbose" + "--force" "--no-backup-if-mismatch" + "-p1" "--input" the-patch))))))) + (#t (package-arguments gcc-8)))) + (native-inputs + (cond + ((target-hurd? (or (%current-target-system) + (%current-system))) + (modify-inputs (package-native-inputs gcc-8) + (prepend (module-ref (resolve-interface '(gnu packages base)) 'patch) + (search-patch "gcc-11-libstdc++-hurd-libpthread.patch")))) + (#t (package-native-inputs gcc-8)))) (properties `((compiler-cpu-architectures ("aarch64" ,@%gcc-11-aarch64-micro-architectures) diff --git a/gnu/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch b/gnu/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch new file mode 100644 index 0000000000..1845583ac5 --- /dev/null +++ b/gnu/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch @@ -0,0 +1,62 @@ +From f0065f207cf19cd960b33d961472c6d69514336f Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Fri, 7 Oct 2022 22:45:06 +0200 +Subject: [PATCH] libstdc++: Mark pieces of gnu-linux/os_support.h + linux-specific + +This is notably needed because in glibc 2.34, the move of pthread functions +into libc.so happened for Linux only, not GNU/Hurd. + +The pthread_self() function can also always be used fine as it is on +GNU/Hurd. + +libstdc++-v3/ChangeLog: + + * config/os/gnu-linux/os_defines.h [!__linux__] + (_GLIBCXX_NATIVE_THREAD_ID, _GLIBCXX_GTHREAD_USE_WEAK): Do not define. + +Reviewed-by: Jonathan Wakely +--- + libstdc++-v3/config/os/gnu-linux/os_defines.h | 22 +++++++++++-------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +diff --git a/libstdc++-v3/config/os/gnu-linux/os_defines.h b/libstdc++-v3/config/os/gnu-linux/os_defines.h +index 3064f8d908ac2..87317031fcd71 100644 +--- a/libstdc++-v3/config/os/gnu-linux/os_defines.h ++++ b/libstdc++-v3/config/os/gnu-linux/os_defines.h +@@ -60,22 +60,26 @@ + # define _GLIBCXX_HAVE_FLOAT128_MATH 1 + #endif + +-#if __GLIBC_PREREQ(2, 27) ++#ifdef __linux__ ++// The following libpthread properties only apply to Linux, not GNU/Hurd. ++ ++# if __GLIBC_PREREQ(2, 27) + // Since glibc 2.27 pthread_self() is usable without linking to libpthread. +-# define _GLIBCXX_NATIVE_THREAD_ID pthread_self() +-#else ++# define _GLIBCXX_NATIVE_THREAD_ID pthread_self() ++# else + // Before then it was in libc.so.6 but not libc.a, and always returns 0, + // which breaks the invariant this_thread::get_id() != thread::id{}. + // So only use it if we know the libpthread version is available. + // Otherwise use (__gthread_t)1 as the ID of the main (and only) thread. +-# define _GLIBCXX_NATIVE_THREAD_ID \ +- (__gthread_active_p() ? __gthread_self() : (__gthread_t)1) +-#endif ++# define _GLIBCXX_NATIVE_THREAD_ID \ ++ (__gthread_active_p() ? __gthread_self() : (__gthread_t)1) ++# endif + +-#if __GLIBC_PREREQ(2, 34) ++# if __GLIBC_PREREQ(2, 34) + // Since glibc 2.34 all pthreads functions are usable without linking to + // libpthread. +-# define _GLIBCXX_GTHREAD_USE_WEAK 0 +-#endif ++# define _GLIBCXX_GTHREAD_USE_WEAK 0 ++# endif ++#endif // __linux__ + + #endif -- 2.39.2