build: remove -ccopts mechanism
We now use the slightly more familiar CFLAGS_* and CPPFLAGS_* for the same purpose. Change-Id: Ifd2bd13f67f71fa0a15611a6d11a6a4c7994271b Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/5875 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Patrick Georgi
parent
d638c2b34b
commit
25b56c3af5
9
Makefile
9
Makefile
|
|
@ -212,13 +212,12 @@ alldirs:=$(sort $(abspath $(dir $(allobjs))))
|
|||
define create_cc_template
|
||||
# $1 obj class
|
||||
# $2 source suffix (c, S)
|
||||
# $3 additional compiler flags
|
||||
# $4 additional dependencies
|
||||
# $3 additional dependencies
|
||||
ifn$(EMPTY)def $(1)-objs_$(2)_template
|
||||
de$(EMPTY)fine $(1)-objs_$(2)_template
|
||||
$(obj)/$$(1).$(1).o: src/$$(1).$(2) $(obj)/config.h $(4)
|
||||
$(obj)/$$(1).$(1).o: src/$$(1).$(2) $(obj)/config.h $(3)
|
||||
@printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n"
|
||||
$(CC_$(1)) $(3) -MMD $$$$(CPPFLAGS_$(1)) $$$$(CFLAGS_$(1)) -c -o $$$$@ $$$$<
|
||||
$(CC_$(1)) -MMD $$$$(CPPFLAGS_$(1)) $$$$(CFLAGS_$(1)) -c -o $$$$@ $$$$<
|
||||
en$(EMPTY)def
|
||||
end$(EMPTY)if
|
||||
endef
|
||||
|
|
@ -226,7 +225,7 @@ endef
|
|||
filetypes-of-class=$(subst .,,$(sort $(suffix $($(1)-srcs))))
|
||||
$(foreach class,$(classes), \
|
||||
$(foreach type,$(call filetypes-of-class,$(class)), \
|
||||
$(eval $(call create_cc_template,$(class),$(type),$($(class)-$(type)-ccopts),$($(class)-$(type)-deps)))))
|
||||
$(eval $(call create_cc_template,$(class),$(type),$($(class)-$(type)-deps)))))
|
||||
|
||||
foreach-src=$(foreach file,$($(1)-srcs),$(eval $(call $(1)-objs_$(subst .,,$(suffix $(file)))_template,$(subst src/,,$(basename $(file))))))
|
||||
$(eval $(foreach class,$(classes),$(call foreach-src,$(class))))
|
||||
|
|
|
|||
20
Makefile.inc
20
Makefile.inc
|
|
@ -111,31 +111,27 @@ ramstage-postprocess=$(foreach d,$(sort $(dir $(1))), \
|
|||
$(eval $(d)ramstage.o: $(call files-in-dir,$(d),$(1)); $$(LD_ramstage) -o $$@ -r $$^ ) \
|
||||
$(eval ramstage-objs:=$(d)ramstage.o $(filter-out $(call files-in-dir,$(d),$(1)),$(ramstage-objs))))
|
||||
|
||||
romstage-c-ccopts:=-D__PRE_RAM__
|
||||
romstage-S-ccopts:=-D__PRE_RAM__
|
||||
CPPFLAGS_romstage += -D__PRE_RAM__
|
||||
ifeq ($(CONFIG_TRACE),y)
|
||||
ramstage-c-ccopts:= -finstrument-functions
|
||||
CFLAGS_ramstage += -finstrument-functions
|
||||
endif
|
||||
ifeq ($(CONFIG_COVERAGE),y)
|
||||
ramstage-c-ccopts+=-fprofile-arcs -ftest-coverage
|
||||
CFLAGS_ramstage += -fprofile-arcs -ftest-coverage
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_USE_BLOBS),y)
|
||||
forgetthis:=$(shell git submodule update --init --checkout 3rdparty)
|
||||
endif
|
||||
|
||||
bootblock-c-ccopts:=-D__BOOT_BLOCK__ -D__PRE_RAM__
|
||||
bootblock-S-ccopts:=-D__BOOT_BLOCK__ -D__PRE_RAM__
|
||||
CPPFLAGS_bootblock += -D__BOOT_BLOCK__ -D__PRE_RAM__
|
||||
|
||||
smmstub-c-ccopts:=-D__SMM__
|
||||
smmstub-S-ccopts:=-D__SMM__
|
||||
smm-c-ccopts:=-D__SMM__
|
||||
smm-S-ccopts:=-D__SMM__
|
||||
CPPFLAGS_smmstub += -D__SMM__
|
||||
CPPFLAGS_smm += -D__SMM__
|
||||
|
||||
# SMM TSEG base is dynamic
|
||||
ifneq ($(CONFIG_SMM_MODULES),y)
|
||||
ifeq ($(CONFIG_SMM_TSEG),y)
|
||||
smm-c-ccopts += -fpic
|
||||
CFLAGS_smm += -fpic
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -325,7 +321,7 @@ $(obj)/%.romstage.o $(abspath $(obj))/%.romstage.o: $(obj)/%.c $(obj)/config.h $
|
|||
|
||||
$(obj)/%.bootblock.o $(abspath $(obj))/%.bootblock.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H)
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC_bootblock) -MMD $(bootblock-c-ccopts) $(CFLAGS_bootblock) $(CPPFLAGS_bootblock) -c -o $@ $<
|
||||
$(CC_bootblock) -MMD $(CFLAGS_bootblock) $(CPPFLAGS_bootblock) -c -o $@ $<
|
||||
|
||||
#######################################################################
|
||||
# Clean up rules
|
||||
|
|
|
|||
|
|
@ -78,18 +78,18 @@ $(objgenerated)/bootblock_inc.S: $$(bootblock_inc)
|
|||
|
||||
$(objgenerated)/bootblock.o: $(objgenerated)/bootblock.s
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC_bootblock) $(bootblock-S-ccopts) -Wa,-acdlns -c -o $@ $< > $(basename $@).disasm
|
||||
$(CC_bootblock) $(CPPFLAGS_bootblock) -Wa,-acdlns -c -o $@ $< > $(basename $@).disasm
|
||||
|
||||
$(objgenerated)/bootblock.s: $(objgenerated)/bootblock_inc.S $(obj)/config.h $(obj)/build.h
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC_bootblock) $(bootblock-S-ccopts) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/armv7/include -I$(obj) -include $(obj)/build.h -include $(obj)/config.h -I. -I$(src) $< -o $@
|
||||
$(CC_bootblock) $(CPPFLAGS_bootblock) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/armv7/include -I$(obj) -include $(obj)/build.h -include $(obj)/config.h -I. -I$(src) $< -o $@
|
||||
|
||||
$(objgenerated)/bootblock.inc: $(src)/arch/armv7/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(bootblock_custom) $(OPTION_TABLE_H) $(obj)/config.h
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC_bootblock) $(bootblock-c-ccopts) $(CPPFLAGS_bootblock) -MM \
|
||||
$(CC_bootblock) $(CFLAGS_bootblock) $(CPPFLAGS_bootblock) -MM \
|
||||
-MT$(objgenerated)/bootblock.inc \
|
||||
$< > $(objgenerated)/bootblock.inc.d
|
||||
$(CC_bootblock) $(bootblock-c-ccopts) -c -S $(CFLAGS_bootblock) -I. $(CPPFLAGS_bootblock) $< -o $@
|
||||
$(CC_bootblock) -c -S $(CFLAGS_bootblock) -I. $(CPPFLAGS_bootblock) $< -o $@
|
||||
|
||||
$(objcbfs)/bootblock.debug: $(objgenerated)/bootblock.o $(objgenerated)/bootblock.ld $$(bootblock-objs) $(stages) $(obj)/config.h
|
||||
@printf " LINK $(subst $(obj)/,,$(@))\n"
|
||||
|
|
|
|||
|
|
@ -95,8 +95,8 @@ OBJCOPY_$(1) := $(OBJCOPY_$(2))
|
|||
OBJDUMP_$(1) := $(OBJDUMP_$(2))
|
||||
STRIP_$(1) := $(STRIP_$(2))
|
||||
READELF_$(1) := $(READELF_$(2))
|
||||
CFLAGS_$(1) = $$(CFLAGS_common) $$(CFLAGS_$(2))
|
||||
CPPFLAGS_$(1) = $$(CPPFLAGS_common) $$(CPPFLAGS_$(2))
|
||||
CFLAGS_$(1) += $$(CFLAGS_common) $$(CFLAGS_$(2))
|
||||
CPPFLAGS_$(1) += $$(CPPFLAGS_common) $$(CPPFLAGS_$(2))
|
||||
LIBGCC_FILE_NAME_$(1) = $(wildcard $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-libgcc-file-name))
|
||||
endef
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue