Merge "Remove unused mips workarounds." (cc868de8) · Commits · e / os / android_build_soong

Android.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -143,8 +143,6 @@ bootstrap_go_package {
		"cc/config/arm_device.go",
		"cc/config/arm64_device.go",
		"cc/config/arm64_fuchsia_device.go",
		"cc/config/mips_device.go",
		"cc/config/mips64_device.go",
		"cc/config/x86_device.go",
		"cc/config/x86_64_device.go",
		"cc/config/x86_64_fuchsia_device.go",

android/arch.go

+1 −54

Original line number	Diff line number	Diff line
		@@ -33,8 +33,6 @@ var (

		Arm = newArch("arm", "lib32")
		Arm64 = newArch("arm64", "lib64")
		Mips = newArch("mips", "lib32")
		Mips64 = newArch("mips64", "lib64")
		X86 = newArch("x86", "lib32")
		X86_64 = newArch("x86_64", "lib64")

		@@ -46,8 +44,6 @@ var (
		var archTypeMap = map[string]ArchType{
		"arm": Arm,
		"arm64": Arm64,
		"mips": Mips,
		"mips64": Mips64,
		"x86": X86,
		"x86_64": X86_64,
		}
		@@ -64,12 +60,6 @@ module {
		arm64: {
		// Host or device variants with arm64 architecture
		},
		mips: {
		// Host or device variants with mips architecture
		},
		mips64: {
		// Host or device variants with mips64 architecture
		},
		x86: {
		// Host or device variants with x86 architecture
		},
		@@ -145,18 +135,6 @@ var archVariants = map[ArchType][]string{
		"exynos-m1",
		"exynos-m2",
		},
		Mips: {
		"mips32_fp",
		"mips32r2_fp",
		"mips32r2_fp_xburst",
		"mips32r2dsp_fp",
		"mips32r2dspr2_fp",
		"mips32r6",
		},
		Mips64: {
		"mips64r2",
		"mips64r6",
		},
		X86: {
		"amberlake",
		"atom",
		@@ -193,15 +171,6 @@ var archFeatures = map[ArchType][]string{
		Arm: {
		"neon",
		},
		Mips: {
		"dspr2",
		"rev6",
		"msa",
		},
		Mips64: {
		"rev6",
		"msa",
		},
		X86: {
		"ssse3",
		"sse4",
		@@ -239,19 +208,6 @@ var archFeatureMap = map[ArchType]map[string][]string{
		"neon",
		},
		},
		Mips: {
		"mips32r2dspr2_fp": {
		"dspr2",
		},
		"mips32r6": {
		"rev6",
		},
		},
		Mips64: {
		"mips64r6": {
		"rev6",
		},
		},
		X86: {
		"amberlake": {
		"ssse3",
		@@ -616,7 +572,7 @@ var (
		LinuxBionic: []ArchType{X86_64},
		Darwin: []ArchType{X86_64},
		Windows: []ArchType{X86, X86_64},
		Android: []ArchType{Arm, Arm64, Mips, Mips64, X86, X86_64},
		Android: []ArchType{Arm, Arm64, X86, X86_64},
		Fuchsia: []ArchType{Arm64, X86_64},
		}
		)
		@@ -1656,15 +1612,6 @@ func getMegaDeviceConfig() []archConfig {
		{"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"}},
		//{"mips", "mips32r6", "", []string{"mips"}},
		{"mips", "mips32r2dsp-fp", "", []string{"mips"}},
		{"mips", "mips32r2dspr2-fp", "", []string{"mips"}},
		// mips64r2 is mismatching 64r2 and 64r6 libraries during linking to libgcc
		//{"mips64", "mips64r2", "", []string{"mips64"}},
		{"mips64", "mips64r6", "", []string{"mips64"}},
		{"x86", "", "", []string{"x86"}},
		{"x86", "atom", "", []string{"x86"}},
		{"x86", "haswell", "", []string{"x86"}},

android/config.go

+1 −10

Original line number	Diff line number	Diff line
		@@ -863,16 +863,7 @@ func (c *config) LibartImgHostBaseAddress() string {
		}

		func (c *config) LibartImgDeviceBaseAddress() string {
		archType := Common
		if len(c.Targets[Android]) > 0 {
		archType = c.Targets[Android][0].Arch.ArchType
		}
		switch archType {
		default:
		return "0x70000000"
		case Mips, Mips64:
		return "0x5C000000"
		}
		}

		func (c *config) ArtUseReadBarrier() bool {

androidmk/androidmk/android.go

+0 −2

Original line number	Diff line number	Diff line
		@@ -829,8 +829,6 @@ func skip(ctx variableAssignmentContext) error {
		var propertyPrefixes = []struct{ mk, bp string }{
		{"arm", "arch.arm"},
		{"arm64", "arch.arm64"},
		{"mips", "arch.mips"},
		{"mips64", "arch.mips64"},
		{"x86", "arch.x86"},
		{"x86_64", "arch.x86_64"},
		{"32", "multilib.lib32"},

cc/config/clang.go

+1 −6

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ var ClangUnknownCflags = sorted([]string{
		"-Wunused-but-set-variable",
		"-fdiagnostics-color",

		// arm + arm64 + mips + mips64
		// arm + arm64
		"-fgcse-after-reload",
		"-frerun-cse-after-loop",
		"-frename-registers",
		@@ -68,11 +68,6 @@ var ClangUnknownCflags = sorted([]string{
		"-fno-tree-copy-prop",
		"-fno-tree-loop-optimize",

		// mips + mips64
		"-msynci",
		"-mno-synci",
		"-mno-fused-madd",

		// x86 + x86_64
		"-finline-limit=300",
		"-fno-inline-functions-called-once",