commit aa8473d1d61894c273500204d0fb969097992061
author Luke Cheeseman <luke.cheeseman@arm.com> Fri Nov 23 09:25:16 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 23 09:25:16 2018 -0800
tree c01e2b71f29e346f7e1a168c511a1dbc51a6f4be
parent ee6ff674433caa7db529f50e4ebb11cef58091a5
parent 847d15f64a973fb077bfe04e33a575f659193065

Revert r347491 as it's llvm counterpart breaks buildbots
am: 847d15f64a

Change-Id: Id10e5c86216fb21c6fd631ae526ecd760220b42d

source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp

diff --git a/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp b/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp
index 99becdb..1d927ba 100644
--- a/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp
+++ b/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp
@@ -504,9 +504,9 @@
   return llvmstr.data();
 }
 
-const char *DW_CFA_value_to_name(uint32_t val, llvm::Triple::ArchType Arch) {
+const char *DW_CFA_value_to_name(uint32_t val) {
   static char invalid[100];
-  llvm::StringRef llvmstr = llvm::dwarf::CallFrameString(val, Arch);
+  llvm::StringRef llvmstr = llvm::dwarf::CallFrameString(val);
   if (llvmstr.empty()) {
     snprintf(invalid, sizeof(invalid), "Unknown DW_CFA constant: 0x%x", val);
     return invalid;

source/Plugins/SymbolFile/DWARF/DWARFDefines.h

diff --git a/source/Plugins/SymbolFile/DWARF/DWARFDefines.h b/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
index edde869..926f83b 100644
--- a/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
+++ b/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
@@ -64,7 +64,7 @@
 
 const char *DW_MACINFO_value_to_name(uint32_t val);
 
-const char *DW_CFA_value_to_eame(uint32_t val, llvm::Triple::ArchType Arch);
+const char *DW_CFA_value_to_name(uint32_t val);
 
 const char *DW_GNU_EH_PE_value_to_name(uint32_t val);