diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-17 01:02:58 +0200 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-17 01:02:58 +0200 |
commit | c889ba801dc3b3a0155fa77d567f2c3a6097de1c (patch) | |
tree | 257878e1eb565fc9765dd8fed20815f7781d116a /arch/x86/tools/Makefile | |
parent | x86, relocs: Build separate 32/64-bit tools (diff) | |
download | linux-c889ba801dc3b3a0155fa77d567f2c3a6097de1c.tar.xz linux-c889ba801dc3b3a0155fa77d567f2c3a6097de1c.zip |
x86, relocs: Refactor the relocs tool to merge 32- and 64-bit ELF
Refactor the relocs tool so that the same tool can handle 32- and
64-bit ELF.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Kees Cook <keescook@chromium.org>
Link: http://lkml.kernel.org/r/1365797627-20874-5-git-send-email-keescook@chromium.org
Diffstat (limited to 'arch/x86/tools/Makefile')
-rw-r--r-- | arch/x86/tools/Makefile | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile index a8cb70c6b8a1..e8120346903b 100644 --- a/arch/x86/tools/Makefile +++ b/arch/x86/tools/Makefile @@ -37,22 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c -HOSTCFLAGS_relocs_32.o += -DELF_BITS=32 -HOSTCFLAGS_relocs_64.o += -DELF_BITS=64 - -quiet_cmd_cp_reloc = GEN $@ - cmd_cp_reloc = cp $< $@ - -$(obj)/relocs_%.c: $(srctree)/arch/x86/tools/relocs.c - $(call cmd,cp_reloc) - HOST_EXTRACFLAGS += -I$(srctree)/tools/include -hostprogs-y += relocs_$(BITS) -relocs_binaries = relocs_$(BITS) -ifeq ($(CONFIG_64BIT),y) - hostprogs-y += relocs_32 - relocs_binaries += relocs_32 -endif -relocs: $(relocs_binaries) -relocs_32: $(obj)/relocs_32 -relocs_64: $(obj)/relocs_64 +hostprogs-y += relocs +relocs-objs := relocs_32.o relocs_64.o relocs_common.o +relocs: $(obj)/relocs |