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

Commit 47b4c77d authored Mar 05, 2018 by Nicolas Pitre

ARM: linker script: factor out stuff for the .text section



Move common entries to vmlinux.lds.h as ARM_TEXT.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Tested-by: Chris Brandt <Chris.Brandt@renesas.com>

parent ab42fad0

arch/arm/kernel/vmlinux-xip.lds.S

+1 −18

Original line number	Diff line number	Diff line
		@@ -53,24 +53,7 @@ SECTIONS

		.text : { /* Real text segment */
		_stext = .; /* Text and read-only data */
		IDMAP_TEXT
		__entry_text_start = .;
		*(.entry.text)
		__entry_text_end = .;
		IRQENTRY_TEXT
		SOFTIRQENTRY_TEXT
		TEXT_TEXT
		SCHED_TEXT
		CPUIDLE_TEXT
		LOCK_TEXT
		HYPERVISOR_TEXT
		KPROBES_TEXT
		*(.gnu.warning)
		*(.glue_7)
		*(.glue_7t)
		. = ALIGN(4);
		(.got) / Global offset table */
		ARM_CPU_KEEP(PROC_INFO)
		ARM_TEXT
		}

		RO_DATA(PAGE_SIZE)

arch/arm/kernel/vmlinux.lds.S

+1 −18

Original line number	Diff line number	Diff line
		@@ -56,24 +56,7 @@ SECTIONS

		.text : { /* Real text segment */
		_stext = .; /* Text and read-only data */
		IDMAP_TEXT
		__entry_text_start = .;
		*(.entry.text)
		__entry_text_end = .;
		IRQENTRY_TEXT
		SOFTIRQENTRY_TEXT
		TEXT_TEXT
		SCHED_TEXT
		CPUIDLE_TEXT
		LOCK_TEXT
		HYPERVISOR_TEXT
		KPROBES_TEXT
		*(.gnu.warning)
		*(.glue_7)
		*(.glue_7t)
		. = ALIGN(4);
		(.got) / Global offset table */
		ARM_CPU_KEEP(PROC_INFO)
		ARM_TEXT
		}

		#ifdef CONFIG_DEBUG_ALIGN_RODATA

arch/arm/kernel/vmlinux.lds.h

+20 −0

Original line number	Diff line number	Diff line
		@@ -58,3 +58,23 @@
		ARM_MMU_DISCARD(*(__ex_table)) \
		*(.discard) \
		(.discard.)

		#define ARM_TEXT \
		IDMAP_TEXT \
		__entry_text_start = .; \
		*(.entry.text) \
		__entry_text_end = .; \
		IRQENTRY_TEXT \
		SOFTIRQENTRY_TEXT \
		TEXT_TEXT \
		SCHED_TEXT \
		CPUIDLE_TEXT \
		LOCK_TEXT \
		HYPERVISOR_TEXT \
		KPROBES_TEXT \
		*(.gnu.warning) \
		*(.glue_7) \
		*(.glue_7t) \
		. = ALIGN(4); \
		(.got) / Global offset table */ \
		ARM_CPU_KEEP(PROC_INFO)