From patchwork Thu Aug 9 17:14:53 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: 143869 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2349203ljj; Thu, 9 Aug 2018 10:15:28 -0700 (PDT) X-Google-Smtp-Source: AA+uWPw9uWG4Rmgq5LX8izAbty/7ytKckjDj6E6gsTBZRGcnHHXdOXA4zgSPr5ouP47o/0gJvEJh X-Received: by 2002:a62:106:: with SMTP id 6-v6mr3320843pfb.168.1533834928239; Thu, 09 Aug 2018 10:15:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533834928; cv=none; d=google.com; s=arc-20160816; b=eUmg5uZ1H/RiNW6GqkjyyiGfuHdx+el56j+L0Vk1LL1v3FxBaSUBd/J9BLt0RWwFlg 5Ha9nk28U/y+P4Nnr9lL+TH6dJqJlu/P0ticXQylmkBL86sAWL0O9Odx5kN9F6fcpJRl IPaVgiF0PVRWFLPpmMfaJkZPshFk7nqYBcwIoQgj9G23CHJcndcqJogRz5qWUGSZE0X/ ZP/5LegodIQ8qRmwPFXMWC8cOlI2n4sfv/EASI75AZQnv3MwEEKtNpQdFOe2wq8qmI2s +/bwimQhfgLHUoXGmWCNmjd6l86cnyIt2Rw8OSbynCZmEGlFxm0iSta2LpsIOfOw9rsc RwcQ== 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=p6k5rslEpGMhOjzojnPmFVsn8LhmwjhDd7NBrgZECCs=; b=EtDskejHR3C5nVyZL/gsJclE/l3Dhfh+zlGg5Ex67MqWShVPddx4ADCTmXTqzEPszN 7cDCM/FPBbL804AGj+20qHous6x+us1rQ2A3ceun3r3P96aB1v5KvB9mFLxDttNrA0Ey X8rdCid5siJqeVfXMWhkJsbb7iAphxIyu2dT4CHlPKmKTWGsOKqlbkKA9Na39h46Lmrd fXeUlSrc4Rs1kB78+k2e8Rlw8yXEC0QBM5sHwPT7QHae+ZQQCDjzXj8Owr+AHdKhNfUh oBNYtBD7qz6fS64AwCN+8rnz2yuPTtjGQwCki5uz6MiCyVER1tFcmTxsw+AhyqAZUzf4 PbaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=VqEQK01m; 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 l18-v6si7880012pgi.249.2018.08.09.10.15.27; Thu, 09 Aug 2018 10:15:28 -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=VqEQK01m; 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 5A77E78E7A; Thu, 9 Aug 2018 17:15:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-oi0-f49.google.com (mail-oi0-f49.google.com [209.85.218.49]) by mail.openembedded.org (Postfix) with ESMTP id 3F6A6744F2 for ; Thu, 9 Aug 2018 17:15:24 +0000 (UTC) Received: by mail-oi0-f49.google.com with SMTP id w126-v6so11104674oie.7 for ; Thu, 09 Aug 2018 10:15:25 -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=XB0Vga/aQyBhYhVIPtwUbTxun59wnGa3dOsclc+R614=; b=VqEQK01myhb0diz9/EeS/eppyrt4A+1vdEULKTaV5FNB2lAzQJLd4ENBQURnT+NwV8 HzLYFHceNc19jihsVd93CbiPCiKwwHVT4iRhOjWfe1EnsW27+xiyDkTdp/ouj6X9tr7o h7zXCGeDApcz0NoOQJGWiJxaCTSzmSZY4/nVY= 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=XB0Vga/aQyBhYhVIPtwUbTxun59wnGa3dOsclc+R614=; b=Bzw7xRBMp4t0xUDk57GAQti01gkZBUrfIRSqH6qUfQgCsq6y8nvIgyGhP7gkZeso1G QwcOLeqSWyTdZbHQSaiE7i2rwNBst+d610CNOuf/xcmehYN6ECVr+R4wXjJxlX7aJFXt slMonfPrg48KpDELRNfRbClV6hPVbfyOAg3TqsPG5bkINwrXFShPnm1c5mv/aVNS1DE2 U6YBQ4uDfB28EN3S2xHBdrzwwlvdALogU5YbBVTlHoUtvK/0hoaoY//m8NtOTyKn0fji 0qfRl27u2S3G1lQQ6V3RK28Pc0LvA1oBvgWGAetBgyYCn4zituBrwcnteyNCNF/0GO8J gVrA== X-Gm-Message-State: AOUpUlGF3MRRFNO3Lxhy82Sj4ijE7CR4wHT5volG5xlwVahx4CWowaIx Lei85V4Fnom2RJZ8cqyuEQCpdRty7Hs= X-Received: by 2002:aca:e0c2:: with SMTP id x185-v6mr2729355oig.220.1533834924483; Thu, 09 Aug 2018 10:15:24 -0700 (PDT) Received: from aura.cortijodelrio.net (CableLink-187-161-193-121.PCs.InterCable.net. [187.161.193.121]) by smtp.googlemail.com with ESMTPSA id m203-v6sm10884127oig.42.2018.08.09.10.15.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Aug 2018 10:15:23 -0700 (PDT) From: =?utf-8?q?Daniel_D=C3=ADaz?= To: openembedded-core@lists.openembedded.org Date: Thu, 9 Aug 2018 12:14:53 -0500 Message-Id: <1533834894-4576-1-git-send-email-daniel.diaz@linaro.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [OE-core] [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. Signed-off-by: Daniel Díaz --- 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 a4f61f8..8ac01ce 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -136,7 +136,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 Thu Aug 9 17:14:54 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: 143870 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2349460ljj; Thu, 9 Aug 2018 10:15:43 -0700 (PDT) X-Google-Smtp-Source: AA+uWPz0hasZUeMoBhGZfpRVYpb4nZUKjZxLvNDoBF49MHo86UJ/HuBJoFZDolG8pgsr2cbn85lf X-Received: by 2002:a65:5a8a:: with SMTP id c10-v6mr2887146pgt.389.1533834943763; Thu, 09 Aug 2018 10:15:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533834943; cv=none; d=google.com; s=arc-20160816; b=ZYAlmZnf8gQHdvemiuIqgG38M35OU0C0ENDFYRE7l7SP69Havlmog9MwRh0DvUMJF8 wvlmqexeyFhzgdZoyonjXlWIY0/DNY2TBhSd/mBxFGUFV1LcIieyblf51cn4/7TnEBZ3 8yfLpO4GVAvCaahT1xym5xWkNoGSpV3nWeG0MydSkTZlwyYG5MmavMFS6F0Hqv8sux0l kCYDeqzq+anlExtacqE1M9eTRhX47fH+4bxl25R+ba+eliH5tD8z0Hk5eIY0uUg/iDUh eTB3s+Fd52HPgnNUWF3X161CdKQFFGBU9qZe/+0wj9Px+Hbv2M2hS0PbyvR+Vf9SW7+9 WBwg== 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=GkNX/PG1cBHsZLleoH4I2QUAwMWBwjpGV15YYZvaX4g=; b=xHgYN6ad/7p5PlcGmOEhyN3uEMhv1X+fC1HMukzwJF5ja8U8DkuPIgzUMnfnpO6N4h ze3tuCjQikgM+MTIC9qgr8gm+eSpakHmiVB8WjQemgCeD4/yxBKzb4AnXo2KUSFAuzk2 xJb+4ybqZgplmP2mVwSH2NCfBxsipx9XHopIV0a+90pAEYolzj9tKaf648TE/nuxVymS fxThJcT9daQ9ZOuyncEGqj8nn8EaLr4ZXTe54L6oW6OxR3Gv6f0+Prdq/yKbx0p4Ra4X psZeVAMvaRyDsIxVV8+yx+FWTsz/6kjhRn5DZq54P17VPanF7G2ScHqL04exN+u+1i94 JQDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Wt7Pd45q; 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 z18-v6si7642058pgg.332.2018.08.09.10.15.43; Thu, 09 Aug 2018 10:15:43 -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=Wt7Pd45q; 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 AE5C778E77; Thu, 9 Aug 2018 17:15:41 +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 D8E6E744F2 for ; Thu, 9 Aug 2018 17:15:39 +0000 (UTC) Received: by mail-oi0-f68.google.com with SMTP id b15-v6so11062098oib.10 for ; Thu, 09 Aug 2018 10:15:41 -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=ZtpArjX6p0IAi307rxgnGcCSIwudpp9y7hLSAx4lWLQ=; b=Wt7Pd45quc3JQBqc/rMDBUEyKrI1p3Oj9g1U+O8b2Ggqotpzz1gRj+YEke8ElqMb7s oYjDhebTS3VPSXtJ8kkJOmJVkur1lUD50zOYGOdXZ53kuuB4ljispLFP9XUqUi620tZ2 TgaOOBVHY4ljnQR4P+fUD+3dYsTi3gxP2tsXM= 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=ZtpArjX6p0IAi307rxgnGcCSIwudpp9y7hLSAx4lWLQ=; b=sr8srMpxj5POCRwRis0mbKkxc5Aw4nSl9tMGrIEg3/cLpJc/DjM+uVI+yCNgeDdyoV jtDOOGq/WwD9RuTC0KcEj9xEQMLDNL1VuTsNS3Feq6r/AFKcQPTnmZ1RMxmYhoNiXbbz toBueqknhauLi2qt8SR1EOSQGsaR5z95aSBENsX2KJ8Vsfq6DxhniiEALxhcD38QKBqc +eK/0tW0g90E3XZh+b06t1Qexa/xHbXQtQfCVWiHXBTB4OPLRyLIaYbJS4HFQqNS/3nQ 3PaaMi1OqwmQ5Q9t1YkynZCTb9/L08q3ykS1cK17ISAORN4ISilZ8tSCieA/QTCCsvRp aSew== X-Gm-Message-State: AOUpUlGNPsy8GWPx7tSw3g46g5tBQEZTrn/GVBEPer2I7hOQ8ve49fJ5 48wPtV8kAt4cmFgbifYZGfzH7Nc1t8Q= X-Received: by 2002:aca:ba57:: with SMTP id k84-v6mr2742762oif.10.1533834940584; Thu, 09 Aug 2018 10:15:40 -0700 (PDT) Received: from aura.cortijodelrio.net (CableLink-187-161-193-121.PCs.InterCable.net. [187.161.193.121]) by smtp.googlemail.com with ESMTPSA id m203-v6sm10884127oig.42.2018.08.09.10.15.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Aug 2018 10:15:39 -0700 (PDT) From: =?utf-8?q?Daniel_D=C3=ADaz?= To: openembedded-core@lists.openembedded.org Date: Thu, 9 Aug 2018 12:14:54 -0500 Message-Id: <1533834894-4576-2-git-send-email-daniel.diaz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533834894-4576-1-git-send-email-daniel.diaz@linaro.org> References: <1533834894-4576-1-git-send-email-daniel.diaz@linaro.org> MIME-Version: 1.0 Subject: [OE-core] [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. Signed-off-by: Daniel Díaz --- 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