add cpu type for different toolchains with the same architecture

mk/vars.mk

@@ -16,6 +16,9 @@ endif
 ifneq ($(ADK_TARGET_ABI),)
 ADK_SUFFIX:=		$(ADK_SUFFIX)_$(ADK_TARGET_ABI)
 endif
+ifneq ($(ADK_TARGET_CPU_TYPE),)
+ADK_SUFFIX:=		$(ADK_SUFFIX)_$(ADK_TARGET_CPU_TYPE)
+endif
 ifeq ($(ADK_TARGET_WITH_MMU),)
 ADK_SUFFIX:=		$(ADK_SUFFIX)_nommu
 endif

rules.mk

@@ -30,6 +30,7 @@ ADK_TARGET_ARCH:=			$(strip $(subst ",, $(ADK_TARGET_ARCH)))
 ADK_TARGET_SYSTEM:=			$(strip $(subst ",, $(ADK_TARGET_SYSTEM)))
 ADK_TARGET_BOARD:=			$(strip $(subst ",, $(ADK_TARGET_BOARD)))
 ADK_TARGET_CPU_ARCH:=			$(strip $(subst ",, $(ADK_TARGET_CPU_ARCH)))
+ADK_TARGET_CPU_TYPE:=			$(strip $(subst ",, $(ADK_TARGET_CPU_TYPE)))
 ADK_TARGET_KERNEL:=			$(strip $(subst ",, $(ADK_TARGET_KERNEL)))
 ADK_TARGET_LIBC:=			$(strip $(subst ",, $(ADK_TARGET_LIBC)))
 ADK_TARGET_LIBC_PATH:=			$(strip $(subst ",, $(ADK_TARGET_LIBC_PATH)))

target/config/Config.in.cpu

@@ -374,6 +374,11 @@ config ADK_TARGET_CPU_FLAGS
 	default "-mcpu=v32" if ADK_CPU_CRIS_V32
 	default "-mcpu=v7.10.d" if ADK_CPU_MICROBLAZE
 
+config ADK_TARGET_CPU_TYPE
+	string
+	default "arc700" if ADK_TARGET_ARCH_ARC && ADK_CPU_ARC700
+	default "archs" if ADK_TARGET_ARCH_ARC && ADK_CPU_ARC_HS
+
 config ADK_TARGET_CPU_ARCH
 	string
 	default "aarch64" if ADK_TARGET_ARCH_AARCH64 && ADK_TARGET_LITTLE_ENDIAN

toolchain/uclibc-ng/Makefile

@@ -163,12 +163,12 @@ endif
 # arc
 ifeq ($(ADK_TARGET_ARCH_ARC),y)
 ifeq ($(ADK_TARGET_CPU_ARC_ARC700),y)
-	$(SED) 's/.*\(CONFIG_ARC_CPU_700\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_ARC_CPU_HS\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_ARC_CPU_700\).*/\1=y/' ${WRKBUILD}/.config
 endif
 ifeq ($(ADK_TARGET_CPU_ARC_ARC_HS),y)
-	$(SED) 's/.*\(CONFIG_ARC_CPU_HS\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_ARC_CPU_700\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_ARC_CPU_HS\).*/\1=y/' ${WRKBUILD}/.config
 endif
 endif