From 98fc426a98db7e4dd5fea334edec720721d2a89c Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sat, 23 Jan 2016 01:24:33 +0100 Subject: Move object files to $(obj)// Instead of tagging object files with ., move them to a directory below $(obj)/. This way we can keep a 1:1 mapping between source- and object-file names. The 1:1 mapping is a prerequisite for Ada, where the compiler refuses any other object-file name. Tested by verifying that the resulting coreboot.rom files didn't change for all of Jenkins' abuild configurations. Change-Id: Idb7a8abec4ea0a37021d9fc24cc8583c4d3bf67c Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/13181 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/cpu/x86/Makefile.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/cpu/x86/Makefile.inc') diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index ae81ab4f1c..0efbdd7553 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -6,6 +6,8 @@ subdirs-$(CONFIG_PARALLEL_MP) += name ramstage-$(CONFIG_PARALLEL_MP) += mp_init.c ramstage-$(CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING) += mirror_payload.c +additional-dirs += $(obj)/cpu/x86 + SIPI_ELF=$(obj)/cpu/x86/sipi_vector.elf SIPI_RMOD=$(SIPI_ELF).rmod SIPI_BIN=$(SIPI_ELF:.elf=) @@ -30,4 +32,4 @@ $(SIPI_BIN): $(SIPI_RMOD) $(call src-to-obj,ramstage,$(SIPI_BIN).manual): $(SIPI_BIN) @printf " OBJCOPY $(subst $(obj)/,,$(@))\n" - cd $(dir $@); $(OBJCOPY_rmodules_$(ARCH-ramstage-y)) -I binary $(notdir $<) $(target-objcopy) $(notdir $@) + cd $(dir $<); $(OBJCOPY_rmodules_$(ARCH-ramstage-y)) -I binary $(notdir $<) $(target-objcopy) $(abspath $@) -- cgit v1.2.3