ANDROID: arm64: Place CFI jump table sections in .text

After the switch to non-canonical CFI jump tables, the jump table
sections were placed after the .text section. Merge these sections
into .text to fix issues with error injection and kallsyms.

Bug: 225079388
Bug: 190422440
Change-Id: I6c81b3e4dbba62739f7fc5f6b45271c54f278c8f
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
[nathan: This change is necessary in android-4.19 to boot after upstream
         LLVM commit 7b346357db30 ("[ELF] Orphan placement: prefer the
         last similar section when its rank <= orphan's rank"), which
         changes how sections not described in linker scripts are laid
         out in the final binary]
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
This commit is contained in:
Sami Tolvanen
2022-04-15 12:16:50 -07:00
committed by Treehugger Robot
parent 302e1d9773
commit 4e7313f026

View File

@@ -134,6 +134,7 @@ SECTIONS
IDMAP_TEXT
HIBERNATE_TEXT
TRAMP_TEXT
*(.text..L.cfi.jumptable .text..L.cfi.jumptable.*)
*(.fixup)
*(.gnu.warning)
. = ALIGN(16);