Revert "[MIPS] Link .dex or .oat code lacking .MIPS.abiflags segment"
This reverts commit 0acb15ead6a554a6879b29fd90726b9ea8fd98c4.
This workaround is not needed any more. Now ART generates
.MIPS.abiflags segments in its files. This is done in
Ie06a3c4e384a23a77db7d04a2508edbf3a6d3933.
Change-Id: I746289eed443a0fdbe8fd0b1199bcc5cd4d024e1
diff --git a/linker/linker_mips.cpp b/linker/linker_mips.cpp
index 6130066..8520c17 100644
--- a/linker/linker_mips.cpp
+++ b/linker/linker_mips.cpp
@@ -256,18 +256,10 @@
// FP ABI-variant compatibility checks for MIPS o32 ABI
if (abiflags == nullptr) {
- // Old compilers and some translators don't emit the new abiflags section.
- const char* filename = get_realpath();
- size_t len = strlen(filename);
- if (len > 4 && (strcmp(filename+len-4, ".dex") == 0 ||
- strcmp(filename+len-4, ".oat") == 0 )) {
- // Assume dex2oat is compatible with target
- mips_fpabi = MIPS_ABI_FP_XX;
- } else {
- // Old Android compilers used -mfp32 -mdouble-float -modd-spreg defaults,
- // ie FP32 aka DOUBLE, using FR=0 mode fpregs & odd single-prec fpregs
- mips_fpabi = MIPS_ABI_FP_DOUBLE;
- }
+ // Old compilers lack the new abiflags section.
+ // These compilers used -mfp32 -mdouble-float -modd-spreg defaults,
+ // ie FP32 aka DOUBLE, using odd-numbered single-prec regs
+ mips_fpabi = MIPS_ABI_FP_DOUBLE;
} else {
mips_fpabi = abiflags->fp_abi;
if ( (abiflags->flags1 & MIPS_AFL_FLAGS1_ODDSPREG)