Author: dsanders Date: Fri May 27 09:30:23 2016 New Revision: 270998 URL: http://llvm.org/viewvc/llvm-project?rev=270998&view=rev Log: [mips] Kill 'support' for untested EABI.
Summary: There are no llvm backend tests* for EABI and no EABI buildbots. There were only three clang tests, all of which checked that -mabi=eabi was passed to the assembler. *There is a single backend test that specifies EABI but it actually tests MIPS16. Reviewers: atanasyan Subscribers: emaste, sdardis, atanasyan, cfe-commits Differential Revision: http://reviews.llvm.org/D20679 Modified: cfe/trunk/lib/Basic/Targets.cpp cfe/trunk/lib/Driver/Tools.cpp cfe/trunk/test/Driver/freebsd-mips-as.c cfe/trunk/test/Driver/mips-abi.c cfe/trunk/test/Driver/mips-as.c Modified: cfe/trunk/lib/Basic/Targets.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=270998&r1=270997&r2=270998&view=diff ============================================================================== --- cfe/trunk/lib/Basic/Targets.cpp (original) +++ cfe/trunk/lib/Basic/Targets.cpp Fri May 27 09:30:23 2016 @@ -7009,7 +7009,7 @@ public: class MipsTargetInfo : public TargetInfo { void setDataLayout() { if (BigEndian) { - if (ABI == "o32" || ABI == "eabi") + if (ABI == "o32") resetDataLayout("E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64"); else if (ABI == "n32") resetDataLayout("E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32:64-S128"); @@ -7018,7 +7018,7 @@ class MipsTargetInfo : public TargetInfo else llvm_unreachable("Invalid ABI"); } else { - if (ABI == "o32" || ABI == "eabi") + if (ABI == "o32") resetDataLayout("e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64"); else if (ABI == "n32") resetDataLayout("e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32:64-S128"); @@ -7100,7 +7100,7 @@ public: bool setABI(const std::string &Name) override { if (getTriple().getArch() == llvm::Triple::mips || getTriple().getArch() == llvm::Triple::mipsel) { - if (Name == "o32" || Name == "eabi") { + if (Name == "o32") { ABI = Name; return true; } @@ -7217,9 +7217,7 @@ public: Builder.defineMacro("__mips_o32"); Builder.defineMacro("_ABIO32", "1"); Builder.defineMacro("_MIPS_SIM", "_ABIO32"); - } else if (ABI == "eabi") - Builder.defineMacro("__mips_eabi"); - else if (ABI == "n32") { + } else if (ABI == "n32") { Builder.defineMacro("__mips_n32"); Builder.defineMacro("_ABIN32", "2"); Builder.defineMacro("_MIPS_SIM", "_ABIN32"); Modified: cfe/trunk/lib/Driver/Tools.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=270998&r1=270997&r2=270998&view=diff ============================================================================== --- cfe/trunk/lib/Driver/Tools.cpp (original) +++ cfe/trunk/lib/Driver/Tools.cpp Fri May 27 09:30:23 2016 @@ -1233,7 +1233,7 @@ void mips::getMipsCPUAndABI(const ArgLis if (CPUName.empty()) { // Deduce CPU name from ABI name. CPUName = llvm::StringSwitch<const char *>(ABIName) - .Cases("o32", "eabi", DefMips32CPU) + .Case("o32", DefMips32CPU) .Cases("n32", "n64", DefMips64CPU) .Default(""); } Modified: cfe/trunk/test/Driver/freebsd-mips-as.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/freebsd-mips-as.c?rev=270998&r1=270997&r2=270998&view=diff ============================================================================== --- cfe/trunk/test/Driver/freebsd-mips-as.c (original) +++ cfe/trunk/test/Driver/freebsd-mips-as.c Fri May 27 09:30:23 2016 @@ -45,11 +45,6 @@ // RUN: | FileCheck -check-prefix=MIPS64-DEF-EL-AS %s // MIPS64-DEF-EL-AS: as{{(.exe)?}}" "-march" "mips64r2" "-mabi" "64" "-EL" // -// RUN: %clang -target mips-unknown-freebsd -mabi=eabi -### \ -// RUN: -no-integrated-as -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix=MIPS-EABI %s -// MIPS-EABI: as{{(.exe)?}}" "-march" "mips32r2" "-mabi" "eabi" "-EB" -// // RUN: %clang -target mips64-unknown-freebsd -mabi=n32 -### \ // RUN: -no-integrated-as -c %s 2>&1 \ // RUN: | FileCheck -check-prefix=MIPS-N32 %s Modified: cfe/trunk/test/Driver/mips-abi.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mips-abi.c?rev=270998&r1=270997&r2=270998&view=diff ============================================================================== --- cfe/trunk/test/Driver/mips-abi.c (original) +++ cfe/trunk/test/Driver/mips-abi.c Fri May 27 09:30:23 2016 @@ -45,12 +45,6 @@ // RUN: | FileCheck -check-prefix=MIPS-ABI-O64 %s // MIPS-ABI-O64: error: unknown target ABI 'o64' // -// RUN: %clang -target mips-linux-gnu -### -c %s \ -// RUN: -mabi=eabi 2>&1 \ -// RUN: | FileCheck -check-prefix=MIPS-ABI-EABI %s -// MIPS-ABI-EABI: "-target-cpu" "mips32r2" -// MIPS-ABI-EABI: "-target-abi" "eabi" -// // RUN: not %clang -target mips-linux-gnu -c %s \ // RUN: -mabi=unknown 2>&1 \ // RUN: | FileCheck -check-prefix=MIPS-ABI-UNKNOWN %s Modified: cfe/trunk/test/Driver/mips-as.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mips-as.c?rev=270998&r1=270997&r2=270998&view=diff ============================================================================== --- cfe/trunk/test/Driver/mips-as.c (original) +++ cfe/trunk/test/Driver/mips-as.c Fri May 27 09:30:23 2016 @@ -30,11 +30,6 @@ // RUN: | FileCheck -check-prefix=MIPS64R2-DEF-EL-AS %s // MIPS64R2-DEF-EL-AS: as{{(.exe)?}}" "-march" "mips64r2" "-mabi" "64" "-mno-shared" "-KPIC" "-EL" // -// RUN: %clang -target mips-linux-gnu -mabi=eabi -### \ -// RUN: -no-integrated-as -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix=MIPS-EABI %s -// MIPS-EABI: as{{(.exe)?}}" "-march" "mips32r2" "-mabi" "eabi" "-mno-shared" "-call_nonpic" "-EB" -// // RUN: %clang -target mips64-linux-gnu -mabi=n32 -### \ // RUN: -no-integrated-as -c %s 2>&1 \ // RUN: | FileCheck -check-prefix=MIPS-N32 %s _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits