From patchwork Mon Feb 4 15:49:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Corbin X-Patchwork-Id: 1036036 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.b="elGgGImY"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43tXHP38nyz9sML for ; Tue, 5 Feb 2019 02:50:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E2F8625CFE; Mon, 4 Feb 2019 15:50:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M7Xg-NyinRQS; Mon, 4 Feb 2019 15:50:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 21B6725BDD; Mon, 4 Feb 2019 15:50:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E6EAE1BF282 for ; Mon, 4 Feb 2019 15:50:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E414E25BDD for ; Mon, 4 Feb 2019 15:50:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yqkYWfh3avaU for ; Mon, 4 Feb 2019 15:50:51 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by silver.osuosl.org (Postfix) with ESMTPS id 0D9B5230FE for ; Mon, 4 Feb 2019 15:50:51 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id p6so408964wmc.1 for ; Mon, 04 Feb 2019 07:50:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FgOilL2o0JLd/gGW9jTDCUQQ/lUdTR+kBggoJ+YL9Ns=; b=elGgGImYl10ASQXvUUR52omGTzDqzVNUQyDOKjh462QrKku34KYHhfN4f4vwsKvvNr H9mmGNnYq2b1ZMI8YsDBYRhy4GSSDlIUDHMtPbJ+rWO0J9vl1USOvepcL/f3qXbuevlC Vi+KTUPt4IK6Z5WSXh8qUXVkNG0gtSW6OveBT8MxdwxoYJ2qAvBopwc2JQZfbTAk02hX KzfqQF/rsmQ6GbFXOehvQbWJMRiK1agrhqsukak2A3hBD2/H/xcogoNnHcUvmRzcNr0c t1FmAzaUfaCUPJ69k8ww8oRBVelEYrloebe0/SCAlfp8Xu3OLC7ifpFLjA68X54mlmP3 +kZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FgOilL2o0JLd/gGW9jTDCUQQ/lUdTR+kBggoJ+YL9Ns=; b=qeEME0ugVbLlCvcKBKnbLv6ngyrb54f825b91KPHg//N9QH1SS776mTpR/5/r8bOck BgeWxCyXA/I6VVZUTFYZoLYRGJhbfwbB3PP8MdMSzsBXqPRIREkv/FBsEjS7Q+91mprm ayHPZvRSltUwHvcmlQLs4QEE6EJCSKsO0NxxFJoC8zUhPgFsuf8/ao8gnXMtRiNRGk+k 2iuL10nf9PVBnD6v+hFF6V3/yqRDe0B/wawA18ixwU8BUtcKJrkend26uDfwHHndSnLc Bri7RaBC4LCLQLo+XecYs3VCrshcPt+ijBz9KBvcy/oBOrVMozxqWnaG+E9O6SHAqw1w QQFg== X-Gm-Message-State: AHQUAubULJGAx7rHjAUj1wdAP6/RAgJuSZlpOFXyeNo9LBpTITQrgF+/ qeovJ8u1q3WIVNDIzU5rhDf2Qd8m5Rw= X-Google-Smtp-Source: AHgI3IakVIiq9ZCPkCrTo5XEotr/7zYr4HjlIFQagaxtzpJR040sNU921n/7MZjRPIrSVqIqHYE7TQ== X-Received: by 2002:a7b:c0c5:: with SMTP id s5mr43036wmh.40.1549295449224; Mon, 04 Feb 2019 07:50:49 -0800 (PST) Received: from godzilla.lym.embecosm-corp.com (cust64-dsl91-135-5.idnet.net. [91.135.5.64]) by smtp.gmail.com with ESMTPSA id x186sm20242101wmg.41.2019.02.04.07.50.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 07:50:48 -0800 (PST) From: Mark Corbin To: buildroot@buildroot.org Date: Mon, 4 Feb 2019 15:49:59 +0000 Message-Id: <20190204154959.26237-1-mark.corbin@embecosm.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] packages/glibc: Fix mcontext_t error that breaks RISC-V package builds X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Corbin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The riscv-glibc repository version of glibc 2.26 will build for RISC-V 32bit, but when many packages are built against the resulting library an 'unknown type name mcontext_t' error is reported. The definition of mcontext_h in the ucontext.h header file needs to be moved outside of the '#ifdef __USE_MISC' structure to fix this issue. Fixes: http://autobuild.buildroot.net/results/5aa9cb29c459f511dc9c4fcf218dc9a842505aa3 Signed-off-by: Mark Corbin --- ...rror-that-breaks-RISC-V-architecture.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch diff --git a/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch b/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch new file mode 100644 index 0000000000..e0875a4590 --- /dev/null +++ b/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch @@ -0,0 +1,39 @@ +From 6b4520e13c2ed7fca725d5f5c879854cd7c96c19 Mon Sep 17 00:00:00 2001 +From: Mark Corbin +Date: Mon, 4 Feb 2019 10:35:27 +0000 +Subject: [PATCH 1/1] Fix mcontext_t error that breaks RISC-V architecture + package builds + +The riscv-glibc repository version of glibc 2.26 will build for +RISC-V 32bit, but when many packages are built against the resulting +library an 'unknown type name mcontext_t' error is reported. The +definition of mcontext_h in the ucontext.h header file needs to be +moved outside of the '#ifdef __USE_MISC' structure to fix this +issue. + +Signed-off-by: Mark Corbin +--- + sysdeps/unix/sysv/linux/riscv/sys/ucontext.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h b/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h +index 8f02f09106..b9dd04564a 100644 +--- a/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h ++++ b/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h +@@ -48,12 +48,11 @@ typedef greg_t gregset_t[NGREG]; + + /* Container for floating-point state. */ + typedef union __riscv_fp_state fpregset_t; ++#endif + + /* Context to describe whole processor state. */ + typedef struct sigcontext mcontext_t; + +-#endif +- + /* Userlevel context. */ + typedef struct ucontext + { +-- +2.19.1 +