summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-03 15:43:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-03 15:43:00 -0700
commit33ef765ea66f8464d6b65798b5aed3713420cced (patch)
treed256be5a60ac7b34923cff5ce918ebf39198904a /arch
parente7a38766d2e691e8030b77c9b46b19c9359e0d6c (diff)
parenta9358bc3531901a15e2f7cd48550c9555fc0288f (diff)
downloadlinux-33ef765ea66f8464d6b65798b5aed3713420cced.tar.bz2
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull x86 build cleanups from Ingo Molnar: "Two small build related cleanups" * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/build: Supress realmode.bin is up to date message compiler-intel.h: Remove duplicate definition
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/realmode/rm/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
index 3497f14e4dea..7c0d7be176a5 100644
--- a/arch/x86/realmode/rm/Makefile
+++ b/arch/x86/realmode/rm/Makefile
@@ -52,8 +52,9 @@ $(obj)/realmode.elf: $(obj)/realmode.lds $(REALMODE_OBJS) FORCE
OBJCOPYFLAGS_realmode.bin := -O binary
targets += realmode.bin
-$(obj)/realmode.bin: $(obj)/realmode.elf $(obj)/realmode.relocs
+$(obj)/realmode.bin: $(obj)/realmode.elf $(obj)/realmode.relocs FORCE
$(call if_changed,objcopy)
+ @:
quiet_cmd_relocs = RELOCS $@
cmd_relocs = arch/x86/tools/relocs --realmode $< > $@