Merge "Support Qualcomm Kryo 385 CPU variant." (c027b309) · Commits · e / os / android_build_soong

android/arch.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -1083,6 +1083,7 @@ 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", "kryo385", []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"}},
		@@ -1094,6 +1095,7 @@ func getMegaDeviceConfig() []archConfig {
		{"arm64", "armv8-a", "exynos-m2", []string{"arm64-v8a"}},
		{"arm64", "armv8-2a", "cortex-a75", []string{"arm64-v8a"}},
		{"arm64", "armv8-2a", "cortex-a76", []string{"arm64-v8a"}},
		{"arm64", "armv8-2a", "kryo385", []string{"arm64-v8a"}},
		{"mips", "mips32-fp", "", []string{"mips"}},
		{"mips", "mips32r2-fp", "", []string{"mips"}},
		{"mips", "mips32r2-fp-xburst", "", []string{"mips"}},

+6 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,10 @@ var (
		"kryo": []string{
		"-mcpu=kryo",
		},
		"kryo385": []string{
		// Use cortex-a53 because kryo385 is not supported in GCC/clang.
		"-mcpu=cortex-a53",
		},
		"exynos-m1": []string{
		"-mcpu=exynos-m1",
		},
		@@ -92,6 +96,7 @@ func init() {
		"cortex-a75",
		"cortex-a76",
		"kryo",
		"kryo385",
		"exynos-m1",
		"exynos-m2",
		"denver64")
		@@ -144,6 +149,7 @@ var (
		"cortex-a75": "${config.Arm64ClangCortexA55Cflags}",
		"cortex-a76": "${config.Arm64ClangCortexA55Cflags}",
		"kryo": "${config.Arm64ClangKryoCflags}",
		"kryo385": "${config.Arm64ClangCortexA53Cflags}",
		"exynos-m1": "${config.Arm64ClangExynosM1Cflags}",
		"exynos-m2": "${config.Arm64ClangExynosM2Cflags}",
		}

+12 −1

Original line number	Diff line number	Diff line
		@@ -151,6 +151,15 @@ var (
		// better solution comes around. See Bug 27340895
		"-D__ARM_FEATURE_LPAE=1",
		},
		"kryo385": []string{
		// Use cortex-a53 because kryo385 is not supported in GCC/clang.
		"-mcpu=cortex-a53",
		// Fake an ARM compiler flag as these processors support LPAE which GCC/clang
		// don't advertise.
		// TODO This is a hack and we need to add it for each processor that supports LPAE until some
		// better solution comes around. See Bug 27340895
		"-D__ARM_FEATURE_LPAE=1",
		},
		}
		)

		@@ -180,6 +189,7 @@ func init() {
		"cortex-a76",
		"krait",
		"kryo",
		"kryo385",
		"exynos-m1",
		"exynos-m2",
		"denver")
		@@ -258,6 +268,7 @@ var (
		"cortex-a75": "${config.ArmClangCortexA55Cflags}",
		"krait": "${config.ArmClangKraitCflags}",
		"kryo": "${config.ArmClangKryoCflags}",
		"kryo385": "${config.ArmClangCortexA53Cflags}",
		"exynos-m1": "${config.ArmClangCortexA53Cflags}",
		"exynos-m2": "${config.ArmClangCortexA53Cflags}",
		"denver": "${config.ArmClangCortexA15Cflags}",