Skip to content
Snippets Groups Projects
Commit b2d53830 authored by Adrian Danis's avatar Adrian Danis
Browse files

Use CC instead of LD and AS

parent 97d6bc96
No related branches found
No related tags found
No related merge requests found
......@@ -343,7 +343,7 @@ endif
ifndef NK_CFLAGS
ifeq (${ARCH}, arm)
CFLAGS += -mtune=${CPU} -marm -march=${ARMV}
ASFLAGS += -mcpu=${CPU} -march=${ARMV}
ASFLAGS += -Wa,-mcpu=${CPU} -Wa,-march=${ARMV}
DEFINES += -D$(shell echo ${ARMV}|tr [:lower:] [:upper:]|tr - _)
ifeq (${CPU},cortex-a8)
DEFINES += -DARM_CORTEX_A8
......@@ -356,7 +356,7 @@ endif
ifeq (${ARCH}, ia32)
CFLAGS += -m32 -mno-mmx -mno-sse
ASFLAGS += --32
ASFLAGS += -Wa,--32
endif
endif
......@@ -465,7 +465,7 @@ kernel_all.c: sources_list_updated ${C_SOURCES_WITH_PARSE} ${DOMAIN_CONFIG_FILE}
kernel.o: kernel_final.s
@echo " [AS] $@"
$(Q)${AS} ${ASFLAGS} -o $@ $<
$(Q)${CC} ${ASFLAGS} -o $@ -c $<
kernel_final.s: kernel_final.c
@echo " [CC] $@"
......@@ -480,7 +480,7 @@ LINKER_SCRIPT = src/plat/${PLAT}/linker.lds
kernel.elf: ${OBJECTS} ${LINKER_SCRIPT}
@echo " [LD] $@"
$(Q)${CHANGED} $@ ${LD} ${LDFLAGS} -T ${SOURCE_ROOT}/${LINKER_SCRIPT} \
$(Q)${CHANGED} $@ ${CC} ${LDFLAGS} -Wl,-T -Wl,${SOURCE_ROOT}/${LINKER_SCRIPT} \
-o $@ ${OBJECTS}
############################################################
......@@ -493,7 +493,7 @@ kernel.elf: ${OBJECTS} ${LINKER_SCRIPT}
%.o: %.s | ${DIRECTORIES}
@echo " [AS] $@"
$(Q)${AS} ${ASFLAGS} $< -o $@
$(Q)${CC} ${ASFLAGS} -c $< -o $@
###################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment