Xtensa port: Moved XCC specific libraries out of genric Xtensa make file.

These libraries are unlikely to be uesd by GCC port and thus should not be in
a generic make file. Moved to specific toolchain make file.

Change-Id: Ib585b87700e409d678f7a5cb60cff67b6022ab05
Signed-off-by: Mazen NEIFER <mazen@nestwave.com>
This commit is contained in:
Mazen NEIFER 2017-01-22 17:22:19 +01:00 committed by Andrew Boie
commit aa1e95bfb2
3 changed files with 18 additions and 16 deletions

View file

@ -1,18 +1,6 @@
SOC_PATH=${XTENSA_CORE}
export SOC_PATH
# Include XCC standard libraries so that users used ot Xplorer IDE can port
# their code easily
XT_LIB_PATH=-L${XTENSA_BUILD}/xtensa-elf/lib/xcc \
-L${XTENSA_BUILD}/xtensa-elf/lib \
-L${XTENSA_BUILD}/xtensa-elf/arch/lib
export XT_LIB_PATH
XTENSA_INCLUDE=-I$(XTENSA_TOOLS_PATH)/lib/xcc/include \
-I$(XTENSA_TOOLS_PATH)/xtensa-elf/include \
-I${XTENSA_BUILD}/xtensa-elf/arch/include \
-I${XTENSA_BUILD}/xtensa-elf/include
flagBoardType=
ifeq ($(CONFIG_BOARD_XTENSA),y)
flagBoardType= -DXT_BOARD
@ -24,8 +12,8 @@ endif
# Remove compilation flags added by top makefile and which are not supported by xcc and enable.
KBUILD_CFLAGS := $(filter-out -fno-asynchronous-unwind-tables -fno-omit-frame-pointer,${KBUILD_CFLAGS})
# Add Xtensa pecific flags
KBUILD_AFLAGS += -c -xassembler-with-cpp $(XTENSA_INCLUDE) $(flagBoardType) $(flagALongCall)
KBUILD_CFLAGS += $(XTENSA_INCLUDE) -DPROC_$(XTENSA_CORE) -DCONFIG_$(XTENSA_CORE) -c $(flagLongCall) -nostdinc $(flagBoardType) $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-sections,) $(call cc-option,-fms-extensions,)
KBUILD_AFLAGS += -c -xassembler-with-cpp $(flagBoardType) $(flagALongCall)
KBUILD_CFLAGS += -DPROC_$(XTENSA_CORE) -DCONFIG_$(XTENSA_CORE) -c $(flagLongCall) -nostdinc $(flagBoardType) $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-sections,) $(call cc-option,-fms-extensions,)
include $(srctree)/arch/$(ARCH)/core/Makefile
include $(srctree)/arch/$(ARCH)/soc/$(SOC_PATH)/Makefile

View file

@ -10,7 +10,7 @@ obj-atomic=atomic.o
endif
obj-y = ${obj-atomic} cpu_idle.o fatal.o \
swap.o thread.o xt_zephyr.o xtensa_context.o xtensa_intr_asm.o \
xtensa_intr.o xtensa_overlay_os_hook.o xtensa_vectors.o irq_manage.o
xtensa_intr.o xtensa_vectors.o irq_manage.o
obj-$(CONFIG_IRQ_OFFLOAD) += irq_offload.o
obj-$(CONFIG_SIMULATOR_XTENSA) += crt1-sim.o
obj-$(CONFIG_BOARD_XTENSA) += crt1-boards.o

View file

@ -25,6 +25,8 @@ endif
ifeq (${CONFIG_XTENSA},y)
CROSS_COMPILE=${XTENSA_TOOLS_PATH}/bin/$(CROSS_COMPILE_$(ARCH))
CC=${CROSS_COMPILE}xcc --xtensa-core=$(XTENSA_CORE)
AS=${CROSS_COMPILE}xcc --xtensa-core=$(XTENSA_CORE)
LD=${CROSS_COMPILE}xcc --xtensa-core=$(XTENSA_CORE)
CROSS_COMPILE_TARGET = ${CROSS_COMPILE_TARGET_${ARCH}}
#CORES
@ -56,7 +58,19 @@ endif
XTSC_WORK_DIR=$(dir ${XTSC_INC})
XTSC_INC_FILE=$(notdir ${XTSC_INC})
export CROSS_COMPILE XTENSA_CORE XTENSA_SYSTEM
# Include XCC standard libraries so that users used to Xplorer IDE can port
# their code easily
TOOLCHAIN_LIBS += gcc c sim hal
LIB_INCLUDE_DIR += -L${XTENSA_BUILD}/xtensa-elf/lib/xcc \
-L${XTENSA_BUILD}/xtensa-elf/lib \
-L${XTENSA_BUILD}/xtensa-elf/arch/lib
KBUILD_CPPFLAGS +=-I$(XTENSA_TOOLS_PATH)/lib/xcc/include \
-I$(XTENSA_TOOLS_PATH)/xtensa-elf/include \
-I${XTENSA_BUILD}/xtensa-elf/arch/include \
-I${XTENSA_BUILD}/xtensa-elf/include
export CROSS_COMPILE XTENSA_CORE XTENSA_SYSTEM LIB_INCLUDE_DIR
endif
prepare2: