Skip to contentSkip to conversation

x86/build changes for v5.3

GIT PULL Merged Ingo Molnar 2 participants 2 messages Jul 8, 2019 – Jul 9, 2019 x86

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-build-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-build-for-linus

# HEAD: 87b61864d7ab2aec5c212ff18950d4972f0dfb4e x86/build: Remove redundant 'clean-files += capflags.c'

Two kbuild enhancements by Masahiro Yamada.

Thanks,

Ingo

------------------>
Masahiro Yamada (2):
x86/build: Add 'set -e' to mkcapflags.sh to delete broken capflags.c x86/build: Remove redundant 'clean-files += capflags.c'

 arch/x86/kernel/cpu/Makefile      | 3 +--
 arch/x86/kernel/cpu/mkcapflags.sh | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/Makefile +1 -2
index 5102bf7c8192..50abae9a72e5 100644
@@ -54,8 +54,7 @@ quiet_cmd_mkcapflags = MKCAP   $@
 
 cpufeature = $(src)/../../include/asm/cpufeatures.h
 
-targets += capflags.c
 $(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE
 	$(call if_changed,mkcapflags)
 endif
-clean-files += capflags.c
+targets += capflags.c
arch/x86/kernel/cpu/mkcapflags.sh +2 -0
index d0dfb892c72f..aed45b8895d5 100644
@@ -4,6 +4,8 @@
 # Generate the x86_cap/bug_flags[] arrays from include/asm/cpufeatures.h
 #
 
+set -e
+
 IN=$1
 OUT=$2