linux-kernel - [tip:x86/trampoline] x86, realmode: build fix: remove duplicate build

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-c5403aed044e23f8d1ecdf05d0ff120314186527@git.kernel.org>
Date:	Wed, 9 May 2012 15:01:53 -0700
From:	tip-bot for Jarkko Sakkinen <jarkko.sakkinen@...el.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
	sam@...nborg.org, mmarek@...e.cz, jarkko.sakkinen@...el.com,
	tglx@...utronix.de, hpa@...ux.intel.com
Subject: [tip:x86/trampoline] x86, realmode: build fix:
  remove duplicate build

Commit-ID:  c5403aed044e23f8d1ecdf05d0ff120314186527
Gitweb:     http://git.kernel.org/tip/c5403aed044e23f8d1ecdf05d0ff120314186527
Author:     Jarkko Sakkinen <jarkko.sakkinen@...el.com>
AuthorDate: Wed, 9 May 2012 23:25:06 +0300
Committer:  H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Wed, 9 May 2012 13:32:17 -0700

x86, realmode: build fix: remove duplicate build

Real-mode binary was built twice. This patch fixes
the issue by making realmode.relocs as target for
realmode.bin.

[ hpa: removed the direct dependency on realmode.relocs in
  arch/x86/realmode/Makefile ]

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@...el.com>
Link: http://lkml.kernel.org/r/1336595106-21135-1-git-send-email-jarkko.sakkinen@intel.com
Cc: Sam Ravnborg <sam@...nborg.org>
Cc: Michal Marek <mmarek@...e.cz>
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
 arch/x86/realmode/Makefile    |    5 +----
 arch/x86/realmode/rm/Makefile |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/x86/realmode/Makefile b/arch/x86/realmode/Makefile
index f22a4f8..a05b3ac 100644
--- a/arch/x86/realmode/Makefile
+++ b/arch/x86/realmode/Makefile
@@ -11,10 +11,7 @@ subdir- := rm
 
 obj-y += rmpiggy.o
 
-$(obj)/rmpiggy.o: $(obj)/rm/realmode.relocs $(obj)/rm/realmode.bin
+$(obj)/rmpiggy.o: $(obj)/rm/realmode.bin
 
 $(obj)/rm/realmode.bin: FORCE
 	$(Q)$(MAKE) $(build)=$(obj)/rm $@
-
-$(obj)/rm/realmode.relocs: FORCE
-	$(Q)$(MAKE) $(build)=$(obj)/rm $@
diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
index de40bc4..1c1d3d3 100644
--- a/arch/x86/realmode/rm/Makefile
+++ b/arch/x86/realmode/rm/Makefile
@@ -48,7 +48,7 @@ $(obj)/realmode.elf: $(obj)/realmode.lds $(REALMODE_OBJS) FORCE
 
 OBJCOPYFLAGS_realmode.bin := -O binary
 
-$(obj)/realmode.bin: $(obj)/realmode.elf
+$(obj)/realmode.bin: $(obj)/realmode.elf $(obj)/realmode.relocs
 	$(call if_changed,objcopy)
 
 quiet_cmd_relocs = RELOCS  $@
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/