From cdad63b33dc296806a243fdb4264392c692d90d2 Mon Sep 17 00:00:00 2001
From: Omair Javaid <omair.javaid@linaro.org>
Date: Fri, 15 May 2015 08:30:29 +0000
Subject: LLDB build broke after applying patch http://reviews.llvm.org/D9706

This patch fixes the issue.

llvm-svn: 237421
---
 .../Plugins/Process/Linux/NativeProcessLinux.cpp       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp')

diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
index de24872ae227..4bc17496d268 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, &regset, &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)
 {
-- 
cgit v1.2.3