commit c7d1c422b652ee7eb9286fc8b09220410ff57922
author Ewan Crawford <ewan.codeplay@googlemail.com> Wed Mar 30 22:17:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 30 22:17:47 2016 +0000
tree d7c9bc5d68eaf82760c9db3a6fdebc8e8850aded
parent a6eb6c94c11d9ff9ab53a142440e8b477a99ea64
parent 37df2caf6bee98712e254c485633fc8de3059497

Merge "Use RenderScript DWARF tag for bcc generated code." am: 2413a9a am: 336355c
am: 37df2ca

* commit '37df2caf6bee98712e254c485633fc8de3059497':
  Use RenderScript DWARF tag for bcc generated code.

Change-Id: Ib23319f94a6e00124b2bc8f8e72f4d641b80a6fc

lib/Renderscript/RSAddDebugInfoPass.cpp

diff --git a/lib/Renderscript/RSAddDebugInfoPass.cpp b/lib/Renderscript/RSAddDebugInfoPass.cpp
index 27aa5de..8a8cec8 100644
--- a/lib/Renderscript/RSAddDebugInfoPass.cpp
+++ b/lib/Renderscript/RSAddDebugInfoPass.cpp
@@ -94,7 +94,7 @@
     llvm::LLVMContext &ctx = Module.getContext();
 
     // Start generating debug information for bcc-generated code.
-    DebugInfo.createCompileUnit(llvm::dwarf::DW_LANG_C99,
+    DebugInfo.createCompileUnit(llvm::dwarf::DW_LANG_GOOGLE_RenderScript,
                                 DEBUG_GENERATED_FILE, DEBUG_SOURCE_PATH,
                                 "RS", false, "", 0);