Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d10cc8e authored by Sami Tolvanen's avatar Sami Tolvanen
Browse files

FROMLIST: kbuild: fix LD_DEAD_CODE_DATA_ELIMINATION 

Don't remove .head.text or .exitcall.exit when linking with --gc-sections,
and include .init.text.* in .init.text and .init.rodata.* in .init.rodata.

Bug: 62093296
Bug: 67506682
Change-Id: Ia0f9e735d04c2322dcc8bcfc94241f0551b149c4
(am from https://patchwork.kernel.org/patch/10085773/

)
Reviewed-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 4f9dc803

include/asm-generic/vmlinux.lds.h

+18 −18
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
#ifdef CONFIG_FTRACE_MCOUNT_RECORD

#define MCOUNT_REC()	. = ALIGN(8);				\

			VMLINUX_SYMBOL(__start_mcount_loc) = .; \

			*(__mcount_loc)				\

			KEEP(*(__mcount_loc))			\

			VMLINUX_SYMBOL(__stop_mcount_loc) = .;

#else

#define MCOUNT_REC()
@@ -139,10 +139,10 @@ 
#ifdef CONFIG_EVENT_TRACING

#define FTRACE_EVENTS()	. = ALIGN(8);					\

			VMLINUX_SYMBOL(__start_ftrace_events) = .;	\

			*(_ftrace_events)				\

			KEEP(*(_ftrace_events))				\

			VMLINUX_SYMBOL(__stop_ftrace_events) = .;	\

			VMLINUX_SYMBOL(__start_ftrace_enum_maps) = .;	\

			*(_ftrace_enum_map)				\

			KEEP(*(_ftrace_enum_map))			\

			VMLINUX_SYMBOL(__stop_ftrace_enum_maps) = .;

#else

#define FTRACE_EVENTS()
@@ -185,8 +185,8 @@ 
#define _OF_TABLE_1(name)						\

	. = ALIGN(8);							\

	VMLINUX_SYMBOL(__##name##_of_table) = .;			\

	*(__##name##_of_table)						\

	*(__##name##_of_table_end)

	KEEP(*(__##name##_of_table))					\

	KEEP(*(__##name##_of_table_end))



#define CLKSRC_OF_TABLES()	OF_TABLE(CONFIG_CLKSRC_OF, clksrc)

#define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip)
@@ -304,28 +304,28 @@ 
	/* PCI quirks */						\

	.pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {	\

		VMLINUX_SYMBOL(__start_pci_fixups_early) = .;		\

		*(.pci_fixup_early)					\

		KEEP(*(.pci_fixup_early))				\

		VMLINUX_SYMBOL(__end_pci_fixups_early) = .;		\

		VMLINUX_SYMBOL(__start_pci_fixups_header) = .;		\

		*(.pci_fixup_header)					\

		KEEP(*(.pci_fixup_header))				\

		VMLINUX_SYMBOL(__end_pci_fixups_header) = .;		\

		VMLINUX_SYMBOL(__start_pci_fixups_final) = .;		\

		*(.pci_fixup_final)					\

		KEEP(*(.pci_fixup_final))				\

		VMLINUX_SYMBOL(__end_pci_fixups_final) = .;		\

		VMLINUX_SYMBOL(__start_pci_fixups_enable) = .;		\

		*(.pci_fixup_enable)					\

		KEEP(*(.pci_fixup_enable))				\

		VMLINUX_SYMBOL(__end_pci_fixups_enable) = .;		\

		VMLINUX_SYMBOL(__start_pci_fixups_resume) = .;		\

		*(.pci_fixup_resume)					\

		KEEP(*(.pci_fixup_resume))				\

		VMLINUX_SYMBOL(__end_pci_fixups_resume) = .;		\

		VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .;	\

		*(.pci_fixup_resume_early)				\

		KEEP(*(.pci_fixup_resume_early))			\

		VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .;	\

		VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .;		\

		*(.pci_fixup_suspend)					\

		KEEP(*(.pci_fixup_suspend))				\

		VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .;		\

		VMLINUX_SYMBOL(__start_pci_fixups_suspend_late) = .;	\

		*(.pci_fixup_suspend_late)				\

		KEEP(*(.pci_fixup_suspend_late))			\

		VMLINUX_SYMBOL(__end_pci_fixups_suspend_late) = .;	\

	}								\

									\
@@ -512,7 +512,7 @@ 
		VMLINUX_SYMBOL(__softirqentry_text_end) = .;



/* Section used for early init (in .S files) */

#define HEAD_TEXT  *(.head.text)

#define HEAD_TEXT  KEEP(*(.head.text))



#define HEAD_TEXT_SECTION							\

	.head.text : AT(ADDR(.head.text) - LOAD_OFFSET) {		\
@@ -557,7 +557,7 @@ 
	MEM_DISCARD(init.data)						\

	KERNEL_CTORS()							\

	MCOUNT_REC()							\

	*(.init.rodata)							\

	*(.init.rodata .init.rodata.*)					\

	FTRACE_EVENTS()							\

	TRACE_SYSCALLS()						\

	KPROBE_BLACKLIST()						\
@@ -575,7 +575,7 @@ 
	EARLYCON_TABLE()



#define INIT_TEXT							\

	*(.init.text)							\

	*(.init.text .init.text.*)					\

	*(.text.startup)						\

	MEM_DISCARD(init.text)
@@ -592,7 +592,7 @@ 
	MEM_DISCARD(exit.text)



#define EXIT_CALL							\

	*(.exitcall.exit)

	KEEP(*(.exitcall.exit))



/*

 * bss (Block Started by Symbol) - uninitialized data
@@ -697,7 +697,7 @@ 
#define INIT_SETUP(initsetup_align)					\

		. = ALIGN(initsetup_align);				\

		VMLINUX_SYMBOL(__setup_start) = .;			\

		*(.init.setup)						\

		KEEP(*(.init.setup))					\

		VMLINUX_SYMBOL(__setup_end) = .;



#define INIT_CALLS_LEVEL(level)						\