From patchwork Wed Apr 27 14:14:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 615669 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qw25h3cTqz9t6g for ; Thu, 28 Apr 2016 00:14:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=F6VjqfGL; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 26CA2B809FD; Wed, 27 Apr 2016 16:14:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Wed, 27 Apr 2016 16:14:27 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 95016B809FB for ; Wed, 27 Apr 2016 16:14:25 +0200 (CEST) X-policyd-weight: using cached result; rate: -7 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 27 Apr 2016 16:14:25 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id w143so13567643wmw.3 for ; Wed, 27 Apr 2016 07:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=bQ45R55Eyi0nhBcq3/+RjNeasbbmmUxkP02tvQ+jEgQ=; b=F6VjqfGLmAuE5qPi+TX9UtCGbwCSpRgjJoYP+s3f360rTkqqq9yw3iopUXjI2gfaFR 0zhf2T1oTA58CdzJDGfuk51pLcz1CgGW1fUpjrEmBnsVo70jGiPZxZyelWhuhPLPwDEo 50mTfeDuZH5z7sWbrI8srIraz0u1T/uIsTZ2rmCDJ69wv8vq9QuYd80ykf/5syI+jTiR V9mnZ3EDgacQFA/u5KniAR1W4pMM9zi8fjGSEsHSp4ZKXo7nVaHVUDZCNLjbm+WnUVPo AuSHVYnbyoLzGqK945AJRERMyDmdoCFikcCIBWl3hVYQSoq5zqhaNiPARSYXC9l/PXM2 ozCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=bQ45R55Eyi0nhBcq3/+RjNeasbbmmUxkP02tvQ+jEgQ=; b=JoI2wQhPUU7mYxjZi+i8EXd+TavCeWmR4i+5e1Nb0WN/dNMGgWtCf2qQr3kWIWICYo rNnhvDjonmxpQyYycIKSTkwb5P9cKSPTypSIKVR9xdmq+5ktnmTt2/1Co6d5GXaG4K2/ 2nqwXoiGSoAeHOW/9aXASHmhntDRJO/Pg4IXRHEZGJQPdRePVNLZFwkIEufPZYUbsa/Y GohIi5Ix3CDNFWHI36Arc/GsFBhGl58PNpiLCITk4lTwPzcpv6cAdYVGoJ6gACPF2424 pFmuOR93lCl87+fze9VBMftvji7jZMIT40i/dz+FXXkwU+oek+7I+ZVl52dtLirIYWsi d9zw== X-Gm-Message-State: AOPr4FWIDqOOLm7kEVF3m6GJWK51Qkq0zzA5Zl+ON7E4jlYmMmsebIpLxeVUGaoLXgL7xg== X-Received: by 10.195.3.1 with SMTP id bs1mr10221461wjd.160.1461766464694; Wed, 27 Apr 2016 07:14:24 -0700 (PDT) Received: from localhost.localdomain ([5.2.198.78]) by smtp.gmail.com with ESMTPSA id b124sm29533295wmb.1.2016.04.27.07.14.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Apr 2016 07:14:23 -0700 (PDT) From: Alexandru Ardelean To: openwrt-devel@lists.openwrt.org Date: Wed, 27 Apr 2016 17:14:19 +0300 Message-Id: <1461766459-14561-1-git-send-email-ardeleanalex@gmail.com> X-Mailer: git-send-email 2.8.1 Subject: [OpenWrt-Devel] [PATCH] [RFC] toolchain/musl/ppc: add header guards for EDEADLOCK define X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" The header guard is the same as in: linux/arch/powerpc/include/uapi/asm/errno.h I've sent another patch for this issue, but reconsidered on it. Patch is here: http://patchwork.ozlabs.org/patch/614830/ The issue is a collision on the EDEADLOCK define between musl's and the kernel's when building perf, libbpf and other stuff in the kernel/tools folder. It only occurs on the PowerPc arch. I still don't know what's best: 1. Patch musl for PowerPc (as this patch does) 2. Patch the kernel for PowerPc (as with above mentioned patch) 3. Fix perf, libbpf, etc individually etc Hence the RFC on this patch. Signed-off-by: Alexandru Ardelean --- .../musl/patches/301-ppc-add-header-guards-user-h.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 toolchain/musl/patches/301-ppc-add-header-guards-user-h.patch diff --git a/toolchain/musl/patches/301-ppc-add-header-guards-user-h.patch b/toolchain/musl/patches/301-ppc-add-header-guards-user-h.patch new file mode 100644 index 0000000..2712d19 --- /dev/null +++ b/toolchain/musl/patches/301-ppc-add-header-guards-user-h.patch @@ -0,0 +1,17 @@ +diff --git a/arch/powerpc/bits/errno.h b/arch/powerpc/bits/errno.h +index 36ad2f9..1011bf7 100644 +--- a/arch/powerpc/bits/errno.h ++++ b/arch/powerpc/bits/errno.h +@@ -55,7 +55,10 @@ + #define ENOANO 55 + #define EBADRQC 56 + #define EBADSLT 57 ++#ifndef _ASM_POWERPC_ERRNO_H ++#define _ASM_POWERPC_ERRNO_H + #define EDEADLOCK 58 ++#endif + #define EBFONT 59 + #define ENOSTR 60 + #define ENODATA 61 +diff --git a/arch/powerpc/bits/user.h b/arch/powerpc/bits/user.h +index 6cc8aaf..e1d06f6 100644