Merge "Define __le32__ for target le32-none-ndk" into release_31
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 32ca631..7bd9b0d 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -3936,6 +3936,9 @@
 public:
   AndroidNDKTargetInfo(const std::string& TripleStr);
 
+  virtual void getArchDefines(const LangOptions &Opts,
+                              MacroBuilder &Builder) const;
+
   virtual void getTargetDefines(const LangOptions& Opts,
                                 MacroBuilder& Builder) const;
 
@@ -3994,10 +3997,17 @@
                       "v128:64:128-a0:0:64-n32-S64";
 }
 
+void AndroidNDKTargetInfo::getArchDefines(const LangOptions& Opts,
+                                         MacroBuilder& Builder) const {
+  Builder.defineMacro("__le32__");
+  Builder.defineMacro("__ANDROID__");
+}
+
 void AndroidNDKTargetInfo::getTargetDefines(const LangOptions& Opts,
                                          MacroBuilder& Builder) const {
-  Builder.defineMacro("__ANDROID__");
   Builder.defineMacro("__ELF__");
+  Builder.defineMacro("__LITTLE_ENDIAN__");
+  getArchDefines(Opts, Builder);
 }
 
 } // end anonymous namespace