Commit b9916af7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v5.7' of... 

Merge tag 'kbuild-fixes-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - fix scripts/config to properly handle ':' in string type CONFIG
   options

 - fix unneeded rebuilds of DT schema check rule

 - git rid of ordering dependency between <linux/vermagic.h> and
   <linux/module.h> to fix build errors in some network drivers

 - clean up generated headers of host arch with 'make ARCH=um mrproper'

* tag 'kbuild-fixes-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  h8300: ignore vmlinux.lds
  Documentation: kbuild: fix the section title format
  um: ensure `make ARCH=um mrproper` removes arch/$(SUBARCH)/include/generated/
  arch: split MODULE_ARCH_VERMAGIC definitions out to <asm/vermagic.h>
  kbuild: fix DT binding schema rule again to avoid needless rebuilds
  scripts/config: allow colons in option strings for sed
parents 9a195628 d9451798

Documentation/kbuild/makefiles.rst

+2 −1
Original line number Diff line number Diff line
@@ -1241,7 +1241,8 @@ When kbuild executes, the following steps are followed (roughly): 
	will be displayed with "make KBUILD_VERBOSE=0".





--- 6.9 Preprocessing linker scripts

6.9 Preprocessing linker scripts

--------------------------------



	When the vmlinux image is built, the linker script

	arch/$(ARCH)/kernel/vmlinux.lds is used.

arch/arc/include/asm/module.h

+0 −5
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
 * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)

 *

 * Amit Bhor, Sameer Dhavale: Codito Technologies 2004



 */



#ifndef _ASM_ARC_MODULE_H
@@ -19,8 +18,4 @@ struct mod_arch_specific { 
	const char *secstr;

};



#define MODULE_PROC_FAMILY "ARC700"



#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY



#endif /* _ASM_ARC_MODULE_H */

arch/arc/include/asm/vermagic.h

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



#ifndef _ASM_VERMAGIC_H

#define _ASM_VERMAGIC_H



#define MODULE_ARCH_VERMAGIC "ARC700"



#endif /* _ASM_VERMAGIC_H */

arch/arm/include/asm/module.h

+0 −24
Original line number Diff line number Diff line
@@ -37,30 +37,6 @@ struct mod_arch_specific { 
struct module;

u32 get_module_plt(struct module *mod, unsigned long loc, Elf32_Addr val);



/*

 * Add the ARM architecture version to the version magic string

 */

#define MODULE_ARCH_VERMAGIC_ARMVSN "ARMv" __stringify(__LINUX_ARM_ARCH__) " "



/* Add __virt_to_phys patching state as well */

#ifdef CONFIG_ARM_PATCH_PHYS_VIRT

#define MODULE_ARCH_VERMAGIC_P2V "p2v8 "

#else

#define MODULE_ARCH_VERMAGIC_P2V ""

#endif



/* Add instruction set architecture tag to distinguish ARM/Thumb kernels */

#ifdef CONFIG_THUMB2_KERNEL

#define MODULE_ARCH_VERMAGIC_ARMTHUMB "thumb2 "

#else

#define MODULE_ARCH_VERMAGIC_ARMTHUMB ""

#endif



#define MODULE_ARCH_VERMAGIC \

	MODULE_ARCH_VERMAGIC_ARMVSN \

	MODULE_ARCH_VERMAGIC_ARMTHUMB \

	MODULE_ARCH_VERMAGIC_P2V



#ifdef CONFIG_THUMB2_KERNEL

#define HAVE_ARCH_KALLSYMS_SYMBOL_VALUE

static inline unsigned long kallsyms_symbol_value(const Elf_Sym *sym)

arch/arm/include/asm/vermagic.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_VERMAGIC_H

#define _ASM_VERMAGIC_H



#include <linux/stringify.h>



/*

 * Add the ARM architecture version to the version magic string

 */

#define MODULE_ARCH_VERMAGIC_ARMVSN "ARMv" __stringify(__LINUX_ARM_ARCH__) " "



/* Add __virt_to_phys patching state as well */

#ifdef CONFIG_ARM_PATCH_PHYS_VIRT

#define MODULE_ARCH_VERMAGIC_P2V "p2v8 "

#else

#define MODULE_ARCH_VERMAGIC_P2V ""

#endif



/* Add instruction set architecture tag to distinguish ARM/Thumb kernels */

#ifdef CONFIG_THUMB2_KERNEL

#define MODULE_ARCH_VERMAGIC_ARMTHUMB "thumb2 "

#else

#define MODULE_ARCH_VERMAGIC_ARMTHUMB ""

#endif



#define MODULE_ARCH_VERMAGIC \

	MODULE_ARCH_VERMAGIC_ARMVSN \

	MODULE_ARCH_VERMAGIC_ARMTHUMB \

	MODULE_ARCH_VERMAGIC_P2V



#endif /* _ASM_VERMAGIC_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE