diff options
| author | Omair Javaid <omair.javaid@linaro.org> | 2015-05-15 08:30:29 +0000 |
|---|---|---|
| committer | Omair Javaid <omair.javaid@linaro.org> | 2015-05-15 08:30:29 +0000 |
| commit | cdad63b33dc296806a243fdb4264392c692d90d2 (patch) | |
| tree | 1ce414fe536066798205a9fcba5b1f030c9c88ac /lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | |
| parent | 794a4d5a9ffcbcc6bbc5ae0387e1b69603ddffa5 (diff) | |
| download | bcm5719-llvm-cdad63b33dc296806a243fdb4264392c692d90d2.tar.gz bcm5719-llvm-cdad63b33dc296806a243fdb4264392c692d90d2.zip | |
LLDB build broke after applying patch http://reviews.llvm.org/D9706
This patch fixes the issue.
llvm-svn: 237421
Diffstat (limited to 'lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp')
| -rw-r--r-- | lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index de24872ae22..4bc17496d26 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp @@ -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::tid_t tid, void *buf, size_t buf_size, 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::WriteHardwareDebugRegs (lldb::tid_t tid, lldb::addr_t *addr_ return op.GetError(); } -#endif - Error NativeProcessLinux::WriteGPR(lldb::tid_t tid, void *buf, size_t buf_size) { |
