android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: kbuild: don't preprocess module-lto.lds

Browse Source 
__cfi_check needs to be aligned to 4k, not necessarily PAGE_SIZE.
Furthermore, using arch-specific includes currently breaks `make
scripts`.

Bug: 165591024
Change-Id: Id80fce84d4c111374718d8d84e7c06812a5d4e4b
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
This commit is contained in:
Sami Tolvanen 2020-08-19 08:53:00 -07:00
parent d88b2969cf
commit f58c4d2771
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -873,7 +873,7 @@ LD_FLAGS_LTO_CLANG := -mllvm -import-instr-limit=5
KBUILD_LDFLAGS += $(LD_FLAGS_LTO_CLANG) KBUILD_LDFLAGS += $(LD_FLAGS_LTO_CLANG)
KBUILD_LDFLAGS_MODULE += $(LD_FLAGS_LTO_CLANG) KBUILD_LDFLAGS_MODULE += $(LD_FLAGS_LTO_CLANG)
KBUILD_LDS_MODULE += scripts/module-lto.lds KBUILD_LDS_MODULE += $(srctree)/scripts/module-lto.lds
endif endif
ifdef CONFIG_LTO ifdef CONFIG_LTO

2
scripts/Makefile
View File

@ -31,8 +31,6 @@ always := $(hostprogs-y) $(hostprogs-m)
# The following hostprogs-y programs are only build on demand # The following hostprogs-y programs are only build on demand
hostprogs-y += unifdef hostprogs-y += unifdef
extra-$(CONFIG_LTO_CLANG) += module-lto.lds
subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins
subdir-$(CONFIG_MODVERSIONS) += genksyms subdir-$(CONFIG_MODVERSIONS) += genksyms
subdir-$(CONFIG_SECURITY_SELINUX) += selinux subdir-$(CONFIG_SECURITY_SELINUX) += selinux

6
scripts/module-lto.lds.S → scripts/module-lto.lds
View File

@ -1,6 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <asm/page.h>
/* /*
* With CONFIG_LTO_CLANG, LLD always enables -fdata-sections and * With CONFIG_LTO_CLANG, LLD always enables -fdata-sections and
* -ffunction-sections, which increases the size of the final module. * -ffunction-sections, which increases the size of the final module.
@ -32,9 +30,9 @@ SECTIONS {
/* /*
* With CFI_CLANG, ensure __cfi_check is at the beginning of the * With CFI_CLANG, ensure __cfi_check is at the beginning of the
* .text section, and that the section is aligned to page size. * .text section, and that the section is aligned to 4k.
*/ */
.text : ALIGN(PAGE_SIZE) { .text : ALIGN(4096) {
*(.text.__cfi_check) *(.text.__cfi_check)
*(.text .text.[0-9a-zA-Z_]* .text..L.cfi*) *(.text .text.[0-9a-zA-Z_]* .text..L.cfi*)
} }