* linux-ppc-low.c (ppc_arch_setup): Reset ppc_hwcap after the

	initial call to init_register_ppc64.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 0fde4b9d5f46c2a5dbf0d71d571acb5fae2655e5..7b97dfc9d60025cfc1c019aa716f26213846ffe8 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-21  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * linux-ppc-low.c (ppc_arch_setup): Reset ppc_hwcap after the
+       initial call to init_register_ppc64.
+
 2008-04-21  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * configure.srv (powerpc64-*-linux*, powerpc-*-linux*): Merge into single

diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
index 70f255810166ed3dc23c0960e5c9658cfafda3b8..4c3e4efc4bf4cc868da4e2bf073a1c36f2755feb 100644 (file)
--- a/gdb/gdbserver/linux-ppc-low.c
+++ b/gdb/gdbserver/linux-ppc-low.c
@@ -223,8 +223,11 @@ ppc_arch_setup (void)
 #ifdef __powerpc64__
   long msr;
 
-  /* On a 64-bit host, assume 64-bit inferior process.  */
+  /* On a 64-bit host, assume 64-bit inferior process with no
+     AltiVec registers.  Reset ppc_hwcap to ensure that the
+     collect_register call below does not fail.  */
   init_registers_ppc64 ();
+  ppc_hwcap = 0;
 
   /* Only if the high bit of the MSR is set, we actually have
      a 64-bit inferior.  */