MIPS: Define __mips16 macro if -mips16 option is provided.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@159753 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 713396c3abc160795215d8f071ab7c19fd138868..3eaa65177c73110fda999cdc4eb28f54157ec5c8 100644 (file)
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -3599,6 +3599,7 @@ namespace {
 class MipsTargetInfoBase : public TargetInfo {
   static const Builtin::Info BuiltinInfo[];
   std::string CPU;
+  bool IsMips16;
   enum MipsFloatABI {
     HardFloat, SingleFloat, SoftFloat
   } FloatABI;
@@ -3612,6 +3613,7 @@ public:
                      const std::string& CPUStr)
     : TargetInfo(triple),
       CPU(CPUStr),
+      IsMips16(false),
       FloatABI(HardFloat),
       ABI(ABIStr)
   {}
@@ -3643,6 +3645,9 @@ public:
       break;
     }
 
+    if (IsMips16)
+      Builder.defineMacro("__mips16", Twine(1));
+
     Builder.defineMacro("_MIPS_SZPTR", Twine(getPointerWidth(0)));
     Builder.defineMacro("_MIPS_SZINT", Twine(getIntWidth()));
     Builder.defineMacro("_MIPS_SZLONG", Twine(getLongWidth()));
@@ -3722,6 +3727,7 @@ public:
   }
 
   virtual void HandleTargetFeatures(std::vector<std::string> &Features) {
+    IsMips16 = false;
     FloatABI = HardFloat;
 
     for (std::vector<std::string>::iterator it = Features.begin(),
@@ -3730,6 +3736,8 @@ public:
         FloatABI = SingleFloat;
       else if (*it == "+soft-float")
         FloatABI = SoftFloat;
+      else if (*it == "+mips16")
+        IsMips16 = true;
     }
 
     // Remove front-end specific option.

diff --git a/test/Preprocessor/init.c b/test/Preprocessor/init.c
index 9694aad3f341948399394b5f9d0e1d293e3a66f7..29ad682827d3d13eaa30ce8d52de109d49350943 100644 (file)
--- a/test/Preprocessor/init.c
+++ b/test/Preprocessor/init.c
@@ -876,6 +876,18 @@
 // MIPS-FABI-SINGLE:#define __mips_hard_float 1
 // MIPS-FABI-SINGLE:#define __mips_single_float 1
 //
+// Check MIPS features macros
+//
+// RUN: %clang_cc1 -target-feature +mips16 \
+// RUN:   -E -dM -triple=mips-none-none < /dev/null \
+// RUN:   | FileCheck -check-prefix MIPS16 %s
+// MIPS16:#define __mips16 1
+//
+// RUN: %clang_cc1 -target-feature -mips16 \
+// RUN:   -E -dM -triple=mips-none-none < /dev/null \
+// RUN:   | FileCheck -check-prefix NOMIPS16 %s
+// NOMIPS16-NOT:#define __mips16 1
+//
 // RUN: %clang_cc1 -E -dM -ffreestanding -triple=msp430-none-none < /dev/null | FileCheck -check-prefix MSP430 %s
 //
 // MSP430:#define MSP430 1