[Lldb-commits] [lldb] r237493 - Fixed arm64 build error

[Vince Harron]

Author: vharron
Date: Fri May 15 19:26:20 2015
New Revision: 237493

URL: http://llvm.org/viewvc/llvm-project?rev=237493&view=rev
Log:
Fixed arm64 build error


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

Modified: lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp?rev=237493&r1=237492&r2=237493&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp Fri May 15 
19:26:20 2015
@@ -928,8 +928,8 @@ namespace
         struct user_hwdebug_state dreg_state;
 
         memset (&dreg_state, 0, sizeof (dreg_state));
-        ioVec.iov_len = (__builtin_offsetof (struct user_hwdebug_state, 
dbg_regs[m_count - 1])
-                      + sizeof (dreg_state.dbg_regs [m_count - 1]));
+        ioVec.iov_base = &dreg_state;
+        ioVec.iov_len = sizeof (dreg_state);
 
         if (m_type == 0)
             m_type = NT_ARM_HW_WATCH;

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=237493&r1=237492&r2=237493&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp Fri May 15 
19:26:20 2015
@@ -621,8 +621,8 @@ ReadRegOperation::Execute(ProcessMonitor
         struct user_hwdebug_state dreg_state;
 
         memset (&dreg_state, 0, sizeof (dreg_state));
-        ioVec.iov_len = (__builtin_offsetof (struct user_hwdebug_state, 
dbg_regs[m_count - 1])
-                      + sizeof (dreg_state.dbg_regs [m_count - 1]));
+        ioVec.iov_base = &dreg_state;
+        ioVec.iov_len = sizeof(dreg_state);
 
         if (m_type == 0)
             m_type = NT_ARM_HW_WATCH;


_______________________________________________
lldb-commits mailing list
lldb-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits