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 <keescook@chromium.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Cc: Russell King <linux@armlinux.org.uk>
Link: https://lore.kernel.org/r/20200821194310.3089815-18-keescook@chromium.org

diff --git a/arch/arm/include/asm/vmlinux.lds.h b/arch/arm/include/asm/vmlinux.lds.h
index c4af5182ab48d096eed15daee7026c192c15f91c..6624dd97475cfa12d7c30cdc6778a891e1c15b6b 100644 (file)
--- 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 57fcbf55f91331774c938cbabf124f6238d6beee..11ffa79751da6e71401cb6f076331b5cfabdf1ff 100644 (file)
--- 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 1d3d3b599635a655fa1cfc24f2285e1d71f2af37..dc672fe35de38fe714b8369390231bbe7abaf6ac 100644 (file)
--- 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
 }