Commit f2604c14 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen Committed by H. Peter Anvin
Browse files

x86, realmode: move relocs from scripts/ to arch/x86/tools 



Moved relocs tool from scripts/ to arch/x86/tools because
it is architecture specific script. Added new target archscripts
that can be used to build scripts needed building an architecture.

Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@intel.com>
Link: http://lkml.kernel.org/r/1336501366-28617-22-git-send-email-jarkko.sakkinen@intel.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Michal Marek <mmarek@suse.cz>
parent f37240f1

Makefile

+6 −3
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ asm-generic: 


no-dot-config-targets := clean mrproper distclean \

			 cscope gtags TAGS tags help %docs check% coccicheck \

			 include/linux/version.h headers_% archheaders \

			 include/linux/version.h headers_% archheaders archscripts \

			 kernelversion %src-pkg



config-targets := 0
@@ -979,7 +979,7 @@ prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \ 
                   include/config/auto.conf

	$(cmd_crmodverdir)



archprepare: archheaders prepare1 scripts_basic

archprepare: archheaders archscripts prepare1 scripts_basic



prepare0: archprepare FORCE

	$(Q)$(MAKE) $(build)=.
@@ -1049,8 +1049,11 @@ hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) 
PHONY += archheaders

archheaders:



PHONY += archscripts

archscripts:



PHONY += __headers

__headers: include/linux/version.h scripts_basic asm-generic archheaders FORCE

__headers: include/linux/version.h scripts_basic asm-generic archheaders archscripts FORCE

	$(Q)$(MAKE) $(build)=scripts build_unifdef



PHONY += headers_install_all

arch/x86/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ KBUILD_CFLAGS += $(call cc-option,-mno-avx,) 
KBUILD_CFLAGS += $(mflags-y)

KBUILD_AFLAGS += $(mflags-y)



archscripts:

	$(Q)$(MAKE) $(build)=arch/x86/tools relocs



###

# Syscall table generation

arch/x86/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ $(obj)/vmlinux.bin: vmlinux FORCE 


targets += vmlinux.bin.all vmlinux.relocs



CMD_RELOCS = scripts/x86-relocs

CMD_RELOCS = arch/x86/tools/relocs

quiet_cmd_relocs = RELOCS  $@

      cmd_relocs = $(CMD_RELOCS) $< > $@;$(CMD_RELOCS) --abs-relocs $<

$(obj)/vmlinux.relocs: vmlinux FORCE

arch/x86/realmode/rm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ $(obj)/realmode.bin: $(obj)/realmode.elf 
	$(call if_changed,objcopy)



quiet_cmd_relocs = RELOCS  $@

      cmd_relocs = scripts/x86-relocs --realmode $< > $@

      cmd_relocs = arch/x86/tools/relocs --realmode $< > $@

$(obj)/realmode.relocs: $(obj)/realmode.elf FORCE

	$(call if_changed,relocs)

arch/x86/tools/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
relocs