summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f10ea6b)
raw | patch | inline | side by side (parent: f10ea6b)
author | Hao Zhang <hzhang@ti.com> | |
Thu, 28 May 2020 17:53:37 +0000 (13:53 -0400) | ||
committer | Sivaraj R <sivaraj@ti.com> | |
Fri, 29 May 2020 03:00:49 +0000 (22:00 -0500) |
Signed-off-by: Hao Zhang <hzhang@ti.com>
index 8e3b5aa9e375bdd54c3281d8f4854ca9b82517b6..86660a4a604f89bead582b93f973d107eddd7b1f 100755 (executable)
#if float type is not FPU use hard lib
ifneq ($(GCC_FLOAT_PATH),FPU)
ifneq ($(XDC_CFG_FILE_$(CORE)),)
- LIB_PATHS_DIR = $(bios_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/hard
+ LIB_PATHS_DIR = $(bios_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/thumb/v7-a/hard/
else
LIB_PATHS_DIR = $(HARDLIB_PATH)
- LIB_PATHS_DIR += $(TOOLCHAIN_PATH_A15)/arm-none-eabi/lib/hard
- LIB_PATHS += $(HARDLIB_PATH)/libgcc.a $(TOOLCHAIN_PATH_A15)/arm-none-eabi/lib/hard/libc_nano.a $(TOOLCHAIN_PATH_A15)/arm-none-eabi/lib/hard/libm.a $(TOOLCHAIN_PATH_A15)/arm-none-eabi/lib/hard/librdimon_nano.a $(TOOLCHAIN_PATH_A15)/arm-none-eabi/lib/hard/libg_nano.a
+ THUMB_HARD = thumb/v7+fp/hard/
+ THUMB_PATH = $(TOOLCHAIN_PATH_A15)/arm-none-eabi/lib/$(THUMB_HARD)
+ LIB_PATHS_DIR += $(THUMB_PATH)
+ LIB_PATHS += $(HARDLIB_PATH)/$(THUMB_HARD)/libgcc.a $(THUMB_PATH)/libc_nano.a $(THUMB_PATH)/libm.a $(THUMB_PATH)/librdimon_nano.a $(THUMB_PATH)/libg_nano.a
endif
else
ifneq ($(XDC_CFG_FILE_$(CORE)),)
index 38342e6851a45fcf5c61a6e701b8b012bb0dfdca..0ab24299dc7879331bc1a01dd0982029ce81ca02 100644 (file)
LIB_PATHS += $(RTSLIB_PATH)
ifneq ($(XDC_CFG_FILE_$(CORE)),)
- LIB_PATHS_DIR = $(bios_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/hard
- LIB_PATHS += $(bios_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/hard/librdimon.a
+ LIB_PATHS_DIR = $(bios_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/thumb/v7-a/hard/
+ LIB_PATHS += $(bios_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/thumb/v7-a/hard/librdimon.a
else
LIB_PATHS_DIR = $(HARDLIB_PATH)
- LIB_PATHS_DIR += $(TOOLCHAIN_PATH_A8)/arm-none-eabi/lib/hard
- LIB_PATHS += $(HARDLIB_PATH)/libgcc.a $(TOOLCHAIN_PATH_A8)/arm-none-eabi/lib/hard/libc_nano.a $(TOOLCHAIN_PATH_A8)/arm-none-eabi/lib/hard/libm.a $(TOOLCHAIN_PATH_A8)/arm-none-eabi/lib/hard/librdimon_nano.a $(TOOLCHAIN_PATH_A8)/arm-none-eabi/lib/hard/libg_nano.a
+ THUMB_HARD = thumb/v7+fp/hard/
+ THUMB_PATH = $(TOOLCHAIN_PATH_A8)/arm-none-eabi/lib/$(THUMB_HARD)
+ LIB_PATHS_DIR += $(THUMB_PATH)
+ LIB_PATHS += $(HARDLIB_PATH)/$(THUMB_HARD)/libgcc.a $(THUMB_PATH)/libc_nano.a $(THUMB_PATH)/libm.a $(THUMB_PATH)/librdimon_nano.a $(THUMB_PATH)/libg_nano.a
endif
LNK_LIBS = $(addprefix -L,$(LIB_PATHS_DIR))
index 95b26e33d340bb148e3bdcb3d2bed2fcb94a2eb9..7df069a9df086be03aae7aac5570054df4527d9e 100644 (file)
LIB_PATHS += $(RTSLIB_PATH)
ifneq ($(XDC_CFG_FILE_$(CORE)),)
- LIB_PATHS_DIR = $(bios_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/hard
- LIB_PATHS += $(bios_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/hard/librdimon.a
+ LIB_PATHS_DIR = $(bios_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/thumb/v7-a/hard/
+ LIB_PATHS += $(bios_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/thumb/v7-a/hard/librdimon.a
else
LIB_PATHS_DIR = $(HARDLIB_PATH)
- LIB_PATHS_DIR += $(TOOLCHAIN_PATH_A9)/arm-none-eabi/lib/hard
- LIB_PATHS += $(HARDLIB_PATH)/libgcc.a $(TOOLCHAIN_PATH_A9)/arm-none-eabi/lib/hard/libc_nano.a $(TOOLCHAIN_PATH_A9)/arm-none-eabi/lib/hard/libm.a $(TOOLCHAIN_PATH_A9)/arm-none-eabi/lib/hard/librdimon_nano.a $(TOOLCHAIN_PATH_A9)/arm-none-eabi/lib/hard/libg_nano.a
+ THUMB_HARD = thumb/v7+fp/hard/
+ THUMB_PATH = $(TOOLCHAIN_PATH_A9)/arm-none-eabi/lib/$(THUMB_HARD)
+ LIB_PATHS_DIR += $(THUMB_PATH)
+ LIB_PATHS += $(HARDLIB_PATH)/$(THUMB_HARD)/libgcc.a $(THUMB_PATH)/libc_nano.a $(THUMB_PATH)/libm.a $(THUMB_PATH)/librdimon_nano.a $(THUMB_PATH)/libg_nano.a
endif
LNK_LIBS = $(addprefix -L,$(LIB_PATHS_DIR))
index 075a346a28e27002acbd9026a599ae853f41f627..c96e55fb60d613bee58b839ee9e49c6726e1ec57 100644 (file)
CGT_C7X_VERSION=1.3.0.STS
CGT_ARM_VERSION=20.2.0.LTS
- GCC_VERSION_HARDLIB=7.3.1
+ GCC_VERSION_HARDLIB=9.2.1
CGT_ARP32_VERSION=1.0.8
CG_XML_VERSION=2.61.00
export M4_TOOLCHAIN_INSTALL_DIR ?= $(TOOLCHAIN_PATH_M4)
ifeq ($(SOC),$(filter $(SOC), am335x))
- export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A8)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)/hard
+ export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A8)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)
export FPULIB_PATH ?= $(TOOLCHAIN_PATH_A8)/lib/gcc/arm-none-eabi/$(GCC_VERSION_FPULIB)/fpu
else ifeq ($(SOC),$(filter $(SOC), am437x))
- export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A9)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)/hard
+ export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A9)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)
export FPULIB_PATH ?= $(TOOLCHAIN_PATH_A9)/lib/gcc/arm-none-eabi/$(GCC_VERSION_FPULIB)/fpu
else
- export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A15)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)/hard
+ export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A15)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)
export FPULIB_PATH ?= $(TOOLCHAIN_PATH_A15)/lib/gcc/arm-none-eabi/$(GCC_VERSION_FPULIB)/fpu
endif