arm/build: Add missing sections

kees · ingomolnar · commit 512dd2eebe55 · 2020-09-01T10:03:18.000+02:00
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
@@ -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
@@ -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
@@ -149,6 +149,7 @@ SECTIONS
 	_end = .;
 
 	STABS_DEBUG
+	DWARF_DEBUG
 	ARM_DETAILS
 }
 

Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ SECTIONS`
`150`	`150`	`_end = .;`
`151`	`151`
`152`	`152`	`STABS_DEBUG`
	`153`	`+ DWARF_DEBUG`
`153`	`154`	`ARM_DETAILS`
`154`	`155`	`}`
`155`	`156`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ SECTIONS`
`149`	`149`	`_end = .;`
`150`	`150`
`151`	`151`	`STABS_DEBUG`
	`152`	`+ DWARF_DEBUG`
`152`	`153`	`ARM_DETAILS`
`153`	`154`	`}`
`154`	`155`