diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-12-22 12:51:53 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-01-05 11:35:59 +0900 |
| commit | 59de50963cc49f6aa003bd10f5a20f766186c02a (patch) | |
| tree | e438f41a3413b034804fb39e15411b411a4551c3 | |
| parent | f2e1d57e43a0688901cc5f83546c66079fce5451 (diff) | |
| download | platform_external_arm-trusted-firmware-59de50963cc49f6aa003bd10f5a20f766186c02a.tar.gz platform_external_arm-trusted-firmware-59de50963cc49f6aa003bd10f5a20f766186c02a.tar.bz2 platform_external_arm-trusted-firmware-59de50963cc49f6aa003bd10f5a20f766186c02a.zip | |
Build: use CPP just for pre-processing
Using AS for pre-processing looks a bit weird, and some assembly
specific options are given for nothing. Rather, use CPP.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | make_helpers/build_macros.mk | 4 |
2 files changed, 10 insertions, 12 deletions
@@ -143,16 +143,14 @@ TF_CFLAGS_aarch64 = -mgeneral-regs-only -mstrict-align ASFLAGS_aarch32 = -march=armv8-a TF_CFLAGS_aarch32 = -march=armv8-a -ASFLAGS += -nostdinc -ffreestanding -Wa,--fatal-warnings \ - -Werror -Wmissing-include-dirs \ - -D__ASSEMBLY__ $(ASFLAGS_$(ARCH)) \ - ${DEFINES} ${INCLUDES} -TF_CFLAGS += -nostdinc -ffreestanding -Wall \ - -Werror -Wmissing-include-dirs \ - -std=c99 -Os \ - $(TF_CFLAGS_$(ARCH)) \ - ${DEFINES} ${INCLUDES} -TF_CFLAGS += -ffunction-sections -fdata-sections +CPPFLAGS = ${DEFINES} ${INCLUDES} -nostdinc \ + -Wmissing-include-dirs -Werror +ASFLAGS += $(CPPFLAGS) $(ASFLAGS_$(ARCH)) \ + -D__ASSEMBLY__ -ffreestanding \ + -Wa,--fatal-warnings +TF_CFLAGS += $(CPPFLAGS) $(TF_CFLAGS_$(ARCH)) \ + -ffreestanding -Wall -std=c99 -Os \ + -ffunction-sections -fdata-sections LDFLAGS += --fatal-warnings -O1 LDFLAGS += --gc-sections diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 4ec060b64..dd8c2b508 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -262,11 +262,11 @@ $(eval PREREQUISITES := $(1).d) $(1): $(2) @echo " PP $$<" - $$(Q)$$(AS) $$(ASFLAGS) -P -E -D__LINKER__ -o $$@ $$< + $$(Q)$$(CPP) $$(CPPFLAGS) -P -D__ASSEMBLY__ -D__LINKER__ -o $$@ $$< $(PREREQUISITES): $(2) | $(dir ${1}) @echo " DEPS $$@" - $$(Q)$$(AS) $$(ASFLAGS) -M -MT $(1) -MF $$@ $$< + $$(Q)$$(CPP) $$(CPPFLAGS) -D__ASSEMBLY__ -M -MT $(1) -MF $$@ $$< ifdef IS_ANYTHING_TO_BUILD -include $(PREREQUISITES) |