linux-yocto/4.19/5.2/-dev: fix gcc10 build

Integrating Khem's gcc10 build fix:

[
    Author: Khem Raj <raj.khem@gmail.com>
    Date:   Fri Dec 20 17:42:02 2019 -0800

        x86/boot/compressed/64: Define __force_order only when CONFIG_RANDOMIZE_BASE is unset

        kaslr_64.c also defines the same variable, however when both files are
        included into final link, linker complains about multiple definition of
        `__force_order' which is coming from kaslr_64.o and pgtable_64.o, its
        possible that kaslr_64.o is disabled via CONFIG_RANDOMIZE_BASE config
        option, therefore define it conditionally only when
        CONFIG_RANDOMIZE_BASE is not set

        Signed-off-by: Khem Raj <raj.khem@gmail.com>
        Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
        Cc: Kees Cook <keescook@chromium.org>
        Cc: "H. Peter Anvin" <hpa@zytor.com>
        Cc: Ingo Molnar <mingo@redhat.com>
        Cc: Thomas Gleixner <tglx@linutronix.de>
        Cc: x86-ml <x86@kernel.org>
        Cc: Arnd Bergmann <arnd@arndb.de>
        Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]

(From OE-Core rev: 201965ba510830561a8c1c38f7c111207f604d03)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d3112fcf7283b9c015e77db1b0a1a78044ed2e23)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bruce Ashfield
2019-12-29 22:07:19 -05:00
committed by Richard Purdie
parent 888526098a
commit 9c5e784874
6 changed files with 23 additions and 23 deletions

View File

@@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine_qemuarm ?= "6e7574e9a9b41143e0c42fcb31b13802529602f0"
SRCREV_machine ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1"
SRCREV_machine_qemuarm ?= "bd239fb802a15c2759ea456dd1f09f5e106fc88a"
SRCREV_machine ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656"
SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a"
PV = "${LINUX_VERSION}+git${SRCPV}"