1 files changed, 7 insertions, 0 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index a304a78354e..89f192abc07 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -5442,6 +5442,13 @@ public:
       if (Feature[0] == '+')
         Features[Feature.drop_front(1)] = true;
 
+    // Enable or disable thumb-mode explicitly per function to enable mixed
+    // ARM and Thumb code generation.
+    if (isThumb())
+      Features["thumb-mode"] = true;
+    else
+      Features["thumb-mode"] = false;
+
     // Convert user-provided arm and thumb GNU target attributes to
     // [-|+]thumb-mode target features respectively.
     std::vector<std::string> UpdatedFeaturesVec(FeaturesVec);