This revision was automatically updated to reflect the committed changes. Closed by commit rL269754: [Mips] Set mips32 as default CPU for MIPS32 Android (authored by petarj).
Changed prior to commit: http://reviews.llvm.org/D20313?vs=57423&id=57454#toc Repository: rL LLVM http://reviews.llvm.org/D20313 Files: cfe/trunk/lib/Driver/Tools.cpp cfe/trunk/test/Driver/clang-translation.c Index: cfe/trunk/test/Driver/clang-translation.c =================================================================== --- cfe/trunk/test/Driver/clang-translation.c +++ cfe/trunk/test/Driver/clang-translation.c @@ -245,7 +245,7 @@ // RUN: FileCheck -check-prefix=MIPSEL-ANDROID %s // MIPSEL-ANDROID: clang // MIPSEL-ANDROID: "-cc1" -// MIPSEL-ANDROID: "-target-cpu" "mips32r2" +// MIPSEL-ANDROID: "-target-cpu" "mips32" // MIPSEL-ANDROID: "-mfloat-abi" "hard" // RUN: %clang -target mips64-linux-gnu -### -S %s 2>&1 | \ Index: cfe/trunk/lib/Driver/Tools.cpp =================================================================== --- cfe/trunk/lib/Driver/Tools.cpp +++ cfe/trunk/lib/Driver/Tools.cpp @@ -1183,8 +1183,10 @@ } // MIPS64r6 is the default for Android MIPS64 (mips64el-linux-android). - if (Triple.isAndroid()) + if (Triple.isAndroid()) { + DefMips32CPU = "mips32"; DefMips64CPU = "mips64r6"; + } // MIPS3 is the default for mips64*-unknown-openbsd. if (Triple.getOS() == llvm::Triple::OpenBSD)
Index: cfe/trunk/test/Driver/clang-translation.c =================================================================== --- cfe/trunk/test/Driver/clang-translation.c +++ cfe/trunk/test/Driver/clang-translation.c @@ -245,7 +245,7 @@ // RUN: FileCheck -check-prefix=MIPSEL-ANDROID %s // MIPSEL-ANDROID: clang // MIPSEL-ANDROID: "-cc1" -// MIPSEL-ANDROID: "-target-cpu" "mips32r2" +// MIPSEL-ANDROID: "-target-cpu" "mips32" // MIPSEL-ANDROID: "-mfloat-abi" "hard" // RUN: %clang -target mips64-linux-gnu -### -S %s 2>&1 | \ Index: cfe/trunk/lib/Driver/Tools.cpp =================================================================== --- cfe/trunk/lib/Driver/Tools.cpp +++ cfe/trunk/lib/Driver/Tools.cpp @@ -1183,8 +1183,10 @@ } // MIPS64r6 is the default for Android MIPS64 (mips64el-linux-android). - if (Triple.isAndroid()) + if (Triple.isAndroid()) { + DefMips32CPU = "mips32"; DefMips64CPU = "mips64r6"; + } // MIPS3 is the default for mips64*-unknown-openbsd. if (Triple.getOS() == llvm::Triple::OpenBSD)
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits