From patchwork Tue Aug 14 16:14:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_D=C3=ADaz?= X-Patchwork-Id: 144196 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4552197ljj; Tue, 14 Aug 2018 09:15:19 -0700 (PDT) X-Google-Smtp-Source: AA+uWPw+Lgmk43xwGv6TCsGC2PswXeq1MEApxo6eoqNlerdRt8UZKjrt1TjN8kqn9ERu1JkKe/wN X-Received: by 2002:a17:902:1a9:: with SMTP id b38-v6mr20835833plb.89.1534263319542; Tue, 14 Aug 2018 09:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534263319; cv=none; d=google.com; s=arc-20160816; b=Q7+CzbQEdXUKNMX67cyTWQBhIZGVAHl01DgNg414bYVfRpqvHr1EuxWqZgMcPR9O9C xHeq+Kop6M+8t9UW+TWMWA5tasn4e2oaVmDA2nDBwzBMLCHO6Y22bon8k5XHrRfe/tWZ KdWNhtUHULwXQduvwxWq0th/iTUoZ8WTteLrTqIIsMuzVVzWpBiZoX56eoY/avdRyevT 76ATwHDu7f4L7jdUwNa62n5WgI3VR9CE16fFdb8K/PyCPI/v7ss1QHTGPeydhDT5qlB0 WAzZbAVhEnlWvWCSYVCIW8jwBEEXTNfA1MSs5j/LvgY8HlMo8snvakNkK3MuNKERbHQU rXLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=UHNPFDv4olHbtVWMieSMzJcrQWipxafLOnf9i8BhOWg=; b=iRkXAqWSby+JMRDOmNVoym6PVI78jfmtZqCnLiYh0YekEnZXmN+VKVx52dsIGQjqHx SsM4nMLrHh+E5zyizU0Mcf1LiCbshoUgIqvJaFlzDDIztNoZqANSmYEyFHiW8ghJeFl9 gIBFx8B+NNZdImxd8lVTC0a0iPsjb81WxpsWMkc/+gGv6HWYL68z7cudv6ZKpTBz+Ay3 irNsQmxLTIW88M5/bTDkRtiQlVB2HuDOapKYIMkvpVxM7iU35g/HVYxsiCv6Yf5Z3JBf fRC9K6+HsI9nZeMi0267ooFWK/6RB3tkF2pvw1AkjlR8pcY4hHayIQUtNlrKmCvt2jsO F8Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=f2VhA+QY; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y23-v6si20522430pgl.132.2018.08.14.09.15.18; Tue, 14 Aug 2018 09:15:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=f2VhA+QY; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0FDBB74572; Tue, 14 Aug 2018 16:15:15 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-oi0-f50.google.com (mail-oi0-f50.google.com [209.85.218.50]) by mail.openembedded.org (Postfix) with ESMTP id 41D346010B for ; Tue, 14 Aug 2018 16:15:13 +0000 (UTC) Received: by mail-oi0-f50.google.com with SMTP id b16-v6so34568237oic.9 for ; Tue, 14 Aug 2018 09:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jAvavdTxYNq3hFQU9vpWVZjCoGvJ/3GSj2+bUIHMcwQ=; b=f2VhA+QYqczuOrkJgPn5DrNF7VdtM1stof8zCJPHN7ArDAtN/LZ58bb7ro6k33DZCk pKS6fXqEZel+wQ9D/dSlJdbC65md4ckQzmg5XpBOveAz+YKbgSI67+QLnKqYTwIyQvdp 3LoDrkrJBKH+w96qciPh8Fa0L61fczw3Xw9nQ= 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=jAvavdTxYNq3hFQU9vpWVZjCoGvJ/3GSj2+bUIHMcwQ=; b=kSRCRGaH4jUo3Iyvh2JpINI5LuBmlag4ebjkneEp7M32pbC6iTTaqXp77G6YrZ2V/B 9nfm2anN0n2xPYQt5l+ylqD6BW1W9KX7mmeTwa/UrpksdeTOceiliVmfjGVVutJhuGg6 rtzAXlw/cR0/JSRo76fJXTDAKGXImemDu37XPlLPvbV5pxiSEocyG+pr6j6pkiWtgkuq cgkb7lfCTWlJ+sqbY1yjNKHdnYusL/aXS2ItTOl/JKdXxj/I/4UVsgre5romQIbG8I1u kCNUn39qbZSRl3QSfnJD+ZPabwYYGgttvwJLgxbrncT0rT/5hz5Fa2EePsgHKNcC9Ao/ IK9w== X-Gm-Message-State: AOUpUlFVQKCqNQnNKHA2R5QIhKICpK12sVNWochffYGY6ie0HbsHmPrR FjcTDO1ihYRXWhOiWkmlTjqWZ85KOWTxmA== X-Received: by 2002:aca:f305:: with SMTP id r5-v6mr24637072oih.230.1534263313611; Tue, 14 Aug 2018 09:15:13 -0700 (PDT) Received: from aura.cortijodelrio.net (CableLink-187-161-144-121.PCs.InterCable.net. [187.161.144.121]) by smtp.googlemail.com with ESMTPSA id d191-v6sm35038343oig.16.2018.08.14.09.15.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Aug 2018 09:15:12 -0700 (PDT) From: =?utf-8?q?Daniel_D=C3=ADaz?= To: openembedded-core@lists.openembedded.org Date: Tue, 14 Aug 2018 11:14:35 -0500 Message-Id: <1534263276-24467-1-git-send-email-daniel.diaz@linaro.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [OE-core] [sumo][PATCH 1/2] glibc: Make bits/wordsize.h multilibbed again X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org As reported by ChenQi, leaving bits/wordsize.h out of being multilibbed introduced a problem in building the SDK for arm64: Error: Transaction check error: file /usr/include/bits/wordsize.h conflicts between attempted installs of lib32-libc6-dev-2.27-r0.armv7vet2hf_vfp and libc6-dev-2.27-r0.aarch64 This effectively reverts commit a74c77d6. (From OE-Core rev: 90ad502bf8faa233e25cf297c1eeefcb0367aea3) Signed-off-by: Daniel Díaz Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 35f5231..c1d186a 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -137,7 +137,7 @@ do_install_append_armeb () { } do_install_armmultilib () { - oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h + oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h bits/pthreadtypes.h bits/pthreadtypes-arch.h bits/sem.h bits/semaphore.h bits/setjmp.h oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h From patchwork Tue Aug 14 16:14:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_D=C3=ADaz?= X-Patchwork-Id: 144197 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4552497ljj; Tue, 14 Aug 2018 09:15:35 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzHnGVQrEJombDLBsZCeDJlkR3ihSbyJZjS1dVxcWDacQi8gzldjzQ1sSrCjP5h6U2VyfHa X-Received: by 2002:a62:aa02:: with SMTP id e2-v6mr23846777pff.211.1534263335119; Tue, 14 Aug 2018 09:15:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534263335; cv=none; d=google.com; s=arc-20160816; b=R5eFk/X/rz+dzVwn5qs39aaDc5BWBh5WFQ2h7dGxD6ngma/Znk7wQpHICpPxmHs89K N9IL+QzO7E/C6WSXBR1Uogm9msjkBZ0STT0FAhqsO9NNpgRdIDX/vL0zysmFwz1WKnfG +4XYYbMgwlkBu11dGFS1N+8IwNAFFfjWGwuuKHDF0MkU0FGA7Q2CgM3HQjZsMOKOLI+l 0ksClQLI6LtepoODmRm0JZqUVAoc5WXiY6HT+6Z+T6fPrCoHq8/4b3BkVbrAlfvbyIvn 4kG63hvPJpwTOT8+zvmKkj/iF1s3JVqQlCqZoFCIWKeUeZJel7w4ywIKXXcDrbkPMBY0 uZFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=juxlE0MA9DK+13qU19WeZtFgD9//8zODErjuGS6uHPs=; b=tRCMIL04F5CX5xJ4g/hEh/YD0zjJ41BCX6R31PLJU6dLGb/rc7u1qhdbNyIkayi9af 1c1X/ctSykX0fDS+DTjB9huS5rbY5scAKeRyuinn+JZ38B7qNeA/nTm5qwFtSGz0cvhW mSvSIg8eWqkgZdAqhevEHbQsMGSsFdqE6IZ3pVrI/hmv3hKVMLsbBjmEpciq5WaXdy08 QnCW3VamFVZ/Ybi5VYk2BIay5BnHXTB4jIHbugCDuhs1bZsdpw8NQ15P1uJ8A1GqjhsA 6GXxewyaOrKj13kxuvHn3MI2LCBP1M9OhbExtZp9CsxhhWHid8ii8x1ljE8pEPXoOt5w rUDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=aMK4RwsV; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c27-v6si21551911pgc.11.2018.08.14.09.15.34; Tue, 14 Aug 2018 09:15:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=aMK4RwsV; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5BDE379015; Tue, 14 Aug 2018 16:15:32 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-oi0-f68.google.com (mail-oi0-f68.google.com [209.85.218.68]) by mail.openembedded.org (Postfix) with ESMTP id 231DC79029 for ; Tue, 14 Aug 2018 16:15:18 +0000 (UTC) Received: by mail-oi0-f68.google.com with SMTP id w126-v6so34601123oie.7 for ; Tue, 14 Aug 2018 09:15:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4ilP3zMpND93SLr43RJKQvyq9iU7XVEJJ+sLW+6gBb4=; b=aMK4RwsVB+GXb9HGoXqHD8UoMnF5XSpHgCQRn55GCuILF7y+M2zZCL/r3xknffitVN UNoaURlxZamopWEbR3nX0bRaR3hr15v3yIulL/O9cmi9ngbvv0KVXkjubMDObw/V20qr ePgWAdKOsUlAZJnswl/+WEUJbXkIiJ9hHGJuo= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=4ilP3zMpND93SLr43RJKQvyq9iU7XVEJJ+sLW+6gBb4=; b=SRrNpi/kJcqJV0FSkZL/IuZP1dO8CvDH80Y2IGUI4dOCqqGU7L6z5pOzoXnmvQKDaP 8apW+W9V7+Oy3W4Bk0JNqOZ+AfK+ofO6XS9HHHQ9mEObhuPtY4eWC+DOuxWVKmph1vDo B9iFYi9KvxrgnpJS5B6yl0X9DlVDQdJ2MrenIxowO1QYmwh+skmLWYNxOtG0vijHSuf9 7a9PhjVQrcSwlFAtWC316tour0pOTyTKPI+/RqjiGN1zut3LgFB/2hTxC7x0dJSlFYe5 S0QjlJ2lO/1yHFRtGlH/69DbTb7BXiQfMEEb73PGs4F7Z1enBFGSaZUd82PdZMXSyAx7 gglg== X-Gm-Message-State: AOUpUlEAPOFE4asqbt/Gxg5LriG1Pk0tQa9QC2kgFLbvk1sPQh6Efj7J yB+n9YEJquaXEvQ7PdiQAGsYsabmgSUdMQ== X-Received: by 2002:aca:90d:: with SMTP id 13-v6mr24806292oij.300.1534263319596; Tue, 14 Aug 2018 09:15:19 -0700 (PDT) Received: from aura.cortijodelrio.net (CableLink-187-161-144-121.PCs.InterCable.net. [187.161.144.121]) by smtp.googlemail.com with ESMTPSA id d191-v6sm35038343oig.16.2018.08.14.09.15.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Aug 2018 09:15:18 -0700 (PDT) From: =?utf-8?q?Daniel_D=C3=ADaz?= To: openembedded-core@lists.openembedded.org Date: Tue, 14 Aug 2018 11:14:36 -0500 Message-Id: <1534263276-24467-2-git-send-email-daniel.diaz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1534263276-24467-1-git-send-email-daniel.diaz@linaro.org> References: <1534263276-24467-1-git-send-email-daniel.diaz@linaro.org> MIME-Version: 1.0 Subject: [OE-core] [sumo][PATCH 2/2] multilib_header: recognize BPF as a target X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org When building with `clang -target bpf` using the multilib_header, a recursion was unavoidable because bits/wordsize.h would #include itself, still lacking a definition for __MHWORDSIZE or __WORDSIZE. (From OE-Core rev: 70b41b3c335a80b4ac243f468f22331d261299db) Signed-off-by: Daniel Díaz Signed-off-by: Richard Purdie --- scripts/multilib_header_wrapper.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/multilib_header_wrapper.h b/scripts/multilib_header_wrapper.h index f516673..9660225 100644 --- a/scripts/multilib_header_wrapper.h +++ b/scripts/multilib_header_wrapper.h @@ -22,7 +22,9 @@ */ -#if defined (__arm__) +#if defined (__bpf__) +#define __MHWORDSIZE 64 +#elif defined (__arm__) #define __MHWORDSIZE 32 #elif defined (__aarch64__) && defined ( __LP64__) #define __MHWORDSIZE 64