From patchwork Sun Mar 11 00:43:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 131328 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2624069lja; Sat, 10 Mar 2018 16:46:00 -0800 (PST) X-Google-Smtp-Source: AG47ELstNWDbA3aCLrLRqkr/u/5ypPddmSJZfochHfXxPbPCEWl7hbNipToHhnzJoNksLr7WtPVm X-Received: by 10.167.130.88 with SMTP id e24mr3385981pfn.66.1520729160640; Sat, 10 Mar 2018 16:46:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520729160; cv=none; d=google.com; s=arc-20160816; b=Bbq3rqAJKYQfUaTcwbECV7KWY9pEjJqmgt87zCUZhpBMpclgoIsOoiIWdm66n5MJjd /Ak5mdyCUF4xDuI0Up4E9zn4TpexhljOZI84LP91cfKiYLKEulh+3YGryk/OOym2jdRT sTR83BEedfmyKIVtdxujszxpstpqYcySizkIT7oA1ExvlVS7s4zbFeUhhRrrDInzZ2kL Md7h5SQYkjOZwf6LK77crlGQlIcljAcQXAndDJULK9+dbRgij0/bJG3A6/VP/vTkZry4 NtaPNOYRY+KNzbm1SWyKMRRLNucB//GsRJ1XdrZosSglbYK4v78EA383dSND0e306jdg Mspw== 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=mRFFya8u032peBl2quQEg2dk4pNiMPYHO+IuH8ktPFQ=; b=Xa+k1CbYgyghEypz7iro44MxaiV8aCtaY6GmxtLAt1eOXidXm7DrIzLamH0HiZzSad q36+8BmPGJlrZ/lDoXZXVy3PgAtIVRTTf27Oa/h46KeXZCE8dQx8DhbqmYe6OmXDscuK cOp1Jpf40kCgCp2HsYtzhkj6+cd7BxsUutlamsg2Bva0GGMoC1m+w84FdOspz2mtz8nH hNi7PUPTuyjvSRM5WInO1OFNSevHlp6zrvdAShHbGFf4EVftwd3sVAEcGyxWHjQc7gnk 8W0vEDxbGj8SVBw6TEULWZdvXHBl39usIiVUfIYat3lpQQQYycovvOjA2SbAeQKpZfKd vFqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lAbMcn8r; 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 d13si3010991pgu.554.2018.03.10.16.46.00; Sat, 10 Mar 2018 16:46:00 -0800 (PST) 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=lAbMcn8r; 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 C6C1E7898F; Sun, 11 Mar 2018 00:43:22 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by mail.openembedded.org (Postfix) with ESMTP id 9B98B78989 for ; Sun, 11 Mar 2018 00:43:19 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id x7so9953841wmc.0 for ; Sat, 10 Mar 2018 16:43:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=TnA3EsYION8CNGv/mPE/tHjVxo66HzlVZgE9yVFQWRg=; b=lAbMcn8re+HdwCcwycyS41dLrz+BAahnSyMODCSvGj7Sw5ZVUR6lxoluzwFqN9lUlZ yapJe1jQpJEZkfCEF1YgBFqfoDNaDquQ6k8YCQUN46GXX3PEbUBw5H4FS1iDm3gDbr5H BBfsdafWFDGvaEarZrpEuz789CDxxbrCdPsIo9gLxWQcAMgSSR+EDuRx3O1yqsYXigfd 1kNNqxitJgjJLloXvFAmRg2+vWoDzchETlm+eSDwGXSRTxvL7hZVZLzy5GbahRvJCb6s vlVXGIuQE2HJ/U5xxOH57JwGJHc6F9TWshKXgZpKQUS7y2mIfGuT6QqStjljbALIiXpf KSKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=TnA3EsYION8CNGv/mPE/tHjVxo66HzlVZgE9yVFQWRg=; b=U/pvpRzOy6V8jj7hWT4Pksp2/ZvO7YP/l96JUGOWQ35kURQa5fINzK/W0o16ZXuiUG CpTbB8WeuVOcDYOeWheQidmWoaBBBpkcuEiAYGjaMRHzrmz9z3dTo8qXwtNrQutTkKPP wH0xyySAwWTAuT1Wj4uj6swYrxxW3Rd0Sy4fPpTisBalI3rnHlqQhj7DBei1cCvCx6zl sJSeHVgZCOQm1pMWieOs3iR531sylUFY0ZTDArQMYinOwzcuQxaj+Dqby1wpZVqSJCuN /sValcgL0ZJ/GErBGZ0nhV75g7m/s+XzMvgsxPin0pwFgGDXV7ZypG29Sg7j0wi2idSf kVww== X-Gm-Message-State: AElRT7G1SwXJwa4f3gpCtzLpWvhy4wTt23TrTrUqRBbl3wy9CMt6kNxx FoBcDf8d1x5Q9npV0CdPyzj5bw== X-Received: by 10.28.174.11 with SMTP id x11mr2123247wme.124.1520729000810; Sat, 10 Mar 2018 16:43:20 -0800 (PST) Received: from localhost ([217.30.68.212]) by smtp.gmail.com with ESMTPSA id u22sm4957951wrf.86.2018.03.10.16.43.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 10 Mar 2018 16:43:19 -0800 (PST) From: Martin Jansa X-Google-Original-From: Martin Jansa To: Armin Kuster , openembedded-core@lists.openembedded.org Date: Sun, 11 Mar 2018 00:43:11 +0000 Message-Id: <26e2a47a4a68823db22304ae9b79c735bdd0a052.1520728804.git.Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: References: Subject: [OE-core] [rocko][PATCH 2/8] gcc-runtime: Disable libitm on riscv 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 From: Khem Raj Cherry-picked from oe-core master 21caa8bcda93ce67ef58548f7b85d0569d13d0b9 Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Martin Jansa --- meta/recipes-devtools/gcc/gcc-runtime.inc | 2 ++ 1 file changed, 2 insertions(+) -- 2.15.1 -- _______________________________________________ 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-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index ee08529a5f..d3d4bd36a8 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -20,6 +20,8 @@ RUNTIMELIBITM = "libitm" RUNTIMELIBITM_mipsarch = "" RUNTIMELIBITM_nios2 = "" RUNTIMELIBITM_microblaze = "" +RUNTIMELIBITM_riscv32 = "" +RUNTIMELIBITM_riscv64 = "" RUNTIMETARGET = "libssp libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \ From patchwork Sun Mar 11 00:43:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 131329 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2624110lja; Sat, 10 Mar 2018 16:46:05 -0800 (PST) X-Google-Smtp-Source: AG47ELsk97zdu23lgcM8DgYATYzskAgogbhynL3ayXYc/YlqDp0QTMj/30FkR1zd6VrrDhnJwdKF X-Received: by 2002:a17:902:a713:: with SMTP id w19-v6mr3391277plq.246.1520729165605; Sat, 10 Mar 2018 16:46:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520729165; cv=none; d=google.com; s=arc-20160816; b=a0cqRmpdIOayY01C/9EkanASmxcO8FMk7PgqtJcRoSJ+HAKV+d3Y542kNZaZZ+owXP sdOFQWlz8di5sAZCCrw09a1g7Xd4879k0Xamvx4GvamguEjAEeOpXtaAWg62E7mh/9ia 2ADww6bn1o/J2XqjycWUvOGaUVz5AII5xgHuCC3KWjggbJKY+PqssWc94uL2brkne/AS IC1LLlM5pXg++iiYFYb6QhjeiSdob+wBYKZJbj74xkqYUbn7ygT+/PKaF4Xw1VPZKBvk 4P4FWgdclSRGkmcaCS+37iWMwssLKDMR0wLkS0pAU18GFq01JLbjm+83Rhqoh6jotUQm rUDw== 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=04jZHgiI1ew1taANJ0R+ueOCE6BR+RXnF0V/dZ6Irz8=; b=U2FHLQc4PSAceSszYFxW6cTYccjrYn6sSAweylIYL1+DxL/AeWh5zRxHiWgQbmJD9v S019iz57Yhh/WVFG5UY/TK6RKGsh8USh4hlY8KGyj1Ht84LnpEsqe5QEfXbYgNswSY5l qf9TDgpNw0/0ksu3iE92Ua5HpaeedVHwccA2xh+jw4mvgB1WRofuTxSuYP0PX1sGXcil mc/Dvam7zhVJ6jEhItPnr0RXiptX3sdII73KSPn2L8+FQ7qnbbOY4phgR8M1rt5w9toi b4WdOmpog6ZuViEgd0+qBBPfdZZGag6qEzCmAOycdNAe1+0UhQ5kfK60381waGNfmfeC p+vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=dcrdNqFG; 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 d2-v6si3582540plr.67.2018.03.10.16.46.05; Sat, 10 Mar 2018 16:46:05 -0800 (PST) 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=dcrdNqFG; 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 D11F578994; Sun, 11 Mar 2018 00:43:24 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by mail.openembedded.org (Postfix) with ESMTP id B734878978 for ; Sun, 11 Mar 2018 00:43:20 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id t3so10104915wmc.2 for ; Sat, 10 Mar 2018 16:43:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=ZXIIR1/HiZ/rmviSOoezPM9w6tPQ06+1j9PB4rXnacE=; b=dcrdNqFG8piedzEJGY/7R64MoDKH0bIJmc5DFTpUXmRSeE2EZHhX4z6tCJ6qrClXoH +68EhblxJNtutUF6waR74IMXDkasUQflxOjT4FuB0BDbVH1eO4fLm2UTf6/TmebipXf0 PXflPc0Jel3/WU6tHbhEYYqhEHk0wwM4Dy8ANwKQ9eGVaJLYaeWtp6ajBVuS72T2dNVp o+DvlU5UjVihj6dXjabGix+agt69ovo7Zq7Q6TIrHx5ZRdvcDsUfvQXAf6obAaQbneHs bD668UA3rPfG8GiYzO9+Zb2ieaRhVK8Z2Z2UOgRmbiEupvRK+vrrI6khZ8nf3GGRQgEr Uzow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ZXIIR1/HiZ/rmviSOoezPM9w6tPQ06+1j9PB4rXnacE=; b=QiCFrO9F2Tz29YSjjk4vxjfEgTv8W7hC/dE7ejecvbzoVg/48d2d6UZZrlB5WVobXy Xy/TdxH3JZLxRjLOzR86GZRd02I2Ypw9HiajQE2KPXtIxtY6hBK2c3Esro55hybkLwu2 3ildCL8rXKFD+N63+eGlzWhNMrxUIiLfwaMxkiw2RSzOaz0UZEVoHQc+s9r2afC1RAQF FQOq1b4KRussbEX9zxbkNSAf4OiqFvZKMMWPXmFYz8YXWK/sG1Yn1RyxDTjxW8UmnaSr 4BjXcXA41zQ0CUEsy9Zf36PtVd9lTP6v2frzD1XRkU5lL6HuPhSIW65+10PN49ayIoUP gxUQ== X-Gm-Message-State: AElRT7FgziEbdajguuJDO3yTwRhEVBQC0H2V88XW5W/lmTLKI+YyXdXN lzk38FwvocCaRwfGoe9YWevy7Q== X-Received: by 10.28.23.143 with SMTP id 137mr2228688wmx.153.1520729001990; Sat, 10 Mar 2018 16:43:21 -0800 (PST) Received: from localhost ([217.30.68.212]) by smtp.gmail.com with ESMTPSA id w17sm6337810wrb.12.2018.03.10.16.43.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 10 Mar 2018 16:43:21 -0800 (PST) From: Martin Jansa X-Google-Original-From: Martin Jansa To: Armin Kuster , openembedded-core@lists.openembedded.org Date: Sun, 11 Mar 2018 00:43:12 +0000 Message-Id: <63490f854799973943a05143f5140e40548946c3.1520728804.git.Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: References: Subject: [OE-core] [rocko][PATCH 3/8] gcc: Link libssp_nonshared.a only on musl targets 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 From: Khem Raj glibc already provides the content for libssp_nonshared in libc_nonshared.a therefore we dont need to make it universal. This also fixed build issues on glibc when linking statically and using -fstack-protector Fixed errors like /mnt/a/oe/build/tmp/work/i586-bec-linux/aufs-util/3.14+gitAUTOINC+bdfcc0dcfc-r0/recipe-sysroot/usr/lib/../lib/libc.a(stack_chk_fail.o): In function `__stack_chk_fail': /usr/src/debug/glibc/2.26-r0/git/debug/stack_chk_fail.c:27: multiple definition of `__stack_chk_fail_local' /mnt/a/oe/build/tmp/work/i586-bec-linux/aufs-util/3.14+gitAUTOINC+bdfcc0dcfc-r0/recipe-sysroot/usr/lib/../lib/libssp_nonshared.a(libssp_nonshared_la-ssp-local.o):/usr/src/debug/gcc-runtime/7.1.0-r0/gcc-7.1.0/build.i586-bec-linux.i586-bec-linux/i586-bec-linux/libssp/../../../../../../../../work-shared/gcc-7.1.0-r0/gcc-7.1.0/libssp/ssp-local.c:47: first defined here collect2: error: ld returned 1 exit st atus Cherry-picked from oe-core master d71eba26850838b2878efea3f8c392a2eb2ebbfb Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- meta/recipes-devtools/gcc/gcc-6.3.inc | 2 +- ...shared-to-link-commandline-for-musl-targe.patch | 42 ++++++++++++++++++++++ .../gcc/gcc-6.3/0041-ssp_nonshared.patch | 28 --------------- 3 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-6.3/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch delete mode 100644 meta/recipes-devtools/gcc/gcc-6.3/0041-ssp_nonshared.patch -- 2.15.1 -- _______________________________________________ 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-6.3.inc b/meta/recipes-devtools/gcc/gcc-6.3.inc index e569e0220b..2f29fbf635 100644 --- a/meta/recipes-devtools/gcc/gcc-6.3.inc +++ b/meta/recipes-devtools/gcc/gcc-6.3.inc @@ -65,7 +65,7 @@ SRC_URI = "\ file://0038-Search-target-sysroot-gcc-version-specific-dirs-with.patch \ file://0039-Fix-various-_FOR_BUILD-and-related-variables.patch \ file://0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch \ - file://0041-ssp_nonshared.patch \ + file://0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \ file://0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch \ file://0043-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch \ file://0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch \ diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc-6.3/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch new file mode 100644 index 0000000000..310f7aacba --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-6.3/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch @@ -0,0 +1,42 @@ +From 75a42d6d0f1f9784327f74882195a5c24843d5a8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 27 Jun 2017 18:10:54 -0700 +Subject: [PATCH 40/49] Add ssp_nonshared to link commandline for musl targets + +when -fstack-protector options are enabled we need to +link with ssp_shared on musl since it does not provide +the __stack_chk_fail_local() so essentially it provides +libssp but not libssp_nonshared something like +TARGET_LIBC_PROVIDES_SSP_BUT_NOT_SSP_NONSHARED + where-as for glibc the needed symbols +are already present in libc_nonshared library therefore +we do not need any library helper on glibc based systems +but musl needs the libssp_noshared from gcc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + gcc/config/linux.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/gcc/config/linux.h b/gcc/config/linux.h +index 2e683d0c430..5ff0a2cb2ff 100644 +--- a/gcc/config/linux.h ++++ b/gcc/config/linux.h +@@ -182,6 +182,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ + { 0, 0, 0, 0, 0, 0 } \ + } ++#ifdef TARGET_LIBC_PROVIDES_SSP ++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ ++ "|fstack-protector-strong|fstack-protector-explicit" \ ++ ":-lssp_nonshared}" ++#endif ++ + #endif + + #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ +-- +2.13.2 + diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0041-ssp_nonshared.patch b/meta/recipes-devtools/gcc/gcc-6.3/0041-ssp_nonshared.patch deleted file mode 100644 index 0744529741..0000000000 --- a/meta/recipes-devtools/gcc/gcc-6.3/0041-ssp_nonshared.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 551a5db7acb56e085a101f1c222d51b2c1b039a4 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy -Date: Sat, 7 Nov 2015 14:58:40 +0000 -Subject: [PATCH 41/46] ssp_nonshared - ---- -Upstream-Status: Inappropriate [OE Configuration] - - gcc/gcc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 2812819..9de96ee 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -863,7 +863,8 @@ proper position among the other output files. */ - #ifndef LINK_SSP_SPEC - #ifdef TARGET_LIBC_PROVIDES_SSP - #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -- "|fstack-protector-strong|fstack-protector-explicit:}" -+ "|fstack-protector-strong|fstack-protector-explicit" \ -+ ":-lssp_nonshared}" - #else - #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ - "|fstack-protector-strong|fstack-protector-explicit" \ --- -2.8.2 - From patchwork Sun Mar 11 00:43:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 131330 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2624158lja; Sat, 10 Mar 2018 16:46:11 -0800 (PST) X-Google-Smtp-Source: AG47ELsTT3DRCDJedhtJpyQDkzKlRsylJuq1hZwnuh5UZTWAjI8z49MypoYPBNsA0/70a2K+Pj3a X-Received: by 10.99.157.142 with SMTP id i136mr2877524pgd.14.1520729171128; Sat, 10 Mar 2018 16:46:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520729171; cv=none; d=google.com; s=arc-20160816; b=QzKZg7/koAlfyAWZ5HOcpNVQnRCWnZsNYvdKkA6uJ7xp/ncBachcM7sysB4Ie7c57u QDMCPjLMVp0GSKy4quKPoP6p6kh+CuvJuLhxt4o5eoV6+Ah5PQsDn72LB7Uj/9445Pvw sJERFQQmWVaeIGi8a1iQ2gRT6SH8WsoWupg8wxOODwlLLUPoatmYGAMbk8KCqTCs6RnY +eX00Sjm/k5K2KqnFar7MRxQzlLbbJ95453VJXBKhhAm1Mu2UCx6/GkaC5Ap9t+rdXkL AWsSEwuIIT486Tg3Y0W6xIvFN8bMl2b2xMLJ1wY/R/lAwO+tvMnVc2xRNwy7K+NnyVlE lfww== 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=Zsbbb2l+nNL9uvXDtRTGaxDoWDyvOk5f77ukKT+YXoQ=; b=Ocee0UN7DJ5VNEFCaWOm/GO0RDxwSp3N+n7Nz1g48X/2R/wbPqtXUsV1iONsUhC43C uv2loP4uZjlk1LrB2l25OaQqPonpAr2BRwr290e+46w2E3mj9tc1ky2DNDIkFujJZ89q vCCvEGQvZVR3PUjGVLJdI/L02LvhsSxeZLNcXF2eALQG7gIhTzR7ottsySBZjToIzK2F /wmqv7wwYNhp6zs+fok+O6AdJka28tYIfSEvP7oHBeJ1UE5UsL76GJ/HIPtU/CPS7viv Ubstenm2qVoOLWs6vRSjUTD2ugvbKUBkbE/NbPYCphClds4mt4K6Gjnyqz1EO79nr8fq 6BjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bY7RCRvv; 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 c11-v6si3448502pls.723.2018.03.10.16.46.10; Sat, 10 Mar 2018 16:46:11 -0800 (PST) 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=bY7RCRvv; 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 EBB8478986; Sun, 11 Mar 2018 00:43:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by mail.openembedded.org (Postfix) with ESMTP id 17B6478989 for ; Sun, 11 Mar 2018 00:43:22 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id r66so4711913wrb.6 for ; Sat, 10 Mar 2018 16:43:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=H1hYZ+f9bWqN2yxiSUbhXgKM48fI15FL5ieBxRF7sdc=; b=bY7RCRvvUDg8NIFuGvazPQKwUdzrxzN2rppRDCiMwOPCX/F9KgPRK5iBhj2Keit5lP VLN1fPwtwvxH9UegyxTcpzFmR0+zik480QPJrYRd1/MgZpZcqudDoKABvv+23JzWw+ke Y/nHsiUOeGrP6lMB7I2GOy0woN3pSU3ACfzengrjgNBQ20vgrCY4n1gIT5Zn7cbaY2hk gMi5+Wk5c2oOWZ6pEKycZGfq0qRYpmTQxU1JgfkJ0K3Yj5bUYkoubGPgS9kihUTUCfd4 NHcVI48eFh0CxTYQ7OKzuHL4kPR57L8K/lEtvBcL1zdgJdpaO3zV91QVC8T/foMsybXH ORdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=H1hYZ+f9bWqN2yxiSUbhXgKM48fI15FL5ieBxRF7sdc=; b=Nn9ewEZBAImglFRTjTN3dGavGBWWnBNA/20FGa5PiRYK/vqM+bY+CAmikI9uidDgMt atsDbNOMF/UK55HW8EIkoADNXmlOrh70ivrTOj3FNwifW4GqRZiiWKUAAN+O0sWVnvUL qmZfDmoVNorRySt/dQEy904fF/do49ZAqnA39UbwWtPGooydiF+9j+b6wTnxwYH3qo8K t58x4zfuITQL72582UQVv0/+aSna9RcGJf4jm+Wqbp8lt3r5ufOLgCgI9HW/qQjeWqbg mxK5Yzdn4tqEeZBr0fNzm27ZZCQTiuLmrcXKRncIIBmtHwDS1gLXfhmVhbu4eVk7NMdr COqg== X-Gm-Message-State: AElRT7Hp2QolB57nToIbVhW2Q/Xy0Fj9kvmtJMm9un0YuWaHw9pE6RfT HiZ53/t+EaPd1UrUKjh7yUxdFg== X-Received: by 10.223.191.6 with SMTP id p6mr2413463wrh.247.1520729003301; Sat, 10 Mar 2018 16:43:23 -0800 (PST) Received: from localhost ([217.30.68.212]) by smtp.gmail.com with ESMTPSA id i49sm5004423wra.44.2018.03.10.16.43.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 10 Mar 2018 16:43:22 -0800 (PST) From: Martin Jansa X-Google-Original-From: Martin Jansa To: Armin Kuster , openembedded-core@lists.openembedded.org Date: Sun, 11 Mar 2018 00:43:13 +0000 Message-Id: X-Mailer: git-send-email 2.15.1 In-Reply-To: References: Subject: [OE-core] [rocko][PATCH 4/8] gcc: Fix libssh_nonshared linker specs for ppc/musl 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 From: Khem Raj The change to link libssp_nonshared.a only for musl was to move spec file changes to config/linux.h under a conditional when DEFAULT_LIBC == LIBC_MUSL which worked fine for all but ppc since gcc for ppc provided its own linux.h overrides which are used. This patch duplicates the change in those headers too Cherry-picked from oe-core master 9d39168a6acfa1f289a4448271c0bf9caaea10ec Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Martin Jansa --- ...shared-to-link-commandline-for-musl-targe.patch | 55 ++++++++++++++++++++-- 1 file changed, 50 insertions(+), 5 deletions(-) -- 2.15.1 -- _______________________________________________ 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-6.3/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc-6.3/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch index 310f7aacba..29b7ce72d2 100644 --- a/meta/recipes-devtools/gcc/gcc-6.3/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch +++ b/meta/recipes-devtools/gcc/gcc-6.3/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch @@ -1,4 +1,4 @@ -From 75a42d6d0f1f9784327f74882195a5c24843d5a8 Mon Sep 17 00:00:00 2001 +From 210f6b3b82084cc756e02b8bc12f909a43b14ee8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 27 Jun 2017 18:10:54 -0700 Subject: [PATCH 40/49] Add ssp_nonshared to link commandline for musl targets @@ -17,18 +17,21 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gcc/config/linux.h | 6 ++++++ - 1 file changed, 6 insertions(+) + gcc/config/linux.h | 7 +++++++ + gcc/config/rs6000/linux.h | 10 ++++++++++ + gcc/config/rs6000/linux64.h | 10 ++++++++++ + 3 files changed, 27 insertions(+) diff --git a/gcc/config/linux.h b/gcc/config/linux.h -index 2e683d0c430..5ff0a2cb2ff 100644 +index 2e683d0c430..1b4df798671 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h -@@ -182,6 +182,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -182,6 +182,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ { 0, 0, 0, 0, 0, 0 } \ } +#ifdef TARGET_LIBC_PROVIDES_SSP ++#undef LINK_SSP_SPEC +#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ + "|fstack-protector-strong|fstack-protector-explicit" \ + ":-lssp_nonshared}" @@ -37,6 +40,48 @@ index 2e683d0c430..5ff0a2cb2ff 100644 #endif #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ +diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h +index 684afd6c190..22cfa391b89 100644 +--- a/gcc/config/rs6000/linux.h ++++ b/gcc/config/rs6000/linux.h +@@ -91,6 +91,16 @@ + " -m elf32ppclinux") + #endif + ++/* link libssp_nonshared.a with musl */ ++#if DEFAULT_LIBC == LIBC_MUSL ++#ifdef TARGET_LIBC_PROVIDES_SSP ++#undef LINK_SSP_SPEC ++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ ++ "|fstack-protector-strong|fstack-protector-explicit" \ ++ ":-lssp_nonshared}" ++#endif ++#endif ++ + #undef LINK_OS_LINUX_SPEC + #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h +index 3b00ec0fcf0..8371f8d7b6b 100644 +--- a/gcc/config/rs6000/linux64.h ++++ b/gcc/config/rs6000/linux64.h +@@ -465,6 +465,16 @@ extern int dot_symbols; + " -m elf64ppc") + #endif + ++/* link libssp_nonshared.a with musl */ ++#if DEFAULT_LIBC == LIBC_MUSL ++#ifdef TARGET_LIBC_PROVIDES_SSP ++#undef LINK_SSP_SPEC ++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ ++ "|fstack-protector-strong|fstack-protector-explicit" \ ++ ":-lssp_nonshared}" ++#endif ++#endif ++ + #define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}} \ -- 2.13.2 From patchwork Sun Mar 11 00:43:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 131331 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2624209lja; Sat, 10 Mar 2018 16:46:17 -0800 (PST) X-Google-Smtp-Source: AG47ELutgs1Symj5eBNudQ+/jd+yRDLwJlUsMx5iCygEUE0LI/k1PHYI7i2QsxN+rrKWD7xNHVlT X-Received: by 10.99.56.68 with SMTP id h4mr87616pgn.230.1520729176921; Sat, 10 Mar 2018 16:46:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520729176; cv=none; d=google.com; s=arc-20160816; b=XGnGxKoP1/9ZQZXgcow4VL0swfg7RoTbOrkQAJ9g1/t3v89SiX/bSzlijpi5SKAdS1 TfgFt7YCdEa6/+zc1TwMs/Ql+su2nk2OMjqFsE7jkTC4Il0kNZeGYYMZlj+tLKNcGPQ+ Skf+FojTNIyX2qv6ggTbL9VhHMEaMTju2Q1UoYNqfnDAoUz7XXodCnGbJQ6/C7xpIDP9 dSWHFh0nUqkOQ9eFcH5RbJSSHSy6GOpGkQfru0JnUKtX+Cj2Iha/FAMedyrO+Gy/2PcU z5J5lmPLFuAWQuUg6NLBY4nzKB3qvumjiX/LOno5/GL/R0xyx6rQkFQTU7B1J0Xm9bdl oWFg== 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 :references:in-reply-to:mime-version:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=Hs5lFAlJQ0LxtaDBvz3TUer+CuSf2V3a/03uSZrp1Eg=; b=PwCjY+iOhEEHD15mvvGKV7ubu9IK1HvNM56CIX6K9gcS/tC+vv9JJB4p9IAL0fCfgf 1RKY6kfl5E/xQhIvvJ10hliPLiW1D/wSek6ZLVsDjF0QsSqtWlJdBFKKyYzEMpLrAjk2 6C+Poh4l2lKTyMFaHXc0vPXb+zMX9HiQRHAmLCWE5J+15aAiFEsOhZybvlXnGaOur2Bu ml8/etQTx5uXqvs5o0Pg/Vioz97/uO9s+eYdsT+72GlxDqosOS3fpaoVI0b4vM7pqV9W WzIh/e1Dh7OuXnsB2VDT7fNN+c2NLZ4Tz1ajB8mjncMK+khSHwEvUJarhWVMLobU91Yb t+YQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lu5Pety7; 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 w20-v6si3309673plp.638.2018.03.10.16.46.16; Sat, 10 Mar 2018 16:46:16 -0800 (PST) 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=lu5Pety7; 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 0D4AA789A0; Sun, 11 Mar 2018 00:43:27 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by mail.openembedded.org (Postfix) with ESMTP id 3030D788D0 for ; Sun, 11 Mar 2018 00:43:24 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id m12so12287226wrm.13 for ; Sat, 10 Mar 2018 16:43:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version:in-reply-to:references :content-transfer-encoding; bh=w/theg0v929vG6HZypV1udn3fJOp3NE1vpvd6VCVczM=; b=lu5Pety7AdQGSnzr7BbuSfXptlXM4DQEjVoBulQgcl2yagWVeIMlvDOAGk/7WzgEfH BZXwhV/yBbSwn/5/k2jzS10hjpIBGNvbOziMYUVHrqxemNVyjxaMb6rFQqq/ZoQtHgbf Zg1Y7MVdHdzS/EzYmxQ8YKPDPz+W8k59TifhIDNLCzXDJX3dBw9gqE4PqJn2gPB7YxgN KUW1l/p5npIhLKGvJYta1xofic3FpnOP7+BNXl0Z4woLyDsEM6OqFHKgz+GSZQYAnWbV xqcEfXCZm6NghVMx/xsCYHVr1VMf+lts3yGaMu4O4XwVepELvr5m0LH8Jmj3MVnw3acc MrvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :in-reply-to:references:content-transfer-encoding; bh=w/theg0v929vG6HZypV1udn3fJOp3NE1vpvd6VCVczM=; b=cB3l+TtCsg/7a6Cz/1tm8bOYvl7jWRJUWxmjFAx0nggUjPXaokH0EF6PlUnDcOyo0R A0WsabKLrOdOCsQ5f3iarHQfYv84UeGfCmXhQLyDgOp3dMyZeVlBBg13BpN27F5pX5ei pn2xDTGastbaNObX77cCUq/vBKEzfvX+72WYh6Mlshlj+rS6a4qm1yRY3CV3QNZtNn98 9nk5W1BwP4UlLwrAImMTCauROb2Mg8ypcdfnFWCumzdy6TRQn2QBapmmKDHHiiCpst3m exLPUKcTHGq7IascGSGCQGu48QBkt5GJ7EOat/xsSZGKZpiszmO9T2/TnPfkvw999sn0 8MgA== X-Gm-Message-State: AElRT7GSavbUuIkokbrWUWIjbqDGlNsosCJRJ6Zke4HF7rTG2bLmAIxI hiSLh9PQfcYUoAv1vyD8JAU= X-Received: by 10.223.163.215 with SMTP id m23mr2730155wrb.90.1520729004676; Sat, 10 Mar 2018 16:43:24 -0800 (PST) Received: from localhost ([217.30.68.212]) by smtp.gmail.com with ESMTPSA id b45sm5362341wrb.79.2018.03.10.16.43.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 10 Mar 2018 16:43:23 -0800 (PST) From: Martin Jansa X-Google-Original-From: Martin Jansa To: Armin Kuster , openembedded-core@lists.openembedded.org Date: Sun, 11 Mar 2018 00:43:14 +0000 Message-Id: <86a5707fb7ba66668cf2778795c643e133aeee7f.1520728804.git.Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.15.1 MIME-Version: 1.0 In-Reply-To: References: Subject: [OE-core] [rocko][PATCH 5/8] gcc6: Upgrade to 6.4 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 From: Khem Raj Cherry-picked from oe-core master 7874fa86cb583fe6a178b95ead09430486197197 Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Martin Jansa --- .../gcc/gcc-6.3/ubsan-fix-check-empty-string.patch | 28 ---------- .../gcc/{gcc-6.3.inc => gcc-6.4.inc} | 13 +++-- .../0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 0 .../0008-missing-execinfo_h.patch | 0 .../{gcc-6.3 => gcc-6.4}/0009-c99-snprintf.patch | 0 .../0010-gcc-poison-system-directories.patch | 0 .../0011-gcc-poison-dir-extend.patch | 0 .../0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 0 .../0013-64-bit-multilib-hack.patch | 0 .../0014-optional-libstdc.patch | 0 ...0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch | 0 .../0016-COLLECT_GCC_OPTIONS.patch | 0 ...efaults.h-in-B-instead-of-S-and-t-oe-in-B.patch | 0 .../0018-fortran-cross-compile-hack.patch | 0 .../0019-cpp-honor-sysroot.patch | 0 .../0020-MIPS64-Default-to-N64-ABI.patch | 0 ...C_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 0 ...0022-gcc-Fix-argument-list-too-long-error.patch | 0 .../{gcc-6.3 => gcc-6.4}/0023-Disable-sdt.patch | 0 .../gcc/{gcc-6.3 => gcc-6.4}/0024-libtool.patch | 0 ...4-pass-fix-v4bx-to-linker-to-support-EABI.patch | 0 ...tilib-config-files-from-B-instead-of-usin.patch | 0 ...-libdir-from-.la-which-usually-points-to-.patch | 0 .../gcc/{gcc-6.3 => gcc-6.4}/0028-export-CPP.patch | 0 ...AltiVec-generation-on-powepc-linux-target.patch | 0 ...-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch | 0 ...Ensure-target-gcc-headers-can-be-included.patch | 0 ...-t-build-with-disable-dependency-tracking.patch | 0 ...h-host-directory-during-relink-if-inst_pr.patch | 0 ...IBS_DIR-replacement-instead-of-hardcoding.patch | 0 .../0035-aarch64-Add-support-for-musl-ldso.patch | 0 ...ibcc1-fix-libcc1-s-install-path-and-rpath.patch | 0 ...-handle-sysroot-support-for-nativesdk-gcc.patch | 0 ...et-sysroot-gcc-version-specific-dirs-with.patch | 0 ...-various-_FOR_BUILD-and-related-variables.patch | 0 .../0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch | 0 ...shared-to-link-commandline-for-musl-targe.patch | 0 ...c-libcpp-support-ffile-prefix-map-old-new.patch | 0 ...ug-prefix-map-to-replace-ffile-prefix-map.patch | 0 ...-fdebug-prefix-map-support-to-remap-sourc.patch | 0 ...45-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch | 0 ...bgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch | 0 ...e-alias-for-__cpu_indicator_init-instead-.patch | 0 .../0048-sync-gcc-stddef.h-with-musl.patch | 0 .../0054_all_nopie-all-flags.patch | 0 .../0055-unwind_h-glibc26.patch | 0 ...-relax-the-restriction-on-subreg-reload-f.patch | 0 .../backport}/CVE-2016-6131.patch | 62 ++++++---------------- ...s-canadian_6.3.bb => gcc-cross-canadian_6.4.bb} | 0 ...oss-initial_6.3.bb => gcc-cross-initial_6.4.bb} | 0 .../gcc/{gcc-cross_6.3.bb => gcc-cross_6.4.bb} | 0 ...-initial_6.3.bb => gcc-crosssdk-initial_6.4.bb} | 0 .../{gcc-crosssdk_6.3.bb => gcc-crosssdk_6.4.bb} | 0 .../gcc/{gcc-runtime_6.3.bb => gcc-runtime_6.4.bb} | 0 ...gcc-sanitizers_6.3.bb => gcc-sanitizers_6.4.bb} | 0 .../gcc/{gcc-source_6.3.bb => gcc-source_6.4.bb} | 0 .../gcc/{gcc_6.3.bb => gcc_6.4.bb} | 0 ...libgcc-initial_6.3.bb => libgcc-initial_6.4.bb} | 0 .../gcc/{libgcc_6.3.bb => libgcc_6.4.bb} | 0 .../gcc/{libgfortran_6.3.bb => libgfortran_6.4.bb} | 0 60 files changed, 23 insertions(+), 80 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch rename meta/recipes-devtools/gcc/{gcc-6.3.inc => gcc-6.4.inc} (93%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0008-missing-execinfo_h.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0009-c99-snprintf.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0010-gcc-poison-system-directories.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0011-gcc-poison-dir-extend.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0013-64-bit-multilib-hack.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0014-optional-libstdc.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0016-COLLECT_GCC_OPTIONS.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0018-fortran-cross-compile-hack.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0019-cpp-honor-sysroot.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0020-MIPS64-Default-to-N64-ABI.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0021-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0022-gcc-Fix-argument-list-too-long-error.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0023-Disable-sdt.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0024-libtool.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0025-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0026-Use-the-multilib-config-files-from-B-instead-of-usin.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0027-Avoid-using-libdir-from-.la-which-usually-points-to-.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0028-export-CPP.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0029-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0030-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0031-Ensure-target-gcc-headers-can-be-included.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0032-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0033-Don-t-search-host-directory-during-relink-if-inst_pr.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0034-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0035-aarch64-Add-support-for-musl-ldso.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0037-handle-sysroot-support-for-nativesdk-gcc.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0038-Search-target-sysroot-gcc-version-specific-dirs-with.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0039-Fix-various-_FOR_BUILD-and-related-variables.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0043-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0048-sync-gcc-stddef.h-with-musl.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0054_all_nopie-all-flags.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0055-unwind_h-glibc26.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4}/0056-LRA-PR70904-relax-the-restriction-on-subreg-reload-f.patch (100%) rename meta/recipes-devtools/gcc/{gcc-6.3 => gcc-6.4/backport}/CVE-2016-6131.patch (73%) rename meta/recipes-devtools/gcc/{gcc-cross-canadian_6.3.bb => gcc-cross-canadian_6.4.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-cross-initial_6.3.bb => gcc-cross-initial_6.4.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-cross_6.3.bb => gcc-cross_6.4.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-crosssdk-initial_6.3.bb => gcc-crosssdk-initial_6.4.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-crosssdk_6.3.bb => gcc-crosssdk_6.4.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-runtime_6.3.bb => gcc-runtime_6.4.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-sanitizers_6.3.bb => gcc-sanitizers_6.4.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-source_6.3.bb => gcc-source_6.4.bb} (100%) rename meta/recipes-devtools/gcc/{gcc_6.3.bb => gcc_6.4.bb} (100%) rename meta/recipes-devtools/gcc/{libgcc-initial_6.3.bb => libgcc-initial_6.4.bb} (100%) rename meta/recipes-devtools/gcc/{libgcc_6.3.bb => libgcc_6.4.bb} (100%) rename meta/recipes-devtools/gcc/{libgfortran_6.3.bb => libgfortran_6.4.bb} (100%) diff --git a/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch b/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch deleted file mode 100644 index c0127198e0..0000000000 --- a/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001 -From: kyukhin -Date: Sat, 3 Sep 2016 10:57:05 +0000 -Subject: [PATCH] gcc/ * ubsan.c (ubsan_use_new_style_p): Fix check for empty - string. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239971 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport -Signed-off-by: Joshua Lock - ---- - gcc/ubsan.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -Index: gcc-6.3.0/gcc/ubsan.c -=================================================================== ---- gcc-6.3.0.orig/gcc/ubsan.c -+++ gcc-6.3.0/gcc/ubsan.c -@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc) - - expanded_location xloc = expand_location (loc); - if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0 -- || xloc.file == '\0' || xloc.file[0] == '\xff' -+ || xloc.file[0] == '\0' || xloc.file[0] == '\xff' - || xloc.file[1] == '\xff') - return false; - diff --git a/meta/recipes-devtools/gcc/gcc-6.3.inc b/meta/recipes-devtools/gcc/gcc-6.4.inc similarity index 93% rename from meta/recipes-devtools/gcc/gcc-6.3.inc rename to meta/recipes-devtools/gcc/gcc-6.4.inc index 2f29fbf635..97ffbc8082 100644 --- a/meta/recipes-devtools/gcc/gcc-6.3.inc +++ b/meta/recipes-devtools/gcc/gcc-6.4.inc @@ -2,13 +2,13 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = "6.3.0" +PV = "6.4.0" # BINV should be incremented to a revision after a minor gcc release -BINV = "6.3.0" +BINV = "6.4.0" -FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-6.3:${FILE_DIRNAME}/gcc-6.3/backport:" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-6.4:${FILE_DIRNAME}/gcc-6.4/backport:" DEPENDS =+ "mpfr gmp libmpc zlib" NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native" @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "\ " -BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2" +BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz" #SRCREV = "bd9a826d5448db11d29d2ec5884e7e679066f140" #BASEURI ?= "git://github.com/gcc-mirror/gcc;branch=gcc-6-branch;protocol=git" #BASEURI ?= "ftp://sourceware.org/pub/gcc/snapshots/6.2.0-RC-20160815/gcc-6.2.0-RC-20160815.tar.bz2" @@ -80,10 +80,9 @@ SRC_URI = "\ " BACKPORTS = "\ file://CVE-2016-6131.patch \ - file://ubsan-fix-check-empty-string.patch \ " -SRC_URI[md5sum] = "677a7623c7ef6ab99881bc4e048debb6" -SRC_URI[sha256sum] = "f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f" +SRC_URI[md5sum] = "11ba51a0cfb8471927f387c8895fe232" +SRC_URI[sha256sum] = "850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4" S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" #S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/git" diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-6.4/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0008-missing-execinfo_h.patch b/meta/recipes-devtools/gcc/gcc-6.4/0008-missing-execinfo_h.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0008-missing-execinfo_h.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0008-missing-execinfo_h.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0009-c99-snprintf.patch b/meta/recipes-devtools/gcc/gcc-6.4/0009-c99-snprintf.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0009-c99-snprintf.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0009-c99-snprintf.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0010-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-6.4/0010-gcc-poison-system-directories.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0010-gcc-poison-system-directories.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0010-gcc-poison-system-directories.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0011-gcc-poison-dir-extend.patch b/meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0011-gcc-poison-dir-extend.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-6.4/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0013-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-6.4/0013-64-bit-multilib-hack.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0013-64-bit-multilib-hack.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0013-64-bit-multilib-hack.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0014-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc-6.4/0014-optional-libstdc.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0014-optional-libstdc.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0014-optional-libstdc.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch b/meta/recipes-devtools/gcc/gcc-6.4/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0016-COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc-6.4/0016-COLLECT_GCC_OPTIONS.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0016-COLLECT_GCC_OPTIONS.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0016-COLLECT_GCC_OPTIONS.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-6.4/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0018-fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-6.4/0018-fortran-cross-compile-hack.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0018-fortran-cross-compile-hack.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0018-fortran-cross-compile-hack.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0019-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc-6.4/0019-cpp-honor-sysroot.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0019-cpp-honor-sysroot.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0019-cpp-honor-sysroot.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0020-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc-6.4/0020-MIPS64-Default-to-N64-ABI.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0020-MIPS64-Default-to-N64-ABI.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0020-MIPS64-Default-to-N64-ABI.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0021-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-6.4/0021-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0021-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0021-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0022-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc-6.4/0022-gcc-Fix-argument-list-too-long-error.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0022-gcc-Fix-argument-list-too-long-error.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0022-gcc-Fix-argument-list-too-long-error.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0023-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc-6.4/0023-Disable-sdt.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0023-Disable-sdt.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0023-Disable-sdt.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0024-libtool.patch b/meta/recipes-devtools/gcc/gcc-6.4/0024-libtool.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0024-libtool.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0024-libtool.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0025-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc-6.4/0025-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0025-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0025-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0026-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc-6.4/0026-Use-the-multilib-config-files-from-B-instead-of-usin.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0026-Use-the-multilib-config-files-from-B-instead-of-usin.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0026-Use-the-multilib-config-files-from-B-instead-of-usin.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0027-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc-6.4/0027-Avoid-using-libdir-from-.la-which-usually-points-to-.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0027-Avoid-using-libdir-from-.la-which-usually-points-to-.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0027-Avoid-using-libdir-from-.la-which-usually-points-to-.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0028-export-CPP.patch b/meta/recipes-devtools/gcc/gcc-6.4/0028-export-CPP.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0028-export-CPP.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0028-export-CPP.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0029-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch b/meta/recipes-devtools/gcc/gcc-6.4/0029-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0029-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0029-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0030-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch b/meta/recipes-devtools/gcc/gcc-6.4/0030-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0030-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0030-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0031-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-6.4/0031-Ensure-target-gcc-headers-can-be-included.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0031-Ensure-target-gcc-headers-can-be-included.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0031-Ensure-target-gcc-headers-can-be-included.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0032-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/meta/recipes-devtools/gcc/gcc-6.4/0032-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0032-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0032-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0033-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc-6.4/0033-Don-t-search-host-directory-during-relink-if-inst_pr.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0033-Don-t-search-host-directory-during-relink-if-inst_pr.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0033-Don-t-search-host-directory-during-relink-if-inst_pr.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0034-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-6.4/0034-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0034-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0034-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0035-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc-6.4/0035-aarch64-Add-support-for-musl-ldso.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0035-aarch64-Add-support-for-musl-ldso.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0035-aarch64-Add-support-for-musl-ldso.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc-6.4/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0037-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc-6.4/0037-handle-sysroot-support-for-nativesdk-gcc.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0037-handle-sysroot-support-for-nativesdk-gcc.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0037-handle-sysroot-support-for-nativesdk-gcc.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0038-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta/recipes-devtools/gcc/gcc-6.4/0038-Search-target-sysroot-gcc-version-specific-dirs-with.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0038-Search-target-sysroot-gcc-version-specific-dirs-with.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0038-Search-target-sysroot-gcc-version-specific-dirs-with.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0039-Fix-various-_FOR_BUILD-and-related-variables.patch b/meta/recipes-devtools/gcc/gcc-6.4/0039-Fix-various-_FOR_BUILD-and-related-variables.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0039-Fix-various-_FOR_BUILD-and-related-variables.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0039-Fix-various-_FOR_BUILD-and-related-variables.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/meta/recipes-devtools/gcc/gcc-6.4/0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc-6.4/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch b/meta/recipes-devtools/gcc/gcc-6.4/0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0043-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch b/meta/recipes-devtools/gcc/gcc-6.4/0043-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0043-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0043-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch b/meta/recipes-devtools/gcc/gcc-6.4/0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch b/meta/recipes-devtools/gcc/gcc-6.4/0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/meta/recipes-devtools/gcc/gcc-6.4/0046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc-6.4/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0048-sync-gcc-stddef.h-with-musl.patch b/meta/recipes-devtools/gcc/gcc-6.4/0048-sync-gcc-stddef.h-with-musl.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0048-sync-gcc-stddef.h-with-musl.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0048-sync-gcc-stddef.h-with-musl.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0054_all_nopie-all-flags.patch b/meta/recipes-devtools/gcc/gcc-6.4/0054_all_nopie-all-flags.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0054_all_nopie-all-flags.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0054_all_nopie-all-flags.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0055-unwind_h-glibc26.patch b/meta/recipes-devtools/gcc/gcc-6.4/0055-unwind_h-glibc26.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0055-unwind_h-glibc26.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0055-unwind_h-glibc26.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/0056-LRA-PR70904-relax-the-restriction-on-subreg-reload-f.patch b/meta/recipes-devtools/gcc/gcc-6.4/0056-LRA-PR70904-relax-the-restriction-on-subreg-reload-f.patch similarity index 100% rename from meta/recipes-devtools/gcc/gcc-6.3/0056-LRA-PR70904-relax-the-restriction-on-subreg-reload-f.patch rename to meta/recipes-devtools/gcc/gcc-6.4/0056-LRA-PR70904-relax-the-restriction-on-subreg-reload-f.patch diff --git a/meta/recipes-devtools/gcc/gcc-6.3/CVE-2016-6131.patch b/meta/recipes-devtools/gcc/gcc-6.4/backport/CVE-2016-6131.patch similarity index 73% rename from meta/recipes-devtools/gcc/gcc-6.3/CVE-2016-6131.patch rename to meta/recipes-devtools/gcc/gcc-6.4/backport/CVE-2016-6131.patch index e873cc6e85..3cdbb2d171 100644 --- a/meta/recipes-devtools/gcc/gcc-6.3/CVE-2016-6131.patch +++ b/meta/recipes-devtools/gcc/gcc-6.4/backport/CVE-2016-6131.patch @@ -37,35 +37,10 @@ Signed-off-by: Yuanjie Huang libiberty/testsuite/demangle-expected | 18 ++++++++ 3 files changed, 108 insertions(+), 5 deletions(-) -diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog -index 240138f..adf1d72 100644 ---- a/libiberty/ChangeLog -+++ b/libiberty/ChangeLog -@@ -1,3 +1,20 @@ -+2016-08-04 Marcel Böhme -+ -+ PR c++/71696 -+ * cplus-dem.c: Prevent infinite recursion when there is a cycle -+ in the referencing of remembered mangled types. -+ (work_stuff): New stack to keep track of the remembered mangled -+ types that are currently being processed. -+ (push_processed_type): New method to push currently processed -+ remembered type onto the stack. -+ (pop_processed_type): New method to pop currently processed -+ remembered type from the stack. -+ (work_stuff_copy_to_from): Copy values of new variables. -+ (delete_non_B_K_work_stuff): Free stack memory. -+ (demangle_args): Push/Pop currently processed remembered type. -+ (do_type): Do not demangle a cyclic reference and push/pop -+ referenced remembered type. -+ - 2016-12-21 Release Manager - - * GCC 6.3.0 released. -diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c -index 7514e57..f21e630 100644 ---- a/libiberty/cplus-dem.c -+++ b/libiberty/cplus-dem.c +Index: gcc-6.4.0/libiberty/cplus-dem.c +=================================================================== +--- gcc-6.4.0.orig/libiberty/cplus-dem.c ++++ gcc-6.4.0/libiberty/cplus-dem.c @@ -144,6 +144,9 @@ struct work_stuff string* previous_argument; /* The last function argument demangled. */ int nrepeats; /* The number of times to repeat the previous @@ -76,7 +51,7 @@ index 7514e57..f21e630 100644 }; #define PRINT_ANSI_QUALIFIERS (work -> options & DMGL_ANSI) -@@ -435,6 +438,10 @@ iterate_demangle_function (struct work_stuff *, +@@ -435,6 +438,10 @@ iterate_demangle_function (struct work_s static void remember_type (struct work_stuff *, const char *, int); @@ -87,7 +62,7 @@ index 7514e57..f21e630 100644 static void remember_Btype (struct work_stuff *, const char *, int, int); static int register_Btype (struct work_stuff *); -@@ -1301,6 +1308,10 @@ work_stuff_copy_to_from (struct work_stuff *to, struct work_stuff *from) +@@ -1301,6 +1308,10 @@ work_stuff_copy_to_from (struct work_stu memcpy (to->btypevec[i], from->btypevec[i], len); } @@ -98,7 +73,7 @@ index 7514e57..f21e630 100644 if (from->ntmpl_args) to->tmpl_argvec = XNEWVEC (char *, from->ntmpl_args); -@@ -1329,11 +1340,17 @@ delete_non_B_K_work_stuff (struct work_stuff *work) +@@ -1329,11 +1340,17 @@ delete_non_B_K_work_stuff (struct work_s /* Discard the remembered types, if any. */ forget_types (work); @@ -129,7 +104,7 @@ index 7514e57..f21e630 100644 int done; int success; string decl; -@@ -3564,6 +3583,7 @@ do_type (struct work_stuff *work, const char **mangled, string *result) +@@ -3564,6 +3583,7 @@ do_type (struct work_stuff *work, const done = 0; success = 1; @@ -137,7 +112,7 @@ index 7514e57..f21e630 100644 while (success && !done) { int member; -@@ -3616,8 +3636,15 @@ do_type (struct work_stuff *work, const char **mangled, string *result) +@@ -3616,8 +3636,15 @@ do_type (struct work_stuff *work, const success = 0; } else @@ -154,7 +129,7 @@ index 7514e57..f21e630 100644 mangled = &remembered_type; } break; -@@ -3840,6 +3867,9 @@ do_type (struct work_stuff *work, const char **mangled, string *result) +@@ -3840,6 +3867,9 @@ do_type (struct work_stuff *work, const string_delete (result); string_delete (&decl); @@ -164,7 +139,7 @@ index 7514e57..f21e630 100644 if (success) /* Assume an integral type, if we're not sure. */ return (int) ((tk == tk_none) ? tk_integral : tk); -@@ -4252,6 +4282,41 @@ do_arg (struct work_stuff *work, const char **mangled, string *result) +@@ -4252,6 +4282,41 @@ do_arg (struct work_stuff *work, const c } static void @@ -206,7 +181,7 @@ index 7514e57..f21e630 100644 remember_type (struct work_stuff *work, const char *start, int len) { char *tem; -@@ -4515,10 +4580,13 @@ demangle_args (struct work_stuff *work, const char **mangled, +@@ -4515,10 +4580,13 @@ demangle_args (struct work_stuff *work, { string_append (declp, ", "); } @@ -220,11 +195,11 @@ index 7514e57..f21e630 100644 if (PRINT_ARG_TYPES) { string_appends (declp, &arg); -diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected -index 157d2ee..8793a0b 100644 ---- a/libiberty/testsuite/demangle-expected -+++ b/libiberty/testsuite/demangle-expected -@@ -4491,3 +4491,21 @@ void eat(int*&, Foo()::{lambda(auto:1 +Index: gcc-6.4.0/libiberty/testsuite/demangle-expected +=================================================================== +--- gcc-6.4.0.orig/libiberty/testsuite/demangle-expected ++++ gcc-6.4.0/libiberty/testsuite/demangle-expected +@@ -4491,3 +4491,21 @@ void eat()::{lambda(short*, auto:1*, auto:2*)#2}>(int*&, void Bar()::{lambda(short*, auto:1*, auto:2*)#2}&) @@ -246,6 +221,3 @@ index 157d2ee..8793a0b 100644 + +__10%0__S4_0T0T0 +%0<>::%0(%0<>) --- -2.9.3 - diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_6.3.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-cross-canadian_6.3.bb rename to meta/recipes-devtools/gcc/gcc-cross-canadian_6.4.bb diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_6.3.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-cross-initial_6.3.bb rename to meta/recipes-devtools/gcc/gcc-cross-initial_6.4.bb diff --git a/meta/recipes-devtools/gcc/gcc-cross_6.3.bb b/meta/recipes-devtools/gcc/gcc-cross_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-cross_6.3.bb rename to meta/recipes-devtools/gcc/gcc-cross_6.4.bb diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_6.3.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-crosssdk-initial_6.3.bb rename to meta/recipes-devtools/gcc/gcc-crosssdk-initial_6.4.bb diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_6.3.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-crosssdk_6.3.bb rename to meta/recipes-devtools/gcc/gcc-crosssdk_6.4.bb diff --git a/meta/recipes-devtools/gcc/gcc-runtime_6.3.bb b/meta/recipes-devtools/gcc/gcc-runtime_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-runtime_6.3.bb rename to meta/recipes-devtools/gcc/gcc-runtime_6.4.bb diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_6.3.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-sanitizers_6.3.bb rename to meta/recipes-devtools/gcc/gcc-sanitizers_6.4.bb diff --git a/meta/recipes-devtools/gcc/gcc-source_6.3.bb b/meta/recipes-devtools/gcc/gcc-source_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-source_6.3.bb rename to meta/recipes-devtools/gcc/gcc-source_6.4.bb diff --git a/meta/recipes-devtools/gcc/gcc_6.3.bb b/meta/recipes-devtools/gcc/gcc_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc_6.3.bb rename to meta/recipes-devtools/gcc/gcc_6.4.bb diff --git a/meta/recipes-devtools/gcc/libgcc-initial_6.3.bb b/meta/recipes-devtools/gcc/libgcc-initial_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgcc-initial_6.3.bb rename to meta/recipes-devtools/gcc/libgcc-initial_6.4.bb diff --git a/meta/recipes-devtools/gcc/libgcc_6.3.bb b/meta/recipes-devtools/gcc/libgcc_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgcc_6.3.bb rename to meta/recipes-devtools/gcc/libgcc_6.4.bb diff --git a/meta/recipes-devtools/gcc/libgfortran_6.3.bb b/meta/recipes-devtools/gcc/libgfortran_6.4.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgfortran_6.3.bb rename to meta/recipes-devtools/gcc/libgfortran_6.4.bb From patchwork Sun Mar 11 00:43:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 131332 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2624282lja; Sat, 10 Mar 2018 16:46:25 -0800 (PST) X-Google-Smtp-Source: AG47ELtIbjheM7WPjIoHEIRZssAvPDYS/0njNmTRz98v3yp/jesI0Ggai7nl3LYChz2gB6PHO13u X-Received: by 10.98.156.148 with SMTP id u20mr3300879pfk.167.1520729185002; Sat, 10 Mar 2018 16:46:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520729184; cv=none; d=google.com; s=arc-20160816; b=MUd1Yzp2Fd8jGSokCzfDhuJAAjY7MAKRXpkt9cnpkyQEOJN0tywndKbedrQQTFt9oB iPXmciYbFnfobeRd2+OjYX8CU0QHCHpiXApev0o/5OzKVH5mbQfvFSp0k49oNrNclImA j10eArEK5UFFZHNTElc/2zwUIBBu0hXISgZ2QtXIBmKpCEU1/muXNMbeLa240xwvCRR9 Zwayx8ln/KjMLOmSJcz6xpoZKaloufEI1zB0znuKEoJo7yT+Q3ieuvjB3yCbinXyov31 Hc+YjH1dpiI1Gx+Ow16o+l7Rn+ITt6+D7jRv6NT4493GDpfoDd5hu3M9Jo7O43oWPRWX EM/w== 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=xeFPrG5EH/rc6Dl8+GQoQyd63vJFKtUy6NVw9j4dQGs=; b=ANgXqW48UN0CDnanSZMSGFcF6USBNi9AgW+IzoKB6khm0txlwUcgo0Ov3f12dGCu37 u7v79VGPlcYHYgGecXx1JvAqzMJG6nRhNc5RITLdiVf8QCq4GsPRI8BzB21M4r4nvWEd vW38fiIm/z1EAQgVObM1yKWNiE3iB4xwiYDc8LZXUbG0dpj6gENYFhCmWCyBPf4PZ4WR FxB7KhKMH5D8tOYcGLxsT+LDojJYC5lveBhYAUopua6X8IOt7AKeHILPqGywDzMLHHUV SU0rGXzd0KJcPQ4U+HuikvFDM7F/gogx2/wWqsTdix3Dly/hq+JSfYzrXr47ZpPVoSvT uh4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Mm/3+sxC; 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 f8-v6si3546698plk.245.2018.03.10.16.46.24; Sat, 10 Mar 2018 16:46:24 -0800 (PST) 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=Mm/3+sxC; 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 620A978984; Sun, 11 Mar 2018 00:43:30 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by mail.openembedded.org (Postfix) with ESMTP id 04157788CE for ; Sun, 11 Mar 2018 00:43:24 +0000 (UTC) Received: by mail-wm0-f52.google.com with SMTP id s206so8318787wme.0 for ; Sat, 10 Mar 2018 16:43:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=1C2Eg4VqzkJNU/BpZ2qA/1GfBzdthkua24brmrmBCbM=; b=Mm/3+sxCoaW1b+iSe/hLd+35kC6u4any1iX6ojcD7ojDHnncYC9mIEyC029Ko6NTsr qA1ElOtc7vlODTLgWdj1iyapQwt/gHEAfB8q8D2fsfkfxxqkAyXmh1VWU3jUyrRx3VUm 8xLyQS1SOFlNYQA6CM56RAJIcaTVtGiCzku3UOi1fV2P9QLklf1mCSYJ1b8bLqPesPBg UuGPliVYzxNDqyWQS7InSADWa7r652i/ZVmBjMSHcqTy5BzGhhrizvz1LL5RvdGwN/2D +ZkvXDzHAvdlu/figvANQbHAgATCiffk8KyuU+WcD6GCQ37simsj70uiNN6G9XZxhKQD Q2Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=1C2Eg4VqzkJNU/BpZ2qA/1GfBzdthkua24brmrmBCbM=; b=YN4634CeRJDk9YO2vzr99BbBhkclZAcosqTkvP2Rasr6+W9txB+JVVMqyITdKL1Ku/ VzzjCBigd5RcvVkMIkDHjrKFWxup8AAecOPK/BmeFRXUWxEJTlzD7I6yLonimqNpuD45 MNjR9xBZRvSvlJL2y8S3uJFvFA6A3yGqHL/Gdio+8qWkaSTC2lzi9BzHdnfUGCCneuXx I5Ts/oaGPeptRX1Z96sCY+9OdKjeZPvHCcuMA0zd7wEtx16XBk9ITUU8dtVlR3N38g9p JQ9jtHGpW3eipnPOPt2/KgKY6VO/e9Y84CBoUkQldcUCa3qiNK+wLdA0rQ0jEHn0/+rK bt+A== X-Gm-Message-State: AElRT7EvpOOBFG8BSw+lI2hpGWYCNx/58QJMvOG5cGB9ac04TXT2e1HA 3D70Ct76p3KMGTT9ctd3iY/Dpw== X-Received: by 10.28.74.88 with SMTP id x85mr2093612wma.106.1520729005792; Sat, 10 Mar 2018 16:43:25 -0800 (PST) Received: from localhost ([217.30.68.212]) by smtp.gmail.com with ESMTPSA id p78sm2474570wmg.47.2018.03.10.16.43.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 10 Mar 2018 16:43:25 -0800 (PST) From: Martin Jansa X-Google-Original-From: Martin Jansa To: Armin Kuster , openembedded-core@lists.openembedded.org Date: Sun, 11 Mar 2018 00:43:15 +0000 Message-Id: X-Mailer: git-send-email 2.15.1 In-Reply-To: References: Subject: [OE-core] [rocko][PATCH 6/8] gcc7/gcc6: Fix unaligned STRD issue on ARM 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 From: Khem Raj Backport https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82445 Fixes [YOCTO 12297] Cherry-picked from oe-core master 568227133be3f9f015679df3525f6c4f86304fd0 Signed-off-by: Khem Raj Signed-off-by: Ross Burton (cherry picked from commit 568227133be3f9f015679df3525f6c4f86304fd0) Signed-off-by: Martin Jansa --- meta/recipes-devtools/gcc/gcc-6.4.inc | 1 + ...5-suppress-32-bit-aligned-ldrd-strd-peeph.patch | 194 +++++++++++++++++++++ 2 files changed, 195 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-6.4/0057-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch -- 2.15.1 -- _______________________________________________ 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-6.4.inc b/meta/recipes-devtools/gcc/gcc-6.4.inc index 97ffbc8082..93a1f24896 100644 --- a/meta/recipes-devtools/gcc/gcc-6.4.inc +++ b/meta/recipes-devtools/gcc/gcc-6.4.inc @@ -80,6 +80,7 @@ SRC_URI = "\ " BACKPORTS = "\ file://CVE-2016-6131.patch \ + file://0057-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch \ " SRC_URI[md5sum] = "11ba51a0cfb8471927f387c8895fe232" SRC_URI[sha256sum] = "850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4" diff --git a/meta/recipes-devtools/gcc/gcc-6.4/0057-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch b/meta/recipes-devtools/gcc/gcc-6.4/0057-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch new file mode 100644 index 0000000000..0214ab83d9 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-6.4/0057-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch @@ -0,0 +1,194 @@ +From ad5bf450aef2ffee6d57ed193fabc5f72f8eaa65 Mon Sep 17 00:00:00 2001 +From: rearnsha +Date: Thu, 19 Oct 2017 13:16:42 +0000 +Subject: [PATCH] [ARM] PR 82445 - suppress 32-bit aligned ldrd/strd peepholing + with -mno-unaligned-access + +Peephole patterns exist in the arm backend to spot load/store +operations to adjacent memory operations in order to convert them into +ldrd/strd instructions. However, when we have strict alignment +enforced, then we can only do this if the accesses are known to be +64-bit aligned; this is unlikely to be the case for most loads. The +patch adds some alignment checking to the code that validates the +addresses for use in the peephole patterns. This should also fix +incorrect generation of ldrd/strd with unaligned accesses that could +previously have occurred on ARMv5e where all such operations must be +64-bit aligned. + +I've added some new tests as well. In doing so I discovered that the +ldrd/strd peephole tests could never fail since they would match the +source file name in the scanned assembly as well as any instructions +of the intended type. I've fixed those by tightening the scan results +slightly. + +gcc: + +* config/arm/arm.c (align_ok_ldrd_strd): New function. +(mem_ok_for_ldrd_strd): New parameter align. Extract the alignment of the +mem into it. +(gen_operands_ldrd_strd): Validate the alignment of the accesses. + +testsuite: + +* gcc.target/arm/peep-ldrd-1.c: Tighten test scan pattern. +* gcc.target/arm/peep-strd-1.c: Likewise. +* gcc.target/arm/peep-ldrd-2.c: New test. +* gcc.target/arm/peep-strd-2.c: New test. + + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@253892 138bc75d-0d04-0410-961f-82ee72b054a4 +--- +Upstream-Status: Backport +Signed-off-by: Khem Raj + + gcc/ChangeLog | 8 +++++++ + gcc/config/arm/arm.c | 27 ++++++++++++++++++---- + gcc/testsuite/ChangeLog | 8 +++++++ + gcc/testsuite/gcc.target/arm/peep-ldrd-1.c | 2 +- + .../arm/{peep-ldrd-1.c => peep-ldrd-2.c} | 4 ++-- + gcc/testsuite/gcc.target/arm/peep-strd-1.c | 2 +- + .../arm/{peep-strd-1.c => peep-strd-2.c} | 4 ++-- + 7 files changed, 44 insertions(+), 11 deletions(-) + copy gcc/testsuite/gcc.target/arm/{peep-ldrd-1.c => peep-ldrd-2.c} (63%) + copy gcc/testsuite/gcc.target/arm/{peep-strd-1.c => peep-strd-2.c} (58%) + +diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c +index 9c0813d598d..e3da9f77fb6 100644 +--- a/gcc/config/arm/arm.c ++++ b/gcc/config/arm/arm.c +@@ -15926,12 +15926,23 @@ operands_ok_ldrd_strd (rtx rt, rtx rt2, rtx rn, HOST_WIDE_INT offset, + return true; + } + ++/* Return true if a 64-bit access with alignment ALIGN and with a ++ constant offset OFFSET from the base pointer is permitted on this ++ architecture. */ ++static bool ++align_ok_ldrd_strd (HOST_WIDE_INT align, HOST_WIDE_INT offset) ++{ ++ return (unaligned_access ++ ? (align >= BITS_PER_WORD && (offset & 3) == 0) ++ : (align >= 2 * BITS_PER_WORD && (offset & 7) == 0)); ++} ++ + /* Helper for gen_operands_ldrd_strd. Returns true iff the memory + operand MEM's address contains an immediate offset from the base +- register and has no side effects, in which case it sets BASE and +- OFFSET accordingly. */ ++ register and has no side effects, in which case it sets BASE, ++ OFFSET and ALIGN accordingly. */ + static bool +-mem_ok_for_ldrd_strd (rtx mem, rtx *base, rtx *offset) ++mem_ok_for_ldrd_strd (rtx mem, rtx *base, rtx *offset, HOST_WIDE_INT *align) + { + rtx addr; + +@@ -15950,6 +15961,7 @@ mem_ok_for_ldrd_strd (rtx mem, rtx *base, rtx *offset) + gcc_assert (MEM_P (mem)); + + *offset = const0_rtx; ++ *align = MEM_ALIGN (mem); + + addr = XEXP (mem, 0); + +@@ -15990,7 +16002,7 @@ gen_operands_ldrd_strd (rtx *operands, bool load, + bool const_store, bool commute) + { + int nops = 2; +- HOST_WIDE_INT offsets[2], offset; ++ HOST_WIDE_INT offsets[2], offset, align[2]; + rtx base = NULL_RTX; + rtx cur_base, cur_offset, tmp; + int i, gap; +@@ -16002,7 +16014,8 @@ gen_operands_ldrd_strd (rtx *operands, bool load, + registers, and the corresponding memory offsets. */ + for (i = 0; i < nops; i++) + { +- if (!mem_ok_for_ldrd_strd (operands[nops+i], &cur_base, &cur_offset)) ++ if (!mem_ok_for_ldrd_strd (operands[nops+i], &cur_base, &cur_offset, ++ &align[i])) + return false; + + if (i == 0) +@@ -16114,6 +16127,7 @@ gen_operands_ldrd_strd (rtx *operands, bool load, + /* Swap the instructions such that lower memory is accessed first. */ + std::swap (operands[0], operands[1]); + std::swap (operands[2], operands[3]); ++ std::swap (align[0], align[1]); + if (const_store) + std::swap (operands[4], operands[5]); + } +@@ -16127,6 +16141,9 @@ gen_operands_ldrd_strd (rtx *operands, bool load, + if (gap != 4) + return false; + ++ if (!align_ok_ldrd_strd (align[0], offset)) ++ return false; ++ + /* Make sure we generate legal instructions. */ + if (operands_ok_ldrd_strd (operands[0], operands[1], base, offset, + false, load)) +diff --git a/gcc/testsuite/gcc.target/arm/peep-ldrd-1.c b/gcc/testsuite/gcc.target/arm/peep-ldrd-1.c +index eb2b86ee7b6..d49eff6b87e 100644 +--- a/gcc/testsuite/gcc.target/arm/peep-ldrd-1.c ++++ b/gcc/testsuite/gcc.target/arm/peep-ldrd-1.c +@@ -8,4 +8,4 @@ int foo(int a, int b, int* p, int *q) + *p = a; + return a; + } +-/* { dg-final { scan-assembler "ldrd" } } */ ++/* { dg-final { scan-assembler "ldrd\\t" } } */ +diff --git a/gcc/testsuite/gcc.target/arm/peep-ldrd-1.c b/gcc/testsuite/gcc.target/arm/peep-ldrd-2.c +similarity index 63% +copy from gcc/testsuite/gcc.target/arm/peep-ldrd-1.c +copy to gcc/testsuite/gcc.target/arm/peep-ldrd-2.c +index eb2b86ee7b6..6822c2b1454 100644 +--- a/gcc/testsuite/gcc.target/arm/peep-ldrd-1.c ++++ b/gcc/testsuite/gcc.target/arm/peep-ldrd-2.c +@@ -1,6 +1,6 @@ + /* { dg-do compile } */ + /* { dg-require-effective-target arm_prefer_ldrd_strd } */ +-/* { dg-options "-O2" } */ ++/* { dg-options "-O2 -mno-unaligned-access" } */ + int foo(int a, int b, int* p, int *q) + { + a = p[2] + p[3]; +@@ -8,4 +8,4 @@ int foo(int a, int b, int* p, int *q) + *p = a; + return a; + } +-/* { dg-final { scan-assembler "ldrd" } } */ ++/* { dg-final { scan-assembler-not "ldrd\\t" } } */ +diff --git a/gcc/testsuite/gcc.target/arm/peep-strd-1.c b/gcc/testsuite/gcc.target/arm/peep-strd-1.c +index bd330769599..fe1beac7229 100644 +--- a/gcc/testsuite/gcc.target/arm/peep-strd-1.c ++++ b/gcc/testsuite/gcc.target/arm/peep-strd-1.c +@@ -6,4 +6,4 @@ void foo(int a, int b, int* p) + p[2] = a; + p[3] = b; + } +-/* { dg-final { scan-assembler "strd" } } */ ++/* { dg-final { scan-assembler "strd\\t" } } */ +diff --git a/gcc/testsuite/gcc.target/arm/peep-strd-1.c b/gcc/testsuite/gcc.target/arm/peep-strd-2.c +similarity index 58% +copy from gcc/testsuite/gcc.target/arm/peep-strd-1.c +copy to gcc/testsuite/gcc.target/arm/peep-strd-2.c +index bd330769599..bfc5ebe9eec 100644 +--- a/gcc/testsuite/gcc.target/arm/peep-strd-1.c ++++ b/gcc/testsuite/gcc.target/arm/peep-strd-2.c +@@ -1,9 +1,9 @@ + /* { dg-do compile } */ + /* { dg-require-effective-target arm_prefer_ldrd_strd } */ +-/* { dg-options "-O2" } */ ++/* { dg-options "-O2 -mno-unaligned-access" } */ + void foo(int a, int b, int* p) + { + p[2] = a; + p[3] = b; + } +-/* { dg-final { scan-assembler "strd" } } */ ++/* { dg-final { scan-assembler-not "strd\\t" } } */ +-- +2.15.0 +