lkml.org 
[lkml]   [2020]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 22/36] arm/build: Refactor linker script headers
    Date
    In preparation for adding --orphan-handling=warn, refactor the linker
    script header includes, and extract common macros.

    Signed-off-by: Kees Cook <keescook@chromium.org>
    ---
    arch/arm/{kernel => include/asm}/vmlinux.lds.h | 13 ++++++++-----
    arch/arm/kernel/vmlinux-xip.lds.S | 4 +---
    arch/arm/kernel/vmlinux.lds.S | 4 +---
    3 files changed, 10 insertions(+), 11 deletions(-)
    rename arch/arm/{kernel => include/asm}/vmlinux.lds.h (96%)

    diff --git a/arch/arm/kernel/vmlinux.lds.h b/arch/arm/include/asm/vmlinux.lds.h
    similarity index 96%
    rename from arch/arm/kernel/vmlinux.lds.h
    rename to arch/arm/include/asm/vmlinux.lds.h
    index 381a8e105fa5..a08f4301b718 100644
    --- a/arch/arm/kernel/vmlinux.lds.h
    +++ b/arch/arm/include/asm/vmlinux.lds.h
    @@ -1,4 +1,5 @@
    /* 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)
    diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S
    index 3d4e88f08196..904c31fa20ed 100644
    --- a/arch/arm/kernel/vmlinux-xip.lds.S
    +++ b/arch/arm/kernel/vmlinux-xip.lds.S
    @@ -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)

    diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
    index 5592f14b7e35..bb950c896a67 100644
    --- a/arch/arm/kernel/vmlinux.lds.S
    +++ b/arch/arm/kernel/vmlinux.lds.S
    @@ -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)

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-08-01 01:18    [W:2.160 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site