From 536adca27b68efd116bfedf35dbccfa5f79952c3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 24 Jun 2020 07:31:46 +0200 Subject: [PATCH] Revert "ANDROID: kbuild: merge more sections with LTO" This reverts commit 269e56aa35625cc17b7672c683223127333ab5ef as the LTO feature causes merge issues with 5.8-rc1. So remove it for now and allow the developer to add the latest version of the patches later on. Cc: Sami Tolvanen Signed-off-by: Greg Kroah-Hartman Change-Id: I0f30445f7c4da610be9ac865c005d152b0d0b2c8 --- scripts/module-lto.lds.S | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/scripts/module-lto.lds.S b/scripts/module-lto.lds.S index 4ff8eb63a745..c0f4fdeb84a0 100644 --- a/scripts/module-lto.lds.S +++ b/scripts/module-lto.lds.S @@ -15,22 +15,12 @@ SECTIONS { *(.eh_frame) } - __patchable_function_entries : { *(__patchable_function_entries) } - - .bss : { - *(.bss .bss.[0-9a-zA-Z_]*) - *(.bss..L* .bss..compoundliteral*) - } - - .data : { - *(.data .data.[0-9a-zA-Z_]*) - *(.data..L* .data..compoundliteral*) - } - - .rodata : { - *(.rodata .rodata.[0-9a-zA-Z_]*) - *(.rodata..L* .rodata..compoundliteral*) - } + .bss : { *(.bss .bss.[0-9a-zA-Z_]*) } + .data : { *(.data .data.[0-9a-zA-Z_]*) } + .rela.data : { *(.rela.data .rela.data.[0-9a-zA-Z_]*) } + .rela.rodata : { *(.rela.rodata .rela.rodata.[0-9a-zA-Z_]*) } + .rela.text : { *(.rela.text .rela.text.[0-9a-zA-Z_]*) } + .rodata : { *(.rodata .rodata.[0-9a-zA-Z_]*) } /* * With CFI_CLANG, ensure __cfi_check is at the beginning of the @@ -40,4 +30,5 @@ SECTIONS { *(.text.__cfi_check) *(.text .text.[0-9a-zA-Z_]* .text..L.cfi*) } + }