From patchwork Fri Apr 20 16:33:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 133911 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp483805ljf; Fri, 20 Apr 2018 09:34:07 -0700 (PDT) X-Google-Smtp-Source: AIpwx49GXcwfY6ZyamPQzqoWiJzuM8rNWuu5dVbegp6Lyn7N8+q/HTUDPyIRqR9tx5Igm6IWASuB X-Received: by 2002:a17:902:6a8b:: with SMTP id n11-v6mr10742200plk.36.1524242047496; Fri, 20 Apr 2018 09:34:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524242047; cv=none; d=google.com; s=arc-20160816; b=wL1FMhgoSssDESmagDzpmFxHCv1H1NFigOkRTPVM8Ru2VApl8iD/ksuYemv7kQG2df Unb9VEZmogXNI8eabcowBFmhdN0vRiFwcAcazejec9ZUAof3jGX3X1gVmxhOd1USVNbg V9uWSNIrzOn/hz42/pId+gj8gzN+G3cw1fqVm/8gM9424Hmih67cTfTYcCGOaaDuuR7G 35+0+excbtD34fxCPqMboxoAXvUyLzMaauKpUwVTZHSKR70Ylh+G4rzClLPydge6XGJc 19z27i6q6Cd6MBs+5mD20UumjNSlIcak25VbUX99onZSHDe5ZPdrUFS6nDFfwAllBSyc YhwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=TjoZPWXBfRw92gxx08RldqElZFf9hBZGLWx7xK58CMA=; b=YQwNS6H+6HpkxUx6etdB1B+2f1DXeIAfdjq+9hn6QM3IQoBWTVKtf3epNiEUOx9zFX 0I/myWYzB5p+LaLipwW0Q7I7qJkfx4b3R2SGzdfxewA8KosrVlQ0NEN6kKddSEMhrtjc CTqXE2SGsxvlQf3WwFKADZCkrVg29Dhg0HUdtWFKiLE/nkeJ+lFcb16cdIhz2GqaVj/Z 2gWeTulMlLYzgRw8l8VPXXnfYWwsV1cUxG1ccekpVxKi2TJxKD7r8DaKaHUt6dwTQ8H0 p0ir7obDPq6euTo8/rGHJcB3QB4n1jw/SqVKAa+vRLFKhK3hc1XgcNo6poDdAleXIBti nS1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hejPSt7G; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m14si5323018pgt.287.2018.04.20.09.34.07; Fri, 20 Apr 2018 09:34:07 -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=@gmail.com header.s=20161025 header.b=hejPSt7G; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id CA6B474613; Fri, 20 Apr 2018 16:34:02 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by mail.openembedded.org (Postfix) with ESMTP id 56BF274613 for ; Fri, 20 Apr 2018 16:34:01 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id w21-v6so5545760plq.2 for ; Fri, 20 Apr 2018 09:34:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9VteVIZC6xV5NGMqWIGNW7zaM7BqsV3zHAMrEpVXE0U=; b=hejPSt7GTgg/s7xhhbkQ4b1kUzJV92eRY0FKfOIs09WPKKOg0UV9MJ4uvS4K0NvJor 5986187kmIUqxeeDZEQUxEPfu9Ovw+lTap46Y6cjh2GJEI4Fl9JBu3IhOrDT2eCJ4Cgn FrPRjtGskGKMeQ+zDYu7YS2hieXcmLxHKXb17llI6ieM0dfFWhh5yUyilQwKkybRs3fg hIB+rpUxTAYP5JHIwaqByTINiyFGNEsTWtJWksqNdrCh2Afvv4gWiIE2HhZ1tfqJG6S/ QpWQrCe8x/cPAsRPYbFT7/hQ8VLJQwxStQRXHse5EBfld4TQR6cuPM1JGqda0Hv/3ysF 5E5w== 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; bh=9VteVIZC6xV5NGMqWIGNW7zaM7BqsV3zHAMrEpVXE0U=; b=CwiWOSaG7qoyuW0dTtTLxASrrCmDtQg9GY9DrCahreF43DjReIius3yPQQGiVP+JpB 6jynqslg5IUoxkiIBDdvPzSWzdO9fDlvOeByu398B3sp0IT83W2lxVf2Qy54za/An8iJ h0BnuwPYK78ORdtGbvuyG2occtOACMmxx5w3hhEZcqvYjDvFtVm4KVyowwaeUzKHxIkM 1sr1BdcSgEhvrLCuYM+XbbFDjhpvCE8LTS0rELvE7r2yyKUoRVTeHEgGDV+L3Sc7YWx1 wQFFGngE6SzyCWgj7EqOcy+9lI3tjIqd4YaeNj9dS5IWRAJIipnRUhpzLFaDMWWz/ODo 8BrQ== X-Gm-Message-State: ALQs6tAZdfAHa1oSZVjNE0XBz0XOo7s89RLGmlSLull5wzeYBBsxUqHa iBlKi3dizrRJi/RQKIeIJBp/KA== X-Received: by 2002:a17:902:822:: with SMTP id 31-v6mr3148913plk.172.1524242042001; Fri, 20 Apr 2018 09:34:02 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c::487b]) by smtp.gmail.com with ESMTPSA id 204sm13450925pgf.61.2018.04.20.09.34.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Apr 2018 09:34:01 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Fri, 20 Apr 2018 09:33:49 -0700 Message-Id: <20180420163354.12065-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [OE-core] [PATCH V2 1/6] libssp-nonshared: Add recipe 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org libssp-nonshared is a minimal gcc runtime piece which is needed on non-glibc systems which do implement libssp APIs in libc Signed-off-by: Khem Raj --- Changes since v1: - Package into staticdev package meta/recipes-core/musl/libssp-nonshared.bb | 39 ++++++++++++++++ .../musl/libssp-nonshared/ssp-local.c | 45 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 meta/recipes-core/musl/libssp-nonshared.bb create mode 100644 meta/recipes-core/musl/libssp-nonshared/ssp-local.c -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/musl/libssp-nonshared.bb b/meta/recipes-core/musl/libssp-nonshared.bb new file mode 100644 index 0000000000..00a0a3d411 --- /dev/null +++ b/meta/recipes-core/musl/libssp-nonshared.bb @@ -0,0 +1,39 @@ +# Copyright (C) 2018 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Minimal libssp_nonshared.a must needed for ssp to work with gcc on musl" +LICENSE = "GPL-3.0-with-GCC-exception" +LIC_FILES_CHKSUM = "file://ssp-local.c;beginline=1;endline=32;md5=c06d391208c0cfcbc541a6728ed65cc4" +SECTION = "libs" + +SRC_URI = "file://ssp-local.c" + +PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" + +INHIBIT_DEFAULT_DEPS = "1" + +STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" +STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" + +DEPENDS = "virtual/${TARGET_PREFIX}binutils \ + virtual/${TARGET_PREFIX}gcc-initial \ +" + +do_configure[noexec] = "1" + +S = "${WORKDIR}" + +do_compile() { + ${CC} ${CPPFLAGS} ${CFLAGS} -c ssp-local.c -o ssp-local.o + ${AR} r libssp_nonshared.a ssp-local.o +} +do_install() { + install -Dm 0644 ${B}/libssp_nonshared.a ${D}${base_libdir}/libssp_nonshared.a +} +# +# We will skip parsing for non-musl systems +# +COMPATIBLE_HOST = ".*-musl.*" +RDEPENDS_${PN}-staticdev = "" +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-staticdev (= ${EXTENDPKGV})" diff --git a/meta/recipes-core/musl/libssp-nonshared/ssp-local.c b/meta/recipes-core/musl/libssp-nonshared/ssp-local.c new file mode 100644 index 0000000000..8f51afa2c1 --- /dev/null +++ b/meta/recipes-core/musl/libssp-nonshared/ssp-local.c @@ -0,0 +1,45 @@ +/* Stack protector support. + Copyright (C) 2005-2018 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +In addition to the permissions in the GNU General Public License, the +Free Software Foundation gives you unlimited permission to link the +compiled version of this file into combinations with other programs, +and to distribute those combinations without any restriction coming +from the use of this file. (The General Public License restrictions +do apply in other respects; for example, they cover modification of +the file, and distribution when not linked into a combine +executable.) + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + +extern void __stack_chk_fail (void); + +/* Some targets can avoid loading a GP for calls to hidden functions. + Using this entry point may avoid the load of a GP entirely for the + function, making the overall code smaller. */ + +void +__attribute__((visibility ("hidden"))) +__stack_chk_fail_local (void) +{ + __stack_chk_fail (); +} From patchwork Fri Apr 20 16:33:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 133912 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp484241ljf; Fri, 20 Apr 2018 09:34:31 -0700 (PDT) X-Google-Smtp-Source: AIpwx48dgmBRveYMHoNzkoRFM9+MQxxs+7oK3Xsu/vTgxWJu/HjiUxLo2UrrBNstknDkCt+DxL9V X-Received: by 10.98.166.92 with SMTP id t89mr10130513pfe.27.1524242071715; Fri, 20 Apr 2018 09:34:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524242071; cv=none; d=google.com; s=arc-20160816; b=eTYKurogkx3k5MfvW8oy42RHqtg/+j7AjT2UQZj+3CJua/kvCfDHrmGroMwjYwbutE KePwy2REhJZnkiMp07jvRIAXYUSRyyUnWhnbLjtK4+lAyS1rJUv7HCt0VFRT1R9OtLtd sqSqhojAgUqKMezp90rDhz3OR9n/0wgPCVhI8/LiQyqXxNdmkquM2MRNfD08r7+0bcom Nf2KYyiLNsCITIA9ed2miXLG9AwYVcBY7lNwduHfvdidPnCzMF3N+cHe7Br/imhqeJeW qpVlH1fgusQmVwe2jMctWrUIZF/NIeFghIjkys7ggBqvzibl5vbcAJ1PF1BkAIdDQeS1 0N6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=lYTk7RU2ukmm8hMJ9MyRDJZ/lYUs2dvfjqBM1GArzU8=; b=OLB4ihHiXMSgd9hanQeI25jJpTg8swbmDfywsnwkLp11rib1JkeWf84FINBER1x0Fd XOg4vmrHUNodR+Q6rknckGs9+GBjLmgtH0S4DoUsMd56C6QViRGGLvQCRyFPTkuXadH3 GBxjUooizlNg5NcdIIU+RJpjIZzrEBmdl8T426EPwDogCVkZ2+ulXwwfW4ZQMR3slmT6 4wCMr8XQGFP7Uxrwb5cFGL6LuyB2BwUYZKIbnnUnPJXxQffiDXfYWpy19gp7F/HwHT6f Lh4goaJXwVX/VvKycLo68G2/0PPvWpoFpKIWcixWwuB+jqzJn+x5TRBiNQccAJGQwzsd Kqdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EdQZ2Lxu; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t2-v6si5868575plo.235.2018.04.20.09.34.31; Fri, 20 Apr 2018 09:34:31 -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=@gmail.com header.s=20161025 header.b=EdQZ2Lxu; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E556B74639; Fri, 20 Apr 2018 16:34:28 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com [209.85.160.67]) by mail.openembedded.org (Postfix) with ESMTP id 647E674628 for ; Fri, 20 Apr 2018 16:34:02 +0000 (UTC) Received: by mail-pl0-f67.google.com with SMTP id s13-v6so5541201plq.11 for ; Fri, 20 Apr 2018 09:34:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sjbmiToafnpuyzJdSVQnYacHb34cDa+MdWw3T4PRsyE=; b=EdQZ2LxuwdmyFJNi+5Q4t5jNsBKtQdfAqjNn9HAxkshyezjFmdSWcmJz5g9bLjq4+/ xllNudftCQpnMbsQiqrRCCa645FiLn7PBQ2ZyQHeKskSXTK7ZIZfyQruCsIZj939PPYC ozFQKzu69ISyU3ut1RwLR6LH3J0D8GDvsgndeOsSHc9ovWf6dc08MCrBEVyw3SUmbuhw DKeSnt+8HAtiuKFH3A+cEY72jHKgPMyqeykakuhqy2qZJu4L1Ea5q24ZOoP8h/QPp+xE VIXCAY8FDC2xGOvW0ckOL9C8n/L0UCAif2S5P/QqSAg2P394u8VlTLfofToDgdrpl1fH 4raQ== 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; bh=sjbmiToafnpuyzJdSVQnYacHb34cDa+MdWw3T4PRsyE=; b=DIg0WxBObTjXXbmSPTxFgVwK7LvspAs5ZocSlB0n5Ia7G/C45qa0R1q8mA0jk3jisk uFh+pxpsBqVt48GdipzwXMb1i84MHSJGy1F3HiKPez36euUjuZZ1UB2DsVGZbXyxZcQc efIOIRzwHWCZ60xhdontbwYTIfWHUZSyL577fxf3pmvRtbbeywu+TPVnHj+DSJDes7E0 TzZvem89LtS4viRCQGgy9HvqfOBN703Uk/ddjPmBpiOT7Qqj1iwbbkSpwCVlhZ+FcKNd 6707YLYJRnhfb9pCA0pRvIzMposUmAuIeW3NPP6GXorFmEqjcLFl7CrbnIxMa/KKptA9 4KSg== X-Gm-Message-State: ALQs6tARO6o10VEJgS5tOG4mvLj+CB0QBhl+RYNyZAwAJF8shcwKs2Dk ixxAiq4ZERX5SJWdv40fqfJmtQ== X-Received: by 2002:a17:902:a609:: with SMTP id u9-v6mr10988600plq.56.1524242043753; Fri, 20 Apr 2018 09:34:03 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c::487b]) by smtp.gmail.com with ESMTPSA id 204sm13450925pgf.61.2018.04.20.09.34.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Apr 2018 09:34:02 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Fri, 20 Apr 2018 09:33:50 -0700 Message-Id: <20180420163354.12065-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180420163354.12065-1-raj.khem@gmail.com> References: <20180420163354.12065-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH V2 2/6] musl: Depend on libssp-nonshared 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org libssp-nonshared is required on musl since it does not implement the gcc runtime piece of libssp, which actually it a gcc optimization to reach to __stack_chk_fail Signed-off-by: Khem Raj --- Changes since v1: - Depend on libssp-noshared-staticdev meta/recipes-core/musl/musl_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 9f8c5126e8..a57460ddd2 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -22,6 +22,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \ libgcc-initial \ linux-libc-headers \ bsd-headers \ + libssp-nonshared \ " export CROSS_COMPILE="${TARGET_PREFIX}" @@ -65,7 +66,7 @@ do_install() { done } -RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev" +RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" RPROVIDES_${PN} += "ldd libsegfault rtld(GNU_HASH)" From patchwork Fri Apr 20 16:33:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 133913 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp484316ljf; Fri, 20 Apr 2018 09:34:37 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+W/sQN7N2Xvn3B2RqQERu3RbO2By3by1CNRKz4CU46YeijvO9+0LL3bNLpa4u+skMIgwTA X-Received: by 2002:a17:902:9886:: with SMTP id s6-v6mr10779969plp.380.1524242077044; Fri, 20 Apr 2018 09:34:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524242077; cv=none; d=google.com; s=arc-20160816; b=vhCOliSLh2X8XK1HgXrZN+fbBbCntxdk7m/KcnrKIDA67lcJimB+mbCAvoA/DBroq6 6sbG2qkkPDjp5+n7BvczFaj6AJzu+naAM5Yqm5piRSpo4TwIfXfSy66Qec8vDjjXKrCi 70HNDsp+r+VuEiUnNbJjkbPfZ2gDhSXXBwk/X8JsRXhp6igjIkMbLTiIipe+bSPaVGH4 7RkQxhyfOJv+bcNyeLX5HxlmFYe+f7tuzKF2mlDr04lNPpa/LUWuKB6y6rTPn3WcckuV DDg56AJAR9b9xsl/83UCR9a4TSvD/aR4VIZLQHC6ljv1aI2L7ON6KH2ddm2TgajQRmCC u6kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=TxkHUBpiW2D4JQziCYzHKMWUfhkg5ML0KxP3n0jcReQ=; b=FX3JYH2Zkxg2Nvn2F2Us8Mw6YhG3XBx5b8SnjxSEH/MeyiaXjhgNLOEHaqclMEfWY0 I2Ad2dABUwRY4Pzgyh9HU/1pMb8jVFQy7yG2giwYteu3y1hs0kVgj5viCdXSE+67Yr4L Lv80qYlUXuWZcQ5dz3IORzDPhdUw0Tf44hKjNFpXX4fg7Z4VIEodqm1xabj5oB1bcmhp Py/UkDUnx6Yrr9fZTFergx+9+K7eZZbS03WIOPe8HyFvqAzOlnLombVGbRGOrdFbWa64 bXLs83I+xIh8a5uXYy1qjsnTw5dUPVaO7cYn9BFGeOQCQWUn96rRLM282KI5NW7RSA2E 3LYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=djFV+BWO; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id u10-v6si6479568plr.123.2018.04.20.09.34.36; Fri, 20 Apr 2018 09:34:37 -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=@gmail.com header.s=20161025 header.b=djFV+BWO; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3C443746CD; Fri, 20 Apr 2018 16:34:30 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f45.google.com (mail-pl0-f45.google.com [209.85.160.45]) by mail.openembedded.org (Postfix) with ESMTP id E7CCE7461D for ; Fri, 20 Apr 2018 16:34:04 +0000 (UTC) Received: by mail-pl0-f45.google.com with SMTP id s13-v6so5541241plq.11 for ; Fri, 20 Apr 2018 09:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iTPuQls4qeO/wLyjikRuxgJLzpESosxyY/ddi24pURY=; b=djFV+BWOcNVrNpqF1K2pfTPjsKHJ9hxYlNeIBy87bMyIDOQTpV0aDA9mNfw28/bbEd nqKTUxjlR+HK4/dk5ZY6wR7cLQbl8T78oj9d/2MpDyvH8VXuHchTVLn9qX6wv5u3o4Xo hdBtqdLTJZnhqD4xGfRBIqZOsxpmx9IcYXia/kWWllzirv5FrNoEJ50cfvNOlSHEZKAN loI/n2mpYdls5Hu/0xJ5ub4x6Jkw6BXBTlxr7wK8niSk6Ukb9tmRQYGg22hLvWPJ43Nm 3WBIJe3TWea7Fv7nZQtO5ZAALotSamYdqEenPhBkFX4ZAq+9vNjCo5bvJ6rl2HDIyRku 3fsQ== 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; bh=iTPuQls4qeO/wLyjikRuxgJLzpESosxyY/ddi24pURY=; b=mVekvOch3Wxi23i4nkhpKncnaX9ej7PdUmykDMNJO1CuTIGmSd3v4ZTy7F3s8FzVaG B4O4SwFsQOBZFqi+zOEs9SnvFb+BrWDcAfJy1QLyaPem2tAGmVVqZ943YtrncU1SxQIP wdLTG4P6EvhRvSHbcU/aP2eu2EVkURUBuMXlwWv20881uA6H3VW6MEXm2nLqk/P9tbkj bFiS7nrW5owbT8F+k3bFOKhcvMcfKRf/CSVLPf1VFpSBMgsliFbZ3TfhPB25dKWnsXPZ ylk2b3CjyZpDwkJdUXPwSy94thCulebh6zbQzuz0gD88MA4LgDRml8+6cUtBHPLTSYkS oJKg== X-Gm-Message-State: ALQs6tDdRSBmbemEbW4M/1JyKI7q04/MzlAhmiRw6A+KfyhnGPQaPf30 LKfsZKlcEh/12UFi+G3Alio3IQ== X-Received: by 2002:a17:902:be18:: with SMTP id r24-v6mr10866749pls.275.1524242045267; Fri, 20 Apr 2018 09:34:05 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c::487b]) by smtp.gmail.com with ESMTPSA id 204sm13450925pgf.61.2018.04.20.09.34.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Apr 2018 09:34:04 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Fri, 20 Apr 2018 09:33:51 -0700 Message-Id: <20180420163354.12065-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180420163354.12065-1-raj.khem@gmail.com> References: <20180420163354.12065-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH v3 3/6] gcc-runtime: Disable gcc version of libssp 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org libssp is implemented fully in glibc as well as in musl so we really do not need the gcc version of this library except may be for mingw, where we keep it enabled anyway gcc in OE is built with the knowledge that C library already provides libssp implementation, we should therefore not need the gcc implementation of same. libssp_nonshared piece is a detail which is needed when gcc is the compiler, in glibc this is part of libc_nonshared.a already and libc_nonshared.a is linked always when linking with -lc becuase libc.so in glibc is actually a linker script GROUP ( /usr/lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /usr/lib/ld-linux-x86-64.so.2 ) ) which automatically links in the needed runtime bits, this however is not the case for musl, where core SSP APIs are implemented in full but compiler specific runtime isn't, for this we add a new package called libssp_nonshared which generate the needed runtime stub and gcc is already carrying patch to link to libssp_nonshared.a on musl This should fix a long standing problem where static PIE executable were not buildable with OE since it was conflicting SSP implementation one from C library and the other one from gcc and we end up with duplicate symbol errors during linking. Backport a patch from trunk which enhances enable|disable-libssp to not only disable building libssp but also not emit the gcc specs to use it for subsequent linking when stack-protector options are used on compiler cmdline Signed-off-by: Khem Raj --- Changes since v2: - None meta/recipes-devtools/gcc/gcc-7.3.inc | 7 +- ...cc-override-TARGET_LIBC_PROVIDES_SSP.patch | 204 ++++++++++++++++++ meta/recipes-devtools/gcc/gcc-runtime.inc | 4 +- 3 files changed, 212 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-7.3/0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc index d968c322d2..98e5383b3c 100644 --- a/meta/recipes-devtools/gcc/gcc-7.3.inc +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc @@ -72,6 +72,7 @@ SRC_URI = "\ file://0045-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ file://0047-sync-gcc-stddef.h-with-musl.patch \ file://0048-gcc-Enable-static-PIE.patch \ + file://0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch \ file://fix-segmentation-fault-precompiled-hdr.patch \ file://no-sse-fix-test-case-failures.patch \ ${BACKPORTS} \ @@ -93,10 +94,12 @@ FORTRAN = "" JAVA = "" LTO = "--enable-lto" +SSP ?= "--disable-libssp" +SSP_mingw = "--enable-libssp" EXTRA_OECONF_BASE = "\ ${LTO} \ - --enable-libssp \ + ${SSP} \ --enable-libitm \ --disable-bootstrap \ --disable-libmudflap \ @@ -120,7 +123,7 @@ EXTRA_OECONF_INITIAL = "\ --disable-plugin \ --enable-decimal-float=no \ --without-isl \ - gcc_cv_libc_provides_ssp=yes \ + ${SSP} \ " EXTRA_OECONF_PATHS = "\ diff --git a/meta/recipes-devtools/gcc/gcc-7.3/0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch b/meta/recipes-devtools/gcc/gcc-7.3/0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch new file mode 100644 index 0000000000..7c53c95c3a --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-7.3/0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch @@ -0,0 +1,204 @@ +From 9815bd97561c778ee0bc0c17f245e88e66570111 Mon Sep 17 00:00:00 2001 +From: sandra +Date: Wed, 1 Nov 2017 02:14:19 +0000 +Subject: [PATCH] 2017-10-31 Sandra Loosemore + + gcc/ + * configure.ac (--enable-libssp): New. + (gcc_cv_libc_provides_ssp): Check for explicit setting before + trying to determine target-specific default. Adjust indentation. + * configure: Regenerated. + * doc/install.texi (Configuration): Expand --disable-libssp + documentation. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@254288 138bc75d-0d04-0410-961f-82ee72b054a4 +--- +Signed-off-by: Khem Raj +Upstream-Status: Backport [https://patchwork.ozlabs.org/patch/823049/] + + gcc/ChangeLog | 9 +++++++++ + gcc/configure | 26 +++++++++++++++++++++++--- + gcc/configure.ac | 24 ++++++++++++++++++++---- + gcc/doc/install.texi | 3 ++- + 4 files changed, 54 insertions(+), 8 deletions(-) + +Index: gcc-7.3.0/gcc/configure.ac +=================================================================== +--- gcc-7.3.0.orig/gcc/configure.ac ++++ gcc-7.3.0/gcc/configure.ac +@@ -5719,10 +5719,25 @@ if test x$gcc_cv_solaris_crts = xyes; th + [Define if the system-provided CRTs are present on Solaris.]) + fi + ++AC_ARG_ENABLE(libssp, ++[AS_HELP_STRING([--enable-libssp], [enable linking against libssp])], ++[case "${enableval}" in ++ yes|no) ++ ;; ++ *) ++ AC_MSG_ERROR([unknown libssp setting $enableval]) ++ ;; ++esac], []) ++ + # Test for stack protector support in target C library. + AC_CACHE_CHECK(__stack_chk_fail in target C library, +- gcc_cv_libc_provides_ssp, +- [gcc_cv_libc_provides_ssp=no ++ gcc_cv_libc_provides_ssp, ++ [gcc_cv_libc_provides_ssp=no ++ if test "x$enable_libssp" = "xno"; then ++ gcc_cv_libc_provides_ssp=yes ++ elif test "x$enable_libssp" = "xyes"; then ++ gcc_cv_libc_provides_ssp=no ++ else + case "$target" in + *-*-musl*) + # All versions of musl provide stack protector +@@ -5759,8 +5774,9 @@ AC_CACHE_CHECK(__stack_chk_fail in targe + AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes], + [echo "no __stack_chk_fail on this target"]) + ;; +- *) gcc_cv_libc_provides_ssp=no ;; +- esac]) ++ *) gcc_cv_libc_provides_ssp=no ;; ++ esac ++ fi]) + + if test x$gcc_cv_libc_provides_ssp = xyes; then + AC_DEFINE(TARGET_LIBC_PROVIDES_SSP, 1, +Index: gcc-7.3.0/gcc/doc/install.texi +=================================================================== +--- gcc-7.3.0.orig/gcc/doc/install.texi ++++ gcc-7.3.0/gcc/doc/install.texi +@@ -1658,7 +1658,8 @@ not be built. + + @item --disable-libssp + Specify that the run-time libraries for stack smashing protection +-should not be built. ++should not be built or linked against. On many targets library support ++is provided by the C library instead. + + @item --disable-libquadmath + Specify that the GCC quad-precision math library should not be built. +Index: gcc-7.3.0/gcc/configure +=================================================================== +--- gcc-7.3.0.orig/gcc/configure ++++ gcc-7.3.0/gcc/configure +@@ -940,6 +940,7 @@ enable_fix_cortex_a53_843419 + with_glibc_version + enable_gnu_unique_object + enable_linker_build_id ++enable_libssp + enable_default_ssp + with_long_double_128 + with_gc +@@ -1679,6 +1680,7 @@ Optional Features: + extension on glibc systems + --enable-linker-build-id + compiler will always pass --build-id to linker ++ --enable-libssp enable linking against libssp + --enable-default-ssp enable Stack Smashing Protection as default + --enable-maintainer-mode + enable make rules and dependencies not useful (and +@@ -18450,7 +18452,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 18436 "configure" ++#line 18455 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -18556,7 +18558,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 18542 "configure" ++#line 18561 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -25234,6 +25236,7 @@ $as_echo "#define HAVE_AS_SPARC5_VIS4 1" + + fi + ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for SPARC6 instructions" >&5 + $as_echo_n "checking assembler for SPARC6 instructions... " >&6; } + if test "${gcc_cv_as_sparc_sparc6+set}" = set; then : +@@ -25270,6 +25273,7 @@ $as_echo "#define HAVE_AS_SPARC6 1" >>co + + fi + ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for LEON instructions" >&5 + $as_echo_n "checking assembler for LEON instructions... " >&6; } + if test "${gcc_cv_as_sparc_leon+set}" = set; then : +@@ -28947,6 +28951,18 @@ $as_echo "#define HAVE_SOLARIS_CRTS 1" > + + fi + ++# Check whether --enable-libssp was given. ++if test "${enable_libssp+set}" = set; then : ++ enableval=$enable_libssp; case "${enableval}" in ++ yes|no) ++ ;; ++ *) ++ as_fn_error "unknown libssp setting $enableval" "$LINENO" 5 ++ ;; ++esac ++fi ++ ++ + # Test for stack protector support in target C library. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking __stack_chk_fail in target C library" >&5 + $as_echo_n "checking __stack_chk_fail in target C library... " >&6; } +@@ -28954,6 +28970,11 @@ if test "${gcc_cv_libc_provides_ssp+set} + $as_echo_n "(cached) " >&6 + else + gcc_cv_libc_provides_ssp=no ++ if test "x$enable_libssp" = "xno"; then ++ gcc_cv_libc_provides_ssp=yes ++ elif test "x$enable_libssp" = "xyes"; then ++ gcc_cv_libc_provides_ssp=no ++ else + case "$target" in + *-*-musl*) + # All versions of musl provide stack protector +@@ -29001,8 +29022,9 @@ else + fi + + ;; +- *) gcc_cv_libc_provides_ssp=no ;; ++ *) gcc_cv_libc_provides_ssp=no ;; + esac ++ fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_libc_provides_ssp" >&5 + $as_echo "$gcc_cv_libc_provides_ssp" >&6; } +@@ -29037,18 +29059,15 @@ fi + + + # Test for on the target. +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 +-$as_echo_n "checking sys/sdt.h in the target C library... " >&6; } +-have_sys_sdt_h=no ++#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H]) ++#AC_MSG_CHECKING(sys/sdt.h in the target C library) ++#have_sys_sdt_h=no + #if test -f $target_header_dir/sys/sdt.h; then + # have_sys_sdt_h=yes +-# +-#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h +-# ++# AC_DEFINE(HAVE_SYS_SDT_H, 1, ++# [Define if your target C library provides sys/sdt.h]) + #fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5 +-$as_echo "$have_sys_sdt_h" >&6; } ++#AC_MSG_RESULT($have_sys_sdt_h) + + # Check if TFmode long double should be used by default or not. + # Some glibc targets used DFmode long double, but with glibc 2.4 diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index 97365a21dc..b4e5539575 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -24,8 +24,10 @@ RUNTIMELIBITM_nios2 = "" RUNTIMELIBITM_microblaze = "" RUNTIMELIBITM_riscv32 = "" RUNTIMELIBITM_riscv64 = "" +RUNTIMELIBSSP ?= "" +RUNTIMELIBSSP_mingw ?= "libssp" -RUNTIMETARGET = "libssp libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ +RUNTIMETARGET = "libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \ " RUNTIMETARGET_append_x86 = " libmpx" From patchwork Fri Apr 20 16:33:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 133914 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp484459ljf; Fri, 20 Apr 2018 09:34:45 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+zZ6fvFXLse1e53dtyYMovULaF9tidp8hFHHvVOJwqneDGVhykuQIzZhV+LL3WijrZYMt6 X-Received: by 10.98.160.150 with SMTP id p22mr2569503pfl.9.1524242085852; Fri, 20 Apr 2018 09:34:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524242085; cv=none; d=google.com; s=arc-20160816; b=XbSXPMjNR8mGlKyf/2tuV9na55/8taEB4NAKydXvz/stmFWinK60xFLyUtqQcGi2re ZdY01Ap6TQKQsPdOxHPUXI52jUI0TCCKm3Yemb56huWwS2YPOpahrZMQI+3GMRujxoGN iFi9ecokvouxrIZH5y2IkiIOR/91LJYtc7gsubgsVwKUSsqdoJ6u1A2aS5BAQOk5bzBE OcSQAuFF+hhokPE22v0rGLTcyGpiV/McAPkRDGY2ryXiUM3/gKXPFcjklcg8RXFoetlM kl9iCFj5buFxDxeFCWjwsgQ92R6zzPoW+mPCieQW/trUsw/uHEIi1kHVyXMPP1KFS6xo kyRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=KdJ33HKZq95jx3hIDUcGldyj7shPdM0SHD54uvm7VxE=; b=kzsenrqDeSSRwWC8HM0dxw+Ewr4w5Q2pXZUPDKvH+aMHyD4W2IEcWURrylimn5Nvre gGkJIpcBPWtAk+De+XjpyMpou1V7d7sVDlxQ6VvRjSU4MmLPncKrxyw0ndZvugRxpLPA guqCj7LejsEpVKrUNNUa89AqSde431tFoS8e56RKDfwu2snVzj5/aPgMzrtEGTWNwXm4 i6vEXMZqJ5Z31XGZ4pl2G0ceyqJM2m5HMkVmN9aJleJF8EhiWlxZQ7Z2J4ku6NJF+TkL SM5OOf7auR6bek4Ok+l5KBuCpDD7r3miD6ZTMDOsTpnpY9qKQFQMf4Dca6ptmm8UBizK 1L+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tDt5O7mn; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f5si5185891pga.595.2018.04.20.09.34.45; Fri, 20 Apr 2018 09:34:45 -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=@gmail.com header.s=20161025 header.b=tDt5O7mn; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7CF1074688; Fri, 20 Apr 2018 16:34:35 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by mail.openembedded.org (Postfix) with ESMTP id 6C6A874682 for ; Fri, 20 Apr 2018 16:34:05 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id s13-v6so5541266plq.11 for ; Fri, 20 Apr 2018 09:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CZtc2UvIAoS7X2lX+SEe4ego1KtXKaCluSrIkmYNxZg=; b=tDt5O7mnBZUKEufgUG5JnXHAEQSEGMhsHE90XxETlIYEzq9flQ77VrjCu1uTSiQxv6 YTdi5YErIivZBVkF0zorj5NygCRML0Iw4i27xMi2/O3bCaXWXAO5YfmBefY4+6eNqEv1 hVPHcxZe9iCB2hmelpzJPeVI4ruChYVzGD4Eb32LPI7Dl+Zia9QDJ2VDklTxxFpskqFA MMrDHe6brM+4WGyGIuzkI99s/v6SiCfLDAimazh3RjcxEGld6yEZx0yiG0Wv6vHtdtED FPUl4/y7H5fmC+t/odkXWLVLqoo2G7ZE984vrWjCdEA99lGG10rczmKWvHBSsSLAdL6Q 1j/Q== 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; bh=CZtc2UvIAoS7X2lX+SEe4ego1KtXKaCluSrIkmYNxZg=; b=YDoZ4BIHDqusSeZRil92g1KJ28E2GL9c9yyJYWr0cwPCRVYI7BngPvraGpWMLVCw44 y8avd2M9/qvRW32l8zbQtccrsoSdic1arcGGSxVmeDrQ9S6sbR/t1yd/26Ve6j3Fy9kJ GSM2Txb+/N9QL3Bw5IMmctrbilv8HlpdiAcJyZmVPooCT4XAvhxMEpz+dKSos6fWOYq5 xmoVXcuH4gjg18mLrZz2SFgDEsfjX3sG16o/3cq7KaWGfJBkEm+jikk4Tut/3bk9Dl31 shQ8MME78NY0jzP4THKS/K+0ilq6RFm465b4s+oY5y06EB5zQUUwJv6NwHGvSFUBd0Cn cN1g== X-Gm-Message-State: ALQs6tAmWhR7n3DBy2EOzN1RbSC8sZTIhf9s/b5ACuWXNGbK+ZuRKuW2 HtVgcuOPZbRjpiO2a0zPc7R+0A== X-Received: by 2002:a17:902:b112:: with SMTP id q18-v6mr10967432plr.371.1524242047056; Fri, 20 Apr 2018 09:34:07 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c::487b]) by smtp.gmail.com with ESMTPSA id 204sm13450925pgf.61.2018.04.20.09.34.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Apr 2018 09:34:05 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Fri, 20 Apr 2018 09:33:52 -0700 Message-Id: <20180420163354.12065-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180420163354.12065-1-raj.khem@gmail.com> References: <20180420163354.12065-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH V2 4/6] libunwind: Drop adding libssp to linker flags 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This is no longer needed as gcc provided libssp is not built Signed-off-by: Khem Raj --- Changes since v1: - Rebased meta/recipes-support/libunwind/libunwind.inc | 2 -- 1 file changed, 2 deletions(-) -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc index b9c532d3ad..36851d07ed 100644 --- a/meta/recipes-support/libunwind/libunwind.inc +++ b/meta/recipes-support/libunwind/libunwind.inc @@ -14,8 +14,6 @@ PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, lat EXTRA_OECONF_arm = "--enable-debug-frame" EXTRA_OECONF_aarch64 = "--enable-debug-frame" -SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared -lssp" - do_install_append () { oe_multilib_header libunwind.h } From patchwork Fri Apr 20 16:33:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 133915 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp484579ljf; Fri, 20 Apr 2018 09:34:53 -0700 (PDT) X-Google-Smtp-Source: AIpwx48m42FPVAWNhjfph34nifRb7cfrTE2ga46SgxQ29N7GLwzFMFYRvXyVeFqXrNuyKS8dEKy1 X-Received: by 2002:a17:902:7d86:: with SMTP id a6-v6mr11171006plm.264.1524242093413; Fri, 20 Apr 2018 09:34:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524242093; cv=none; d=google.com; s=arc-20160816; b=OJ+CCvFitk3P5iIqs4RS223I98Y4pAftLHvd4m9dypmN0F7fC5zQsyD+5cv/dg+EL8 71HlA0nA3X7ysYgmQG2fvF4tGhh6nr1Tgyd2FBEiTnuNzm16LpwgAz7+pSkTLEe/5iYZ 6CT+YjEoEUyoPsWmsQcu6L80AajAkscP78WGmHKxCUVnX6QPQAEvapH3bQyz+taH8YfT fpyzY4TO+Ssze7eSNEN0mVq6P51/zkDl+ZjaRUg4yr9Mz2supTs0r4KFGwM2III5cfU7 g9K5r+QF2duOBUWb81YtvFJo5Ur7oiDe0JIquZxamLl+Lwwsm9GCoC0JA2EfFB2aIzKm Ivww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=VJ/ihcQLXzbzuXJJWAsz4ggSgHHg2c3bLbCeyO6QjUg=; b=q7TWgoLjxd0VzcThAFLv2pReE3jleATFJMTIK1XU+sab5fEZg+w01SprbZZv0PLdwa 4fHQUBjSZCmHWLvSfgJ6SbX6UoTrFHjdvgXFmPx9ovE9WmgvkVgNtQSX3Z/F1RKg61kX HKsi8gaQ2Yu0yRCR8r80ZI7JfSJICjwpc71bVjipGKN8v+84xcTz5L2Bgy9Ww6E34ie3 EVLcDbHF7m6/D974QpxTGCoF8y5IuCybeC1DxoCd1N+vifaeiJwluOYn9l/HQC4bkPtt ruzdZg5ncBkLTvQMEIuoKIyGlFgXTvw3nu+NXG1GzSgnTAAkhOZwcf9B9oBeupnTI/U+ ADcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lBWMKtJG; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s124si1841374pgc.4.2018.04.20.09.34.53; Fri, 20 Apr 2018 09:34:53 -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=@gmail.com header.s=20161025 header.b=lBWMKtJG; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0D030746E0; Fri, 20 Apr 2018 16:34:37 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by mail.openembedded.org (Postfix) with ESMTP id D53C97462B for ; Fri, 20 Apr 2018 16:34:07 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id c7-v6so5552085plr.5 for ; Fri, 20 Apr 2018 09:34:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vLj8WWdNmvYkcepcOXom+ffZpUw8WIQiUlDb+lAx2+o=; b=lBWMKtJGYp4YwBzJ9jYAQfvUoTvMgOMVSa528iDbtICVS1OKjXL+sUzGtW516cn7nc bidOxqy/9iUWwT6OgLTpGOxp+pTRm9eQLIl8sXrxXjvdZvAANDC6j7LR+ldmNd32cbSW 8+H+uG/Di8xGpJUrn2VT0a/NFGm6y5fjLejzw9hFATDuKEs+Yex0rBPQg6q0hvZaSdRp A8g0A3A/PEv28WB+wJG/piPN974TkCumtbihk1Tp1M2m7Pz6Y42M5loApKWK11JAiSf2 6JPcobyIQgyDggnkRak0U+ErVfi/cHpSQ2S/5dBZr70mjhul0tCGLVAnuw5hP0TT3l/c pL6g== 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; bh=vLj8WWdNmvYkcepcOXom+ffZpUw8WIQiUlDb+lAx2+o=; b=dSI9ltV7fnQXpVml36QE67am18eHKjiTi0g0g7DvCc/UliiSpp9Rzj4ehNdWI0+HD2 9qUPS9nzpdSkmwzkAyk9ZJj7C3A1gy9jr0LIeG92Lu/LB04b2p+cz+XqGbxVTH9I0qvv 4Arw3wy2VaZqNrOmfa0nq1u/Pi8R2pi64fAkbgY6yTqWyZmcOCQcT1Zc6Kz7APp+fTzp eDGL/P4rEQQakgdYZFUaccki/OozZDtXw6wm4OiOTe6DGUgDkqf+zFRhF/OJZ5ZiG3d7 YQRFhM2GrP4hs4g5+3+F73yWdaS50HV++lLYN5tQBhjPXF+Ctymv2PBX/fwwAd/JPOc/ 5xvw== X-Gm-Message-State: ALQs6tCbVVETdUfGiL0rYCTNf3Vh1KHHk0IvgzkmweL8ca7oYtgngEXy MK5m8kE+PqSgm0ZYoqVUYfLCQw== X-Received: by 2002:a17:902:3181:: with SMTP id x1-v6mr10957497plb.198.1524242048633; Fri, 20 Apr 2018 09:34:08 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c::487b]) by smtp.gmail.com with ESMTPSA id 204sm13450925pgf.61.2018.04.20.09.34.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Apr 2018 09:34:07 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Fri, 20 Apr 2018 09:33:53 -0700 Message-Id: <20180420163354.12065-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180420163354.12065-1-raj.khem@gmail.com> References: <20180420163354.12065-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH V3 5/6] musl: Upgrade to latest 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Changes are here https://git.musl-libc.org/cgit/musl/log/?qt=range&q=55df09bfccbfe21fc9dd7d8f94550c0ff25ace04..618b18c78e33acfe54a4434e91aa57b8e171df89 Signed-off-by: Khem Raj --- Changes since v2: - Rebased meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index a57460ddd2..01fec69aeb 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -3,7 +3,7 @@ require musl.inc -SRCREV = "55df09bfccbfe21fc9dd7d8f94550c0ff25ace04" +SRCREV = "618b18c78e33acfe54a4434e91aa57b8e171df89" PV = "1.1.19+git${SRCPV}" From patchwork Fri Apr 20 16:33:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 133916 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp484688ljf; Fri, 20 Apr 2018 09:35:00 -0700 (PDT) X-Google-Smtp-Source: AIpwx49EcsNhKrXSw98ze+a93Uicn+DRgJBqENMYtqjKYDbpgrm0eVIrTg2/EXqsqg1R3HBCX63b X-Received: by 10.99.136.73 with SMTP id l70mr9316282pgd.49.1524242100565; Fri, 20 Apr 2018 09:35:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524242100; cv=none; d=google.com; s=arc-20160816; b=CEmOkWl+uQOHtgXTZbg7Slh7SdhrLvKyAur8ZLqHyg2UlXUUkR/xsCTFn81tjWBaqX adutjYS0j9i6bLRl5mK8GK0LlJV0lcMBKcI/KcdTOECNWnmzt5RwKA4Wvk8soOxTQ4rH FrdsXyJAnaGKL+swmYj8MBBDjyoftzL2YT3fW32EBRXUP9wT4P8petnNi2aHuxZvKrkk esmTtl9dW9+aJgo283mvstKgYB1LHi8GHqrdbqjQxpXET2lQvnU5Iot0Bzq38f49ifau KJDYPBGYY7ctkYoXkCX4FNyxnDQJqA3VnHMtQ1rZ/zMzh8kudZvBwxFTx1j3r8TyuMsh 4xOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=+nYDSbcoTMUIqvTSO26UW9Rfi2S/cDFkwGV6CZlSbfA=; b=M58jy19SGIGvfsFC67GGU67WoR3h1j1sTcJgDwzGWKr4maDGbsvW/YdULWLkpfPMpR YpdtSZtzH0LVad8ON1etjvKLt6KkozWbgW4Ae0dmmB9rZYZTDIHIJi3jGPUZz4kh2r/9 XA8Us2wFPaqZrC61f64/+cE+e773hswZ5H5mjYjo5bD9D1n8gOBG20x8pDA6VuPBhsgg 3UgJ1Yrx0q51AY5oIAj1QR1rEwhUfWTXzUOXvbDpGZTpg15N5yr0CNFrkB51SMurs7eD xFevcQo4YQxmuPzGzfZgS9P1pgrj6YLvCmj+fT1SJQMULkJyUc0qzr+muIPO9b7SiS2K emfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EvmdNSR6; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 34-v6si5969272plb.230.2018.04.20.09.35.00; Fri, 20 Apr 2018 09:35:00 -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=@gmail.com header.s=20161025 header.b=EvmdNSR6; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 199CB746E5; Fri, 20 Apr 2018 16:34:38 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id D2B5A7462B for ; Fri, 20 Apr 2018 16:34:09 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id i6so4259922pgv.3 for ; Fri, 20 Apr 2018 09:34:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9Q5qhMGoW1glKbasLq1AhUr73a+7/7c5aoXIH36hzKA=; b=EvmdNSR6ULNIsZYuJrBM8Tb4IlXihEvfIGYWYTVhPFh3oKIT96CKFT2D4dQRb+4qFQ 2To9wi39z8uxClTWF+Evx4N9NbJprib5Eogz0C931I48sPO5jxfAuafRgOcqDAAn674i qGBiKrtzXCP6cTDAM6uAVlnmqYzXR0GfUn5fA9uq16lq+5zVV9Zdzs9RDOXWyS+ZEqeV yujg7reXMENo5ji2U2Gfct8xQwo/gUWvCo8Abk63fKLd68gyMiAwv+FEaHYt9g3nHTyu ruJVfc26RYqMtLTJChQWtEMdLH2BLSbZCcUGI25U2bRTcSuLZOkckK0aXRGD7SfM48r1 du3A== 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; bh=9Q5qhMGoW1glKbasLq1AhUr73a+7/7c5aoXIH36hzKA=; b=RE+Wf17DgPZMjMsc5NJK/FezO80wBBD9sI/gx2KNVu3oEi1TgOjTkZ1ivDG0eWDZPC jOFc6uHOAgKISDu/qn7NJu3C5W1jXE6QTe6ZWUMSjxgztpaJX3eG02q78XSAD09yDJdw uy3FmHoeLNGAaS7ysKAbRQDHuqKghjatt8cxCUo3B3hxyIY5976ldvtJol8FYoh2RWGd QW8SLKEnIXdY6ob07akUkxTPtak0fI3sUkNuYkYNntpHwYXVIvExGBFq8/ap/Kx9Ey3+ LNttgcsA12QcskDDhQFqXudtMk2u1b5cbyEv3+h9M8CRGEc97Fj5sqRSMUFWRSEt7B23 /ImA== X-Gm-Message-State: ALQs6tBa5StQRbhoMia+yqp579jUV8mH5SY2fes5kaKF9MdiLNisJFHQ HpEjh3sFgZMgOHa3jdEMuMaFgQ== X-Received: by 10.167.132.207 with SMTP id x15mr804278pfn.46.1524242050629; Fri, 20 Apr 2018 09:34:10 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c::487b]) by smtp.gmail.com with ESMTPSA id 204sm13450925pgf.61.2018.04.20.09.34.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Apr 2018 09:34:08 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Fri, 20 Apr 2018 09:33:54 -0700 Message-Id: <20180420163354.12065-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180420163354.12065-1-raj.khem@gmail.com> References: <20180420163354.12065-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 6/6] llvm: Fix [compile-host-path] QA issue 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Its trying to build NATIVE llvm-config which is already built with llvm-native so we do not need to rebuild it Drop setting NINJA_STATUS explicitly, its no longer needed, on the contrary it hinders the task status update Signed-off-by: Khem Raj --- Changes since v1: - Rebased ...able-generating-a-native-llvm-config.patch | 41 +++++++++++++++++++ meta/recipes-devtools/llvm/llvm_git.bb | 7 ++-- 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch b/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch new file mode 100644 index 0000000000..2809e4c594 --- /dev/null +++ b/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch @@ -0,0 +1,41 @@ +From 7f7743ce233fcd735ec580c75270413493658aa6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 19 Apr 2018 18:08:31 -0700 +Subject: [PATCH] Disable generating a native llvm-config + +OpenEmbedded already builds this as part of llvm-native + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj +--- + tools/llvm-config/CMakeLists.txt | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt +index 25f99cec978..c45e9b642a8 100644 +--- a/tools/llvm-config/CMakeLists.txt ++++ b/tools/llvm-config/CMakeLists.txt +@@ -63,19 +63,3 @@ endif() + + # Add the dependency on the generation step. + add_file_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/llvm-config.cpp ${BUILDVARIABLES_OBJPATH}) +- +-if(CMAKE_CROSSCOMPILING) +- set(${project}_LLVM_CONFIG_EXE "${LLVM_NATIVE_BUILD}/bin/llvm-config") +- set(${project}_LLVM_CONFIG_EXE ${${project}_LLVM_CONFIG_EXE} PARENT_SCOPE) +- +- add_custom_command(OUTPUT "${${project}_LLVM_CONFIG_EXE}" +- COMMAND ${CMAKE_COMMAND} --build . --target llvm-config --config $ +- DEPENDS ${LLVM_NATIVE_BUILD}/CMakeCache.txt +- WORKING_DIRECTORY ${LLVM_NATIVE_BUILD} +- COMMENT "Building native llvm-config..." +- USES_TERMINAL) +- add_custom_target(${project}NativeLLVMConfig DEPENDS ${${project}_LLVM_CONFIG_EXE}) +- add_dependencies(${project}NativeLLVMConfig CONFIGURE_LLVM_NATIVE) +- +- add_dependencies(llvm-config ${project}NativeLLVMConfig) +-endif(CMAKE_CROSSCOMPILING) +-- +2.17.0 + diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 77c095d9a3..cb3bba6fab 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -26,6 +26,7 @@ PATCH_VERSION = "0" SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};protocol=http \ file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \ file://0002-llvm-allow-env-override-of-exe-path.patch \ + file://0001-Disable-generating-a-native-llvm-config.patch \ " UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" @@ -85,15 +86,15 @@ do_configure_prepend() { } do_compile() { - NINJA_STATUS="[%p] " ninja -v ${PARALLEL_MAKE} + ninja -v ${PARALLEL_MAKE} } do_compile_class-native() { - NINJA_STATUS="[%p] " ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen + ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen } do_install() { - NINJA_STATUS="[%p] " DESTDIR=${LLVM_INSTALL_DIR} ninja -v install + DESTDIR=${LLVM_INSTALL_DIR} ninja -v install install -D -m 0755 ${B}/bin/llvm-config ${D}${libdir}/${LLVM_DIR}/llvm-config install -d ${D}${bindir}/${LLVM_DIR}