[Lldb-commits] [lldb] r217169 - Fix build break on Ubuntu 12.04 with ARM64 changes.

Todd Fiala todd.fiala at gmail.com
Thu Sep 4 09:08:20 PDT 2014


Author: tfiala
Date: Thu Sep  4 11:08:20 2014
New Revision: 217169

URL: http://llvm.org/viewvc/llvm-project?rev=217169&view=rev
Log:
Fix build break on Ubuntu 12.04 with ARM64 changes.

See http://llvm.org/bugs/show_bug.cgi?id=20824 for more details.

Tested:
Ubuntu 12.04 x86_64, gcc-4.9.1-built lldb
Ubuntu 14.04 x86_64, clang-3.5-build lldb


Modified:
    lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp

Modified: lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp?rev=217169&r1=217168&r2=217169&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp Thu Sep  4 11:08:20 2014
@@ -65,6 +65,8 @@
 
 #define LLDB_PERSONALITY_GET_CURRENT_SETTINGS  0xffffffff
 
+#define LLDB_PTRACE_NT_ARM_TLS  0x401           // ARM TLS register
+
 // Support hardware breakpoints in case it has not been defined
 #ifndef TRAP_HWBKPT
   #define TRAP_HWBKPT 4
@@ -800,7 +802,7 @@ ReadThreadPointerOperation::Execute(Proc
     {
     case llvm::Triple::aarch64:
     {
-         int regset = NT_ARM_TLS;
+         int regset = LLDB_PTRACE_NT_ARM_TLS;
          struct iovec ioVec;
 
          ioVec.iov_base = m_addr;





More information about the lldb-commits mailing list