<div dir="ltr">I've sent the pull requests for all 3 release branches.<div><br></div><div>I'll let some builders doing more tests over night, but it's very close to what was merged in master (and also to what is currently in morty-next) so it should be relatively safe.</div><div><br></div><div>The "significant" diffs between gcc-6.4 in various branches:</div><div><br></div><div>1) <span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:small;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">84d6be8ceb14b418b059212108c5a71a5950e6c3 (last master commits before 6.4 was removed)</span></div><div><br></div><div>master doesn't have 0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch which were backported to rocko from gcc-7.1 later</div><div>and it doesn't have new backports from Juro and 0001-enable-FL_LPAE-flag-for-armv7ve-cores.patc fix from Andre</div><div><br></div><div><div>diff -rq meta/recipes-devtools/gcc-rocko meta/recipes-devtools/gcc-master-84d6be8ceb14b418b059212108c5a71a5950e6c3/</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4: 0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch</div><div>Only in meta/recipes-devtools/gcc-master-84d6be8ceb14b418b059212108c5a71a5950e6c3/gcc-6.4: 0041-ssp_nonshared.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0001-enable-FL_LPAE-flag-for-armv7ve-cores.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0001-i386-Move-struct-ix86_frame-to-machine_function.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0002-i386-Use-reference-of-struct-ix86_frame-to-avoid-cop.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0003-i386-Use-const-reference-of-struct-ix86_frame-to-avo.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0004-x86-Add-mindirect-branch.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0005-x86-Add-mfunction-return.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0006-x86-Add-mindirect-branch-register.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0007-x86-Add-V-register-operand-modifier.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0008-x86-Disallow-mindirect-branch-mfunction-return-with-.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0009-Use-INVALID_REGNUM-in-indirect-thunk-processing.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0010-i386-Pass-INVALID_REGNUM-as-invalid-register-number.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0011-i386-Update-mfunction-return-for-return-with-pop.patch</div><div>Only in meta/recipes-devtools/gcc-rocko/gcc-6.4/backport: 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch</div><div>Files meta/recipes-devtools/gcc-rocko/gcc-6.4.inc and meta/recipes-devtools/gcc-master-84d6be8ceb14b418b059212108c5a71a5950e6c3/gcc-6.4.inc differ</div></div><div><br></div><div><div>docker-shr @ ~/openembedded-core $ diff meta/recipes-devtools/gcc-rocko/gcc-6.4.inc meta/recipes-devtools/gcc-master-84d6be8ceb14b418b059212108c5a71a5950e6c3/gcc-6.4.inc</div><div>68c68</div><div>< file://0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \</div><div>---</div><div>> file://0041-ssp_nonshared.patch \</div><div>84,96d83</div><div>< file://0001-enable-FL_LPAE-flag-for-armv7ve-cores.patch \</div><div>< file://0001-i386-Move-struct-ix86_frame-to-machine_function.patch \</div><div>< file://0002-i386-Use-reference-of-struct-ix86_frame-to-avoid-cop.patch \</div><div>< file://0003-i386-Use-const-reference-of-struct-ix86_frame-to-avo.patch \</div><div>< file://0004-x86-Add-mindirect-branch.patch \</div><div>< file://0005-x86-Add-mfunction-return.patch \</div><div>< file://0006-x86-Add-mindirect-branch-register.patch \</div><div>< file://0007-x86-Add-V-register-operand-modifier.patch \</div><div>< file://0008-x86-Disallow-mindirect-branch-mfunction-return-with-.patch \</div><div>< file://0009-Use-INVALID_REGNUM-in-indirect-thunk-processing.patch \</div><div>< file://0010-i386-Pass-INVALID_REGNUM-as-invalid-register-number.patch \</div><div>< file://0011-i386-Update-mfunction-return-for-return-with-pop.patch \</div><div>< file://0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch \</div><div>98d84</div><div>< </div></div><div><br></div><div>2) rocko to pyro:</div><div>rocko doesn't have uclibc changes anymore and 5.4 (with "gcc: Fix CVE-2016-6131 in libiberty")</div><div><br></div><div><div>docker-shr @ ~/openembedded-core $ diff -rq meta/recipes-devtools/gcc-pyro meta/recipes-devtools/gcc-rocko </div><div>Only in meta/recipes-devtools/gcc-pyro: gcc-5.4</div><div>Only in meta/recipes-devtools/gcc-pyro: gcc-5.4.inc</div><div>Only in meta/recipes-devtools/gcc-pyro/gcc-6.4: 0002-uclibc-conf.patch</div><div>Only in meta/recipes-devtools/gcc-pyro/gcc-6.4: 0003-gcc-uclibc-locale-ctype_touplow_t.patch</div><div>Only in meta/recipes-devtools/gcc-pyro/gcc-6.4: 0004-uclibc-locale.patch</div><div>Only in meta/recipes-devtools/gcc-pyro/gcc-6.4: 0005-uclibc-locale-no__x.patch</div><div>Only in meta/recipes-devtools/gcc-pyro/gcc-6.4: 0006-uclibc-locale-wchar_fix.patch</div><div>Only in meta/recipes-devtools/gcc-pyro/gcc-6.4: 0007-uclibc-locale-update.patch</div><div>Files meta/recipes-devtools/gcc-pyro/gcc-6.4.inc and meta/recipes-devtools/gcc-rocko/gcc-6.4.inc differ</div><div><br></div></div><div><div>docker-shr @ ~/openembedded-core $ diff -uNr meta/recipes-devtools/gcc-pyro/gcc-6.4.inc meta/recipes-devtools/gcc-rocko/gcc-6.4.inc</div><div>--- meta/recipes-devtools/gcc-pyro/gcc-6.4.inc 2018-03-11 00:31:45.474829982 +0000</div><div>+++ meta/recipes-devtools/gcc-rocko/gcc-6.4.inc 2018-03-11 00:36:58.421852950 +0000</div><div>@@ -32,12 +32,6 @@</div><div> SRC_URI = "\</div><div> ${BASEURI} \</div><div> file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \</div><div>- file://0002-uclibc-conf.patch \</div><div>- file://0003-gcc-uclibc-locale-ctype_touplow_t.patch \</div><div>- file://0004-uclibc-locale.patch \</div><div>- file://0005-uclibc-locale-no__x.patch \</div><div>- file://0006-uclibc-locale-wchar_fix.patch \</div><div>- file://0007-uclibc-locale-update.patch \</div><div> file://0008-missing-execinfo_h.patch \</div><div> file://0009-c99-snprintf.patch \</div><div> file://0010-gcc-poison-system-directories.patch \</div><div>@@ -144,8 +138,6 @@</div><div> gcc_cv_libc_provides_ssp=yes \</div><div> "</div><div> </div><div>-EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float "</div><div>-</div><div> EXTRA_OECONF_PATHS = "\</div><div> --with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \</div><div> --with-sysroot=/not/exist \</div></div><div><br></div><div>3) morty to pyro</div><div>no changes in patches</div><div><br></div><div>4) morty to morty-next (from Juro)</div><div><br></div><div>5.4 now also have a backport of CVE-2016-6131.patch</div><div><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:small;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch changes were backported</span><br></div><div><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:small;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:small;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch Upstream-Status fix was included in 6.4 upgrade</span><br></span></div><div><span style="text-align:start;text-indent:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><span style="text-align:start;text-indent:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">0056-LRA-PR70904-relax-the-restriction-on-subreg-reload-f.patch was backported<br></span></span></div><div><span style="text-align:start;text-indent:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><span style="text-align:start;text-indent:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">duplicate 0057-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch wasn't added to backport folder (it's already in gcc-6.4 as it it was backported from master)<br></span></span></div><div><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:small;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:small;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><br></span></span></div><div><div>docker-shr @ ~/openembedded-core $ git diff origin/morty-next contrib/jansa/morty-backports --stat</div><div> meta/recipes-devtools/gcc/gcc-5.4.inc | 1 +</div><div> meta/recipes-devtools/gcc/gcc-5.4/CVE-2016-6131.patch | 251 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div> meta/recipes-devtools/gcc/gcc-6.4.inc | 4 ++-</div><div> meta/recipes-devtools/gcc/gcc-6.4/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++</div><div> meta/recipes-devtools/gcc/gcc-6.4/0041-ssp_nonshared.patch | 28 -----------------</div><div> meta/recipes-devtools/gcc/gcc-6.4/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch | 2 +-</div><div> meta/recipes-devtools/gcc/gcc-6.4/0056-LRA-PR70904-relax-the-restriction-on-subreg-reload-f.patch | 51 +++++++++++++++++++++++++++++++</div><div> meta/recipes-devtools/gcc/gcc-6.4/backport/0057-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch | 194 -------------------------------------------------------------------------------------------------------------------</div><div> meta/recipes-devtools/gcc/gcc-runtime.inc | 2 ++</div><div> 9 files changed, 396 insertions(+), 224 deletions(-)</div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Mar 10, 2018 at 10:34 PM, Richard Purdie <span dir="ltr"><<a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Sat, 2018-03-10 at 22:04 +0100, Martin Jansa wrote:<br>
> Feel free to ignore my feedback.<br>
><br>
> I didn't mean it as strong objection to get this merged as-is.<br>
><br>
> It was rather an advice for next time or in case another version is<br>
> sent (e.g. with that missing patch from Khem) and Juro decides to<br>
> rework it in order to save himself some time later when preparing the<br>
> changes for pyro and rocko (as he said in the e-mail that he plans to<br>
> prepare). It shouldn't be too difficult to rework anyway, because<br>
> Andre already has the cherry-picks for morty and Juro can do just<br>
> rebase of his change on top of that to get those new patches in<br>
> separate commit.<br>
<br>
</span>Juro's mail reply was a bit messed up with formatting but that missing<br>
arm patch appeared to cause an internal compiler error when compiling<br>
valgrind for x86-64 and I suspect that is why its missing. If we do<br>
want to consider that one I'd probably make it a separate issue.<br>
<br>
I can't really merge anything due to our backports policy until we have<br>
at least the pyro patches sorted. I'm still torn on which way to go but<br>
if someone can pull together a good set of patches for the various<br>
branches I would take it. I'm also pretty sure Juro will be fine if<br>
someone wants to break that patch up.<br>
<br>
Cheers,<br>
<br>
Richard<br>
<br>
<br>
</blockquote></div><br></div>