Skip to content

Commit da3a071

Browse files
committed
Remove unused mips workarounds.
This was never really finished, and hasn't been supported for years. Test: treehugger Change-Id: I21d4c3112aa8cf0c56e59f0cc19ff8725ef714b9
1 parent 03b5185 commit da3a071

File tree

15 files changed

+9
-432
lines changed

15 files changed

+9
-432
lines changed

Android.bp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ bootstrap_go_package {
143143
"cc/config/arm_device.go",
144144
"cc/config/arm64_device.go",
145145
"cc/config/arm64_fuchsia_device.go",
146-
"cc/config/mips_device.go",
147-
"cc/config/mips64_device.go",
148146
"cc/config/x86_device.go",
149147
"cc/config/x86_64_device.go",
150148
"cc/config/x86_64_fuchsia_device.go",

android/arch.go

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ var (
3333

3434
Arm = newArch("arm", "lib32")
3535
Arm64 = newArch("arm64", "lib64")
36-
Mips = newArch("mips", "lib32")
37-
Mips64 = newArch("mips64", "lib64")
3836
X86 = newArch("x86", "lib32")
3937
X86_64 = newArch("x86_64", "lib64")
4038

@@ -46,8 +44,6 @@ var (
4644
var archTypeMap = map[string]ArchType{
4745
"arm": Arm,
4846
"arm64": Arm64,
49-
"mips": Mips,
50-
"mips64": Mips64,
5147
"x86": X86,
5248
"x86_64": X86_64,
5349
}
@@ -64,12 +60,6 @@ module {
6460
arm64: {
6561
// Host or device variants with arm64 architecture
6662
},
67-
mips: {
68-
// Host or device variants with mips architecture
69-
},
70-
mips64: {
71-
// Host or device variants with mips64 architecture
72-
},
7363
x86: {
7464
// Host or device variants with x86 architecture
7565
},
@@ -145,18 +135,6 @@ var archVariants = map[ArchType][]string{
145135
"exynos-m1",
146136
"exynos-m2",
147137
},
148-
Mips: {
149-
"mips32_fp",
150-
"mips32r2_fp",
151-
"mips32r2_fp_xburst",
152-
"mips32r2dsp_fp",
153-
"mips32r2dspr2_fp",
154-
"mips32r6",
155-
},
156-
Mips64: {
157-
"mips64r2",
158-
"mips64r6",
159-
},
160138
X86: {
161139
"amberlake",
162140
"atom",
@@ -193,15 +171,6 @@ var archFeatures = map[ArchType][]string{
193171
Arm: {
194172
"neon",
195173
},
196-
Mips: {
197-
"dspr2",
198-
"rev6",
199-
"msa",
200-
},
201-
Mips64: {
202-
"rev6",
203-
"msa",
204-
},
205174
X86: {
206175
"ssse3",
207176
"sse4",
@@ -239,19 +208,6 @@ var archFeatureMap = map[ArchType]map[string][]string{
239208
"neon",
240209
},
241210
},
242-
Mips: {
243-
"mips32r2dspr2_fp": {
244-
"dspr2",
245-
},
246-
"mips32r6": {
247-
"rev6",
248-
},
249-
},
250-
Mips64: {
251-
"mips64r6": {
252-
"rev6",
253-
},
254-
},
255211
X86: {
256212
"amberlake": {
257213
"ssse3",
@@ -616,7 +572,7 @@ var (
616572
LinuxBionic: []ArchType{X86_64},
617573
Darwin: []ArchType{X86_64},
618574
Windows: []ArchType{X86, X86_64},
619-
Android: []ArchType{Arm, Arm64, Mips, Mips64, X86, X86_64},
575+
Android: []ArchType{Arm, Arm64, X86, X86_64},
620576
Fuchsia: []ArchType{Arm64, X86_64},
621577
}
622578
)
@@ -1656,15 +1612,6 @@ func getMegaDeviceConfig() []archConfig {
16561612
{"arm64", "armv8-2a", "cortex-a75", []string{"arm64-v8a"}},
16571613
{"arm64", "armv8-2a", "cortex-a76", []string{"arm64-v8a"}},
16581614
{"arm64", "armv8-2a", "kryo385", []string{"arm64-v8a"}},
1659-
{"mips", "mips32-fp", "", []string{"mips"}},
1660-
{"mips", "mips32r2-fp", "", []string{"mips"}},
1661-
{"mips", "mips32r2-fp-xburst", "", []string{"mips"}},
1662-
//{"mips", "mips32r6", "", []string{"mips"}},
1663-
{"mips", "mips32r2dsp-fp", "", []string{"mips"}},
1664-
{"mips", "mips32r2dspr2-fp", "", []string{"mips"}},
1665-
// mips64r2 is mismatching 64r2 and 64r6 libraries during linking to libgcc
1666-
//{"mips64", "mips64r2", "", []string{"mips64"}},
1667-
{"mips64", "mips64r6", "", []string{"mips64"}},
16681615
{"x86", "", "", []string{"x86"}},
16691616
{"x86", "atom", "", []string{"x86"}},
16701617
{"x86", "haswell", "", []string{"x86"}},

android/config.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -863,16 +863,7 @@ func (c *config) LibartImgHostBaseAddress() string {
863863
}
864864

865865
func (c *config) LibartImgDeviceBaseAddress() string {
866-
archType := Common
867-
if len(c.Targets[Android]) > 0 {
868-
archType = c.Targets[Android][0].Arch.ArchType
869-
}
870-
switch archType {
871-
default:
872-
return "0x70000000"
873-
case Mips, Mips64:
874-
return "0x5C000000"
875-
}
866+
return "0x70000000"
876867
}
877868

878869
func (c *config) ArtUseReadBarrier() bool {

androidmk/androidmk/android.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,8 +829,6 @@ func skip(ctx variableAssignmentContext) error {
829829
var propertyPrefixes = []struct{ mk, bp string }{
830830
{"arm", "arch.arm"},
831831
{"arm64", "arch.arm64"},
832-
{"mips", "arch.mips"},
833-
{"mips64", "arch.mips64"},
834832
{"x86", "arch.x86"},
835833
{"x86_64", "arch.x86_64"},
836834
{"32", "multilib.lib32"},

cc/config/clang.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var ClangUnknownCflags = sorted([]string{
4949
"-Wunused-but-set-variable",
5050
"-fdiagnostics-color",
5151

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

71-
// mips + mips64
72-
"-msynci",
73-
"-mno-synci",
74-
"-mno-fused-madd",
75-
7671
// x86 + x86_64
7772
"-finline-limit=300",
7873
"-fno-inline-functions-called-once",

cc/config/mips64_device.go

Lines changed: 0 additions & 147 deletions
This file was deleted.

0 commit comments

Comments
 (0)