From 785d22575dd6db82cb2e14df12ddaadf980c4639 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Fri, 1 May 2015 07:10:23 +0200
Subject: add cpu type for different toolchains with the same architecture

---
 mk/vars.mk                   | 3 +++
 rules.mk                     | 1 +
 target/config/Config.in.cpu  | 5 +++++
 toolchain/uclibc-ng/Makefile | 4 ++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mk/vars.mk b/mk/vars.mk
index bf51a378b..e73cdc698 100644
--- a/mk/vars.mk
+++ b/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
diff --git a/rules.mk b/rules.mk
index e3f9dd251..6cccdb774 100644
--- a/rules.mk
+++ b/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)))
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index 98b060616..9b2b2ab72 100644
--- a/target/config/Config.in.cpu
+++ b/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
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index caeba532b..c34ff91e8 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/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
 
-- 
cgit v1.2.3