This revision was automatically updated to reflect the committed changes. Closed by commit rL242522: [Mips] Set mips64r6 as default CPU for MIPS64 Android (authored by petarj).
Changed prior to commit: http://reviews.llvm.org/D11294?vs=29995&id=29996#toc Repository: rL LLVM http://reviews.llvm.org/D11294 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 @@ -266,5 +266,5 @@ // RUN: FileCheck -check-prefix=MIPS64EL-ANDROID %s // MIPS64EL-ANDROID: clang // MIPS64EL-ANDROID: "-cc1" -// MIPS64EL-ANDROID: "-target-cpu" "mips64r2" +// MIPS64EL-ANDROID: "-target-cpu" "mips64r6" // MIPS64EL-ANDROID: "-mfloat-abi" "hard" Index: cfe/trunk/lib/Driver/Tools.cpp =================================================================== --- cfe/trunk/lib/Driver/Tools.cpp +++ cfe/trunk/lib/Driver/Tools.cpp @@ -941,6 +941,10 @@ DefMips32CPU = "mips32r6"; DefMips64CPU = "mips64r6"; } + + // MIPS64r6 is the default for Android MIPS64 (mips64el-linux-android). + if (Triple.getEnvironment() == llvm::Triple::Android) + 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 @@ -266,5 +266,5 @@ // RUN: FileCheck -check-prefix=MIPS64EL-ANDROID %s // MIPS64EL-ANDROID: clang // MIPS64EL-ANDROID: "-cc1" -// MIPS64EL-ANDROID: "-target-cpu" "mips64r2" +// MIPS64EL-ANDROID: "-target-cpu" "mips64r6" // MIPS64EL-ANDROID: "-mfloat-abi" "hard" Index: cfe/trunk/lib/Driver/Tools.cpp =================================================================== --- cfe/trunk/lib/Driver/Tools.cpp +++ cfe/trunk/lib/Driver/Tools.cpp @@ -941,6 +941,10 @@ DefMips32CPU = "mips32r6"; DefMips64CPU = "mips64r6"; } + + // MIPS64r6 is the default for Android MIPS64 (mips64el-linux-android). + if (Triple.getEnvironment() == llvm::Triple::Android) + DefMips64CPU = "mips64r6"; // MIPS3 is the default for mips64*-unknown-openbsd. if (Triple.getOS() == llvm::Triple::OpenBSD)
_______________________________________________ cfe-commits mailing list cfe-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits