Commit c101d8f7 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Felix Fu
Browse files

No idea why this broke ... 

maillist inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8KNA9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git/commit/?h=arm-kaslr-latest&id=b4fa1dbef0cac754a6daec1dec575540967dc240



-------------------------------------------------

Gcc flag '-fvisibility=hidden' specifies the visibility attribute for external linkage entities in object files.
You can also selectively set visibility attributes for entities by using pairs of the #pragma GCC visibility push
and #pragma GCC visibility pop compiler directives throughout your source program.when we include the hidden.h,
__bss_start and __bss_end went from global symbol to local symbol,so we need to modify the regular expression to
accommodate this change.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarGaosheng Cui <cuigaosheng1@huawei.com>

Conflicts:
    Merge OLK-5.10 fix patch d8ed1902

Signed-off-by: default avatarFelix Fu <fuzhen5@huawei.com>
parent 60c8a2d4

arch/arm/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ asflags-y := -DZIMAGE 


# Supply kernel BSS size to the decompressor via a linker symbol.

KBSS_SZ = $(shell echo $$(($$($(NM) vmlinux | \

		sed -n -e 's/^\([^ ]*\) [ABD] __bss_start$$/-0x\1/p' \

		       -e 's/^\([^ ]*\) [ABD] __bss_stop$$/+0x\1/p') )) )

		sed -n -e 's/^\([^ ]*\) [ABDb] __bss_start$$/-0x\1/p' \

		       -e 's/^\([^ ]*\) [ABDb] __bss_stop$$/+0x\1/p') )) )

LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)

# Supply ZRELADDR to the decompressor via a linker symbol.

ifneq ($(CONFIG_AUTO_ZRELADDR),y)