From 1684b8733d2423032552c8148a24d8e274f51d71 Mon Sep 17 00:00:00 2001 From: Roberto Vargas Date: Mon, 16 Apr 2018 11:29:45 +0100 Subject: [PATCH] Use clang assembler when clang compiler is used Change-Id: Ib90b767e46360ef07c1f22526e3f3eb5fe366d5d Signed-off-by: Roberto Vargas --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ed45fa3fc..e25c380c4 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,13 @@ $(eval $(call add_define,DEBUG)) ifneq (${DEBUG}, 0) BUILD_TYPE := debug TF_CFLAGS += -g - ASFLAGS += -g -Wa,--gdwarf-2 + + ifneq ($(findstring clang,$(notdir $(CC))),) + ASFLAGS += -g + else + ASFLAGS += -g -Wa,--gdwarf-2 + endif + # Use LOG_LEVEL_INFO by default for debug builds LOG_LEVEL := 40 else @@ -144,10 +150,12 @@ ifeq ($(notdir $(CC)),armclang) TF_CFLAGS_aarch32 = -target arm-arm-none-eabi $(march32-directive) TF_CFLAGS_aarch64 = -target aarch64-arm-none-eabi -march=armv8-a LD = $(LINKER) +AS = $(CC) -c -x assembler-with-cpp $(TF_CFLAGS_$(ARCH)) else ifneq ($(findstring clang,$(notdir $(CC))),) TF_CFLAGS_aarch32 = $(target32-directive) TF_CFLAGS_aarch64 = -target aarch64-elf LD = $(LINKER) +AS = $(CC) -c -x assembler-with-cpp $(TF_CFLAGS_$(ARCH)) else TF_CFLAGS_aarch32 = $(march32-directive) TF_CFLAGS_aarch64 = -march=armv8-a