From patchwork Tue Mar 21 08:59:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48498 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1CDD316F42; Tue, 21 Mar 2023 09:00:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3071D16EC7 for ; Tue, 21 Mar 2023 09:00:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peXqe-0007oK-Og; Tue, 21 Mar 2023 05:00:04 -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 1peXqd-0007nv-FV for guix-patches@gnu.org; Tue, 21 Mar 2023 05:00: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 1peXqd-0000tR-1t for guix-patches@gnu.org; Tue, 21 Mar 2023 05:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peXqc-0001cM-SH for guix-patches@gnu.org; Tue, 21 Mar 2023 05:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates v2 1/2] opensbi: Build with default gcc, with microarch rv64g Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 09:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer , Josselin Poiret Cc: 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.16793891896156 (code B ref 62309); Tue, 21 Mar 2023 09:00:02 +0000 Received: (at 62309) by debbugs.gnu.org; 21 Mar 2023 08:59:49 +0000 Received: from localhost ([127.0.0.1]:57609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peXqO-0001bD-Jw for submit@debbugs.gnu.org; Tue, 21 Mar 2023 04:59:48 -0400 Received: from jpoiret.xyz ([206.189.101.64]:35164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peXqK-0001ai-3Y for 62309@debbugs.gnu.org; Tue, 21 Mar 2023 04:59:44 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3208518530D; Tue, 21 Mar 2023 08:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679389183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8cPls61vPDAsDn4VgbkqTLUd6UZG7phXNRVjBBqz/EA=; b=n/OLgJffZSAVmHZgSDdSKNATxKmOXNAXbxiaWbYXy88RVaGS7rJ3ro8fu6YOWd/bb2JhFa 0abfIgt/AhG2jhl7pDYBEBC4nfXGAqiZTXPZkZ/eUAGX3neZVVzuAo0oCjZ9VEL/gD9ucA F8J5Yyk8APqAQj3OUAeEkQpxFRRa7cXuKdJNxOd/MMa2SqXFztcbx1o5IZISPAwg9fVgp1 Y/Jpd+LaYXDGbxjgHvjGjAhhz7oE5Lwaz3sM+VZoNkDW/2wdQyfsFE94VDWhRgmXSNm3Dw Q0Ycd9ylgNMQDoqpLGHob7C+ZN/4Mqg8f31xSs/sjKS3CuofBW2SsikSGINDIw== Date: Tue, 21 Mar 2023 09:59:36 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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 X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/firmware.scm (make-opensbi-package): Remove specific #:xgcc for the cross-toolchain, there is not reason for it now. Also set the microarch to rv64g, so that it builds. --- gnu/packages/firmware.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 956ece5d6d..0b7fff035a 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -486,7 +486,7 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) (native-inputs `(,@(if (and (not (string-prefix? "riscv64" (%current-system))) (string-prefix? "riscv64" arch)) - `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu" #:xgcc gcc-7)) + `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu")) ("cross-binutils" ,(cross-binutils "riscv64-linux-gnu"))) '()))) (arguments @@ -499,6 +499,11 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) `("CC=gcc")) "FW_PAYLOAD=n" "V=1") + ;; Direct __asm__ is used with fence.i instructions, which are not + ;; available in the generic riscv ISA. We need a micro-arch with + ;; support for it, and rv64g is the official ISA with support for + ;; fence.i. + #:configure-flags (list "-march=rv64g") #:phases (modify-phases %standard-phases (delete 'configure)