From 8ea49592792b8f5892ab18b68207df0eae3b46a8 Mon Sep 17 00:00:00 2001
From: Junmo Park <junmoz.park@samsung.com>
Date: Mon, 24 Jul 2017 07:14:55 +0900
Subject: [PATCH] Add support for Exynos-M1

Change-Id: Ie57507a5d0ea9101db603ff3538c51853083a314
Signed-off-by: Junmo Park <junmoz.park@samsung.com>
---
 android/arch.go           |  2 ++
 cc/config/arm64_device.go | 11 +++++++++++
 cc/config/arm_device.go   |  3 +++
 3 files changed, 16 insertions(+)

diff --git a/android/arch.go b/android/arch.go
index 08421a11c..05887a185 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -879,11 +879,13 @@ func getMegaDeviceConfig() []archConfig {
 		{"arm", "armv7-a-neon", "denver", []string{"armeabi-v7a"}},
 		{"arm", "armv7-a-neon", "krait", []string{"armeabi-v7a"}},
 		{"arm", "armv7-a-neon", "kryo", []string{"armeabi-v7a"}},
+		{"arm", "armv7-a-neon", "exynos-m1", []string{"armeabi-v7a"}},
 		{"arm", "armv7-a-neon", "exynos-m2", []string{"armeabi-v7a"}},
 		{"arm64", "armv8-a", "cortex-a53", []string{"arm64-v8a"}},
 		{"arm64", "armv8-a", "cortex-a73", []string{"arm64-v8a"}},
 		{"arm64", "armv8-a", "denver64", []string{"arm64-v8a"}},
 		{"arm64", "armv8-a", "kryo", []string{"arm64-v8a"}},
+		{"arm64", "armv8-a", "exynos-m1", []string{"arm64-v8a"}},
 		{"arm64", "armv8-a", "exynos-m2", []string{"arm64-v8a"}},
 		{"mips", "mips32-fp", "", []string{"mips"}},
 		{"mips", "mips32r2-fp", "", []string{"mips"}},
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index 139c901c4..025d3a5f6 100644
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -81,6 +81,9 @@ var (
 			// don't support a Kryo specific target yet.
 			"-mcpu=cortex-a57",
 		},
+		"exynos-m1": []string{
+			"-mcpu=exynos-m1",
+		},
 		"exynos-m2": []string{
 			"-mcpu=exynos-m2",
 		},
@@ -99,6 +102,7 @@ func init() {
 		"cortex-a53",
 		"cortex-a73",
 		"kryo",
+		"exynos-m1",
 		"exynos-m2",
 		"denver64")
 
@@ -129,6 +133,11 @@ func init() {
 	pctx.StaticVariable("Arm64ClangKryoCflags",
 		strings.Join(arm64ClangCpuVariantCflags["kryo"], " "))
 
+	pctx.StaticVariable("Arm64ExynosM1Cflags",
+		strings.Join(arm64CpuVariantCflags["cortex-a53"], " "))
+	pctx.StaticVariable("Arm64ClangExynosM1Cflags",
+		strings.Join(arm64ClangCpuVariantCflags["exynos-m1"], " "))
+
 	pctx.StaticVariable("Arm64ExynosM2Cflags",
 		strings.Join(arm64CpuVariantCflags["cortex-a53"], " "))
 	pctx.StaticVariable("Arm64ClangExynosM2Cflags",
@@ -141,6 +150,7 @@ var (
 		"cortex-a53": "${config.Arm64CortexA53Cflags}",
 		"cortex-a73": "${config.Arm64CortexA53Cflags}",
 		"kryo":       "${config.Arm64KryoCflags}",
+		"exynos-m1":  "${config.Arm64ExynosM1Cflags}",
 		"exynos-m2":  "${config.Arm64ExynosM2Cflags}",
 	}
 
@@ -149,6 +159,7 @@ var (
 		"cortex-a53": "${config.Arm64ClangCortexA53Cflags}",
 		"cortex-a73": "${config.Arm64ClangCortexA53Cflags}",
 		"kryo":       "${config.Arm64ClangKryoCflags}",
+		"exynos-m1":  "${config.Arm64ClangExynosM1Cflags}",
 		"exynos-m2":  "${config.Arm64ClangExynosM2Cflags}",
 	}
 )
diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go
index e97e723d3..38816aabe 100644
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -182,6 +182,7 @@ func init() {
 		"cortex-a73",
 		"krait",
 		"kryo",
+		"exynos-m1",
 		"exynos-m2",
 		"denver")
 
@@ -275,6 +276,7 @@ var (
 		"cortex-a73":     "${config.ArmCortexA53Cflags}",
 		"krait":          "${config.ArmKraitCflags}",
 		"kryo":           "${config.ArmKryoCflags}",
+		"exynos-m1":      "${config.ArmCortexA53Cflags}",
 		"exynos-m2":      "${config.ArmCortexA53Cflags}",
 		"denver":         "${config.ArmCortexA15Cflags}",
 	}
@@ -295,6 +297,7 @@ var (
 		"cortex-a73":     "${config.ArmClangCortexA53Cflags}",
 		"krait":          "${config.ArmClangKraitCflags}",
 		"kryo":           "${config.ArmClangKryoCflags}",
+		"exynos-m1":      "${config.ArmClangCortexA53Cflags}",
 		"exynos-m2":      "${config.ArmClangCortexA53Cflags}",
 		"denver":         "${config.ArmClangCortexA15Cflags}",
 	}