Author: omjavaid Date: Fri May 15 03:30:29 2015 New Revision: 237421 URL: http://llvm.org/viewvc/llvm-project?rev=237421&view=rev Log: LLDB build broke after applying patch http://reviews.llvm.org/D9706
This patch fixes the issue. Modified: lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h 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=237421&r1=237420&r2=237421&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp (original) +++ lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp Fri May 15 03:30:29 2015 @@ -762,10 +762,9 @@ namespace #endif } -#if defined (__arm64__) || defined (__aarch64__) //------------------------------------------------------------------------------ /// @class ReadDBGROperation - /// @brief Implements NativeProcessLinux::ReadDBGR. + /// @brief Implements NativeProcessLinux::ReadHardwareDebugInfo. class ReadDBGROperation : public Operation { public: @@ -786,6 +785,7 @@ namespace void ReadDBGROperation::Execute(NativeProcessLinux *monitor) { +#if defined (__arm64__) || defined (__aarch64__) int regset = NT_ARM_HW_WATCH; struct iovec ioVec; struct user_hwdebug_state dreg_state; @@ -800,8 +800,9 @@ namespace PTRACE(PTRACE_GETREGSET, m_tid, ®set, &ioVec, ioVec.iov_len, m_error); m_count_bp = dreg_state.dbg_info & 0xff; - } #endif + } + //------------------------------------------------------------------------------ /// @class ReadRegisterSetOperation @@ -894,10 +895,9 @@ namespace #endif } -#if defined (__arm64__) || defined (__aarch64__) //------------------------------------------------------------------------------ /// @class WriteDBGROperation - /// @brief Implements NativeProcessLinux::WriteFPR. + /// @brief Implements NativeProcessLinux::WriteHardwareDebugRegs. class WriteDBGROperation : public Operation { public: @@ -923,6 +923,7 @@ namespace void WriteDBGROperation::Execute(NativeProcessLinux *monitor) { +#if defined (__arm64__) || defined (__aarch64__) struct iovec ioVec; struct user_hwdebug_state dreg_state; @@ -942,8 +943,9 @@ namespace } PTRACE(PTRACE_SETREGSET, m_tid, &m_type, &ioVec, ioVec.iov_len, m_error); - } #endif + } + //------------------------------------------------------------------------------ /// @class WriteRegisterSetOperation @@ -3933,8 +3935,6 @@ NativeProcessLinux::ReadRegisterSet(lldb return op.GetError(); } -#if defined (__arm64__) || defined (__aarch64__) - Error NativeProcessLinux::ReadHardwareDebugInfo (lldb::tid_t tid, unsigned int &watch_count , unsigned int &break_count) { @@ -3951,8 +3951,6 @@ NativeProcessLinux::WriteHardwareDebugRe return op.GetError(); } -#endif - Error NativeProcessLinux::WriteGPR(lldb::tid_t tid, void *buf, size_t buf_size) { Modified: lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h?rev=237421&r1=237420&r2=237421&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h (original) +++ lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h Fri May 15 03:30:29 2015 @@ -151,7 +151,6 @@ namespace process_linux { Error ReadFPR(lldb::tid_t tid, void *buf, size_t buf_size); -#if defined (__arm64__) || defined (__aarch64__) /// Reads hardware breakpoints and watchpoints capability information. Error ReadHardwareDebugInfo (lldb::tid_t tid, unsigned int &watch_count , @@ -161,7 +160,7 @@ namespace process_linux { Error WriteHardwareDebugRegs (lldb::tid_t tid, lldb::addr_t *addr_buf, uint32_t *cntrl_buf, int type, int count); -#endif + /// Reads the specified register set into the specified buffer. /// For instance, the extended floating-point register set. Error _______________________________________________ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits