From a4fbf60f6e4ccbdb43e82416baf6f9f93cffb3b1 Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Fri, 21 May 2021 10:01:44 -0700 Subject: [PATCH] ANDROID: vmlinux.lds.h: Keep .eh_frame with CFI Specify a placement for the .eh_frame section to avoid orphan section warnings from the linker. Bug: 188764690 Change-Id: I34e09b7e7370a36cafaa96644f93b4740c02800f Signed-off-by: Sami Tolvanen --- include/asm-generic/vmlinux.lds.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index fde8db0040c4..7580066e507d 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -824,12 +824,22 @@ *(COMMON) \ } +/* + * Keep .eh_frame with CFI. + */ +#ifdef CONFIG_CFI_CLANG +#define EH_FRAME .eh_frame : { *(.eh_frame) } +#else +#define EH_FRAME +#endif + /* * DWARF debug sections. * Symbols in the DWARF debugging sections are relative to * the beginning of the section so we begin them at 0. */ #define DWARF_DEBUG \ + EH_FRAME \ /* DWARF 1 */ \ .debug 0 : { *(.debug) } \ .line 0 : { *(.line) } \