The following commit has been merged into the core/build branch of tip: Commit-ID: 512dd2eebe5585893412e0c8bec8dbfe2dead6c8 Gitweb: https://git.kernel.org/tip/512dd2eebe5585893412e0c8bec8dbfe2dead6c8 Author: Kees Cook <keesc...@chromium.org> AuthorDate: Fri, 21 Aug 2020 12:42:58 -07:00 Committer: Ingo Molnar <mi...@kernel.org> CommitterDate: Tue, 01 Sep 2020 10:03:18 +02:00
arm/build: Add missing sections Add missing text stub sections .vfp11_veneer and .v4_bx, as well as missing DWARF sections, when present in the build. Signed-off-by: Kees Cook <keesc...@chromium.org> Signed-off-by: Ingo Molnar <mi...@kernel.org> Reviewed-by: Nick Desaulniers <ndesaulni...@google.com> Cc: Russell King <li...@armlinux.org.uk> Link: https://lore.kernel.org/r/20200821194310.3089815-18-keesc...@chromium.org --- arch/arm/include/asm/vmlinux.lds.h | 4 +++- arch/arm/kernel/vmlinux-xip.lds.S | 1 + arch/arm/kernel/vmlinux.lds.S | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/vmlinux.lds.h b/arch/arm/include/asm/vmlinux.lds.h index c4af518..6624dd9 100644 --- a/arch/arm/include/asm/vmlinux.lds.h +++ b/arch/arm/include/asm/vmlinux.lds.h @@ -59,7 +59,9 @@ #define ARM_STUBS_TEXT \ *(.gnu.warning) \ *(.glue_7) \ - *(.glue_7t) + *(.glue_7t) \ + *(.vfp11_veneer) \ + *(.v4_bx) #define ARM_TEXT \ IDMAP_TEXT \ diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S index 57fcbf5..11ffa79 100644 --- a/arch/arm/kernel/vmlinux-xip.lds.S +++ b/arch/arm/kernel/vmlinux-xip.lds.S @@ -150,6 +150,7 @@ SECTIONS _end = .; STABS_DEBUG + DWARF_DEBUG ARM_DETAILS } diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 1d3d3b5..dc672fe 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -149,6 +149,7 @@ SECTIONS _end = .; STABS_DEBUG + DWARF_DEBUG ARM_DETAILS }
