From patchwork Thu Jul 19 01:26:58 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: 142311 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1174019ljj; Wed, 18 Jul 2018 18:27:15 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfXNcaXPw0RAwiuTv6dWcPQU86KaoUmpAJied9TV+mzKxhhCSyhx4E106LixQRLbO5R5aun X-Received: by 2002:a62:1089:: with SMTP id 9-v6mr7335573pfq.30.1531963635010; Wed, 18 Jul 2018 18:27:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531963635; cv=none; d=google.com; s=arc-20160816; b=XEXQGQDWxM74DJfA1ceIKCGVuHEmtYSKlk5hoCFDcbmSrglMwyo4NkJRoST4v7fb5Z pzIBPBYB5NnAReLK9X0qoVZsx+81vPRFzVpr6KmdnvwVd+VuUyjUW11ThivaPcGEvv3j FVAaMhxibBTFv2uWknm5wOK0KBeH1WQIbd9nxZiHsil7+KGgJnPOxvYWRl8EN7Fn5T/X zx2Bw9Crux4hpSgCM7O5a+tBI38MZ6PDE3FdU2F4UNtWU/Bd6GKkrxXMahWmEHbA9wLW TjAf2igJ8IEudtuTtID0HbMRs+XHe4lklTrEKG7EyiLy1LFWjtuNe9UoyTcs5EU03Edx h7fA== 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=2NKk09MV2PhDSdHidBgiFYXT/OzwdI863Xo2wRBWNEw=; b=BJFVZDhlpNbUjImJmiWmkJ4nDg+TPX30BUnYgcStGn4wXBNYgpW3ger2hmG5UVKxFF fGZesupr5WGPpBNkcqI0r5z0pMGOE4XLYwtXS+JxIizcTwQ8qAc7BJXlNLS4m0b9crq9 l5havIKyHAnIw1R4hHKPQa1GlPWfsyDAW5iWJ2Viar8Rq71MuJ07DkIjudbe4V+COhpJ IMX/lU4OTzBN557M47cRmvGeoW6TG1x/WEHM6HfrHOjR/QRR/tmtId3bi2QkeK8gARNH 1yUQeeW1EEq6oqjA5ohjtNWDzmWPSz7BI8tNjWzY4rHlqX+hvpnGJRxlc0Btsbd9MAxk apYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=VsliZOc8; 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 v6-v6si4499792ply.300.2018.07.18.18.27.14; Wed, 18 Jul 2018 18:27:14 -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=VsliZOc8; 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 5995074B83; Thu, 19 Jul 2018 01:27:09 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-oi0-f66.google.com (mail-oi0-f66.google.com [209.85.218.66]) by mail.openembedded.org (Postfix) with ESMTP id 9FE5974B83 for ; Thu, 19 Jul 2018 01:27:07 +0000 (UTC) Received: by mail-oi0-f66.google.com with SMTP id q11-v6so12434980oic.12 for ; Wed, 18 Jul 2018 18:27:09 -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=xcaeNq0sPpL5fJRWK921bF7MGNfKLQU6d+nvcgcUup4=; b=VsliZOc8UqefCx+W9HR+jz5T1L1lshcnJS4SNhUJJHDQQivSPX1EYDInJuK5DVQpzn Q0l573mQvkLUZQGstSVIlMnpnkoBXUc2D5wDinZ11FHdlTdYoGR7QV4X+qsoUD9Dvjk5 xXSr3JcaLHuvARziIKmzp6GjF9Aeh9Wm+kuOY= 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=xcaeNq0sPpL5fJRWK921bF7MGNfKLQU6d+nvcgcUup4=; b=Q12LhBma95rdgYty1B0cyVBBEUQdyU7DZm3lOdGg67y3ca4L+qg2JsS1uHoK1A5pPY hh6TL/RN1EWKD6MeYHNMKrS+wRRFxiuuw55MWDdw57dOJghpNspbj8s9JhphEgb4lse+ FQNmy3HU/0SvP5crQmqK67fdrtZMRhIhIXzOhUlWCqzvtalM3eWi3j0jbNzvmvAakRpV RP4ps7JPeuPC3Xl/3kTu2j8rH5g1oxd7nOuXjfjl+0TYzARFMnO5UI8Yabi9MRCOeP8l kV5f1Jmnnalv89wd58nWVyrQ5OB6KAsrc7mMWtiWtdCXfFnrK1FS+ICI+99A55dqjFri Lniw== X-Gm-Message-State: AOUpUlEwxy1nZFdTawA0lUkCDgBm3cLDe/rfsDh/UtYbOphJyWygfbj7 Qqrn3weJLImarP9CFelkJWpuv0IMqXc= X-Received: by 2002:aca:d4d7:: with SMTP id l206-v6mr8326217oig.52.1531963627877; Wed, 18 Jul 2018 18:27:07 -0700 (PDT) Received: from aura.cortijodelrio.net (CableLink-187-161-189-57.PCs.InterCable.net. [187.161.189.57]) by smtp.googlemail.com with ESMTPSA id i132-v6sm8340235oif.20.2018.07.18.18.27.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jul 2018 18:27:06 -0700 (PDT) From: =?utf-8?q?Daniel_D=C3=ADaz?= To: openembedded-core@lists.openembedded.org Date: Wed, 18 Jul 2018 20:26:58 -0500 Message-Id: <1531963618-29674-1-git-send-email-daniel.diaz@linaro.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [OE-core] [PATCH][RFC] glibc: Avoid multilibbing on wordsize.h 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 Once another header #includes , there is a potential recursion going on because the multilib_header_wrapper.h #includes again! This should not happen because an __arm__ (32-bits) or an __aarch64__ (64-bits) environment guarantees that we will be getting the correct definition, but when building against a different target (like BPF), recursion is what happens. This can be seen, for instance, when building eBPF programs from the kernel with `clang -target bpf', such as the ones located in linux/tools/testing/selftests/bpf/. Signed-off-by: Daniel Díaz Signed-off-by: Aníbal Limón Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> 
--- meta/recipes-core/glibc/glibc-package.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index ae3f2f6..a4f61f8 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -136,8 +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 bits/wordsize.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 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