diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
index e7cb2b413ad7..35d0be706d1b 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
@@ -1180,7 +1180,7 @@ DWARFCompileUnit::LanguageTypeFromDWARF(uint64_t val)
     {
     case DW_LANG_Mips_Assembler:
         return eLanguageTypeMipsAssembler;
-    case 0x8e57: // FIXME: needs to be added to llvm
+    case DW_LANG_GOOGLE_RenderScript:
         return eLanguageTypeExtRenderScript;
     default:
         return static_cast<LanguageType>(val);
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp
index 2086ca77bff7..0fc1a94876bf 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -105,7 +105,8 @@ namespace
         return language == eLanguageTypeUnknown || // Clang is the default type system
                Language::LanguageIsC (language) ||
                Language::LanguageIsCPlusPlus (language) ||
-               Language::LanguageIsObjC (language);
+               Language::LanguageIsObjC (language) ||
+               language == eLanguageTypeExtRenderScript;
     }
 }