Remove global variable arm_hwcap

After previous patch, we don't need global variable arm_hwcap.  This
patch is to remove it.

gdb/gdbserver:

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

	* linux-arm-low.c (arm_hwcap): Remove it.
	(arm_read_description): New local variable arm_hwcap.  Don't
	set arm_hwcap to zero.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 630335c5fa4ddbe401d7c8f6e74873f028a4a294..e01fa46b2010e0f7d69afc6a03a4eb4eb77a4d62 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-30  Yao Qi  <yao.qi@linaro.org>
+
+       * linux-arm-low.c (arm_hwcap): Remove it.
+       (arm_read_description): New local variable arm_hwcap.  Don't
+       set arm_hwcap to zero.
+
 2015-07-30  Yao Qi  <yao.qi@linaro.org>
 
        * linux-arm-low.c (arm_fill_wmmxregset): Don't use arm_hwcap.

diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
index 02a1c08b6542c8d9aaea6be98b47e14c666b34fd..3c5956b797c13fb00bb3c1a117ec9bcaa44d06f2 100644 (file)
--- a/gdb/gdbserver/linux-arm-low.c
+++ b/gdb/gdbserver/linux-arm-low.c
@@ -117,8 +117,6 @@ struct arch_lwp_info
   CORE_ADDR stopped_data_address;
 };
 
-static unsigned long arm_hwcap;
-
 /* These are in <asm/elf.h> in current kernels.  */
 #define HWCAP_VFP       64
 #define HWCAP_IWMMXT    512
@@ -844,11 +842,11 @@ static const struct target_desc *
 arm_read_description (void)
 {
   int pid = lwpid_of (current_thread);
+  unsigned long arm_hwcap = 0;
 
   /* Query hardware watchpoint/breakpoint capabilities.  */
   arm_linux_init_hwbp_cap (pid);
 
-  arm_hwcap = 0;
   if (arm_get_hwcap (&arm_hwcap) == 0)
     return tdesc_arm;
 
@@ -875,10 +873,8 @@ arm_read_description (void)
       buf = xmalloc (32 * 8 + 4);
       if (ptrace (PTRACE_GETVFPREGS, pid, 0, buf) < 0
          && errno == EIO)
-       {
-         arm_hwcap = 0;
-         result = tdesc_arm;
-       }
+       result = tdesc_arm;
+
       free (buf);
 
       return result;