From: Yao Qi <yao.qi@linaro.org>
Date: Mon, 20 Jul 2015 15:29:16 +0000 (+0100)
Subject: Fix ARI warnings to nat/aarch64-linux-hw-point.{c,h}
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3675a06a823132663f7c2376796c5345032fddad;p=binutils-gdb.git

Fix ARI warnings to nat/aarch64-linux-hw-point.{c,h}

This patch is to fix two ARI warnings for nat/aarch64-linux-hw-point.{c,h}.

gdb:

2015-07-20  Yao Qi  <yao.qi@linaro.org>

	* nat/aarch64-linux-hw-point.c (aarch64_handle_unaligned_watchpoint):
	Re-indent the code.
	* nat/aarch64-linux-hw-point.h: Use ULONGEST rather than
	"unsigned long long".
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f31ff58c9a..61a28b6191b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-20  Yao Qi  <yao.qi@linaro.org>
+
+	* nat/aarch64-linux-hw-point.c (aarch64_handle_unaligned_watchpoint):
+	Re-indent the code.
+	* nat/aarch64-linux-hw-point.h: Use ULONGEST rather than
+	"unsigned long long".
+
 2015-07-18  Kevin Buettner  <kevinb@redhat.com>
 
 	* dwarf2read.c (dwarf2_locate_sections): Allow has_section_at_zero
diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c
index ded4a197f3a..f58e0c5ff36 100644
--- a/gdb/nat/aarch64-linux-hw-point.c
+++ b/gdb/nat/aarch64-linux-hw-point.c
@@ -409,12 +409,13 @@ aarch64_handle_unaligned_watchpoint (enum target_hw_bp_type type,
 						 aligned_len);
 
       if (show_debug_regs)
-	debug_printf (
-"handle_unaligned_watchpoint: is_insert: %d\n"
-"                             aligned_addr: %s, aligned_len: %d\n"
-"                                next_addr: %s,    next_len: %d\n",
-is_insert, core_addr_to_string_nz (aligned_addr), aligned_len,
-core_addr_to_string_nz (addr), len);
+	debug_printf ("handle_unaligned_watchpoint: is_insert: %d\n"
+		      "                             "
+		      "aligned_addr: %s, aligned_len: %d\n"
+		      "                                "
+		      "next_addr: %s,    next_len: %d\n",
+		      is_insert, core_addr_to_string_nz (aligned_addr),
+		      aligned_len, core_addr_to_string_nz (addr), len);
 
       if (ret != 0)
 	return ret;
diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h
index 44dc5cf5341..1d81a08bfba 100644
--- a/gdb/nat/aarch64-linux-hw-point.h
+++ b/gdb/nat/aarch64-linux-hw-point.h
@@ -102,7 +102,7 @@
    ptrace calls to the kernel, i.e. avoid asking the kernel to write
    to the debug registers with unchanged values.  */
 
-typedef unsigned long long dr_changed_t;
+typedef ULONGEST dr_changed_t;
 
 /* Set each of the lower M bits of X to 1; assert X is wide enough.  */