From c5e5ba39f43a13c1efdee64593c36a545deddd90 Mon Sep 17 00:00:00 2001 From: Petar Jovanovic Date: Tue, 17 May 2016 10:46:10 +0000 Subject: [PATCH] [Mips] Set mips32 as default CPU for MIPS32 Android Change default CPU for MIPS32 Android. Now it is mips32 (rev1). Differential Revision: http://reviews.llvm.org/D20313 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@269754 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 4 +++- test/Driver/clang-translation.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index b6d86e4ea8..206c32ede5 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1183,8 +1183,10 @@ void mips::getMipsCPUAndABI(const ArgList &Args, const llvm::Triple &Triple, } // 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) diff --git a/test/Driver/clang-translation.c b/test/Driver/clang-translation.c index 422aa13934..fe1ec48476 100644 --- a/test/Driver/clang-translation.c +++ b/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 | \ -- 2.40.0