Commit d7e3b065 authored by Kees Cook's avatar Kees Cook Committed by Ingo Molnar
Browse files

arm/build: Refactor linker script headers 



In preparation for adding --orphan-handling=warn, refactor the linker
script header includes, and extract common macros.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Link: https://lore.kernel.org/r/20200821194310.3089815-16-keescook@chromium.org
parent be288182

arch/arm/kernel/vmlinux.lds.h→arch/arm/include/asm/vmlinux.lds.h

+8 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#include <asm-generic/vmlinux.lds.h>



#ifdef CONFIG_HOTPLUG_CPU

#define ARM_CPU_DISCARD(x)
@@ -49,8 +50,12 @@ 
		EXIT_CALL						\

		ARM_MMU_DISCARD(*(.text.fixup))				\

		ARM_MMU_DISCARD(*(__ex_table))				\

		*(.discard)						\

		*(.discard.*)

		COMMON_DISCARDS



#define ARM_STUBS_TEXT							\

		*(.gnu.warning)						\

		*(.glue_7)						\

		*(.glue_7t)



#define ARM_TEXT							\

		IDMAP_TEXT						\
@@ -64,9 +69,7 @@ 
		CPUIDLE_TEXT						\

		LOCK_TEXT						\

		KPROBES_TEXT						\

		*(.gnu.warning)						\

		*(.glue_7)						\

		*(.glue_7t)						\

		ARM_STUBS_TEXT						\

		. = ALIGN(4);						\

		*(.got)			/* Global offset table */	\

		ARM_CPU_KEEP(PROC_INFO)

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

+1 −3
Original line number Diff line number Diff line
@@ -9,15 +9,13 @@ 


#include <linux/sizes.h>



#include <asm-generic/vmlinux.lds.h>

#include <asm/vmlinux.lds.h>

#include <asm/cache.h>

#include <asm/thread_info.h>

#include <asm/memory.h>

#include <asm/mpu.h>

#include <asm/page.h>



#include "vmlinux.lds.h"



OUTPUT_ARCH(arm)

ENTRY(stext)

arch/arm/kernel/vmlinux.lds.S

+1 −3
Original line number Diff line number Diff line
@@ -9,15 +9,13 @@ 
#else



#include <linux/pgtable.h>

#include <asm-generic/vmlinux.lds.h>

#include <asm/vmlinux.lds.h>

#include <asm/cache.h>

#include <asm/thread_info.h>

#include <asm/memory.h>

#include <asm/mpu.h>

#include <asm/page.h>



#include "vmlinux.lds.h"



OUTPUT_ARCH(arm)

ENTRY(stext)

CRA Git | Maintained and supported by SUSTech CRA and CCSE