From f45ef568938ceca244067ce0deaced2a1d05a484 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Mon, 21 Apr 2008 20:31:22 +0000 Subject: [PATCH] * linux-ppc-low.c (ppc_arch_setup): Reset ppc_hwcap after the initial call to init_register_ppc64. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-ppc-low.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 0fde4b9d5f..7b97dfc9d6 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2008-04-21 Ulrich Weigand + * linux-ppc-low.c (ppc_arch_setup): Reset ppc_hwcap after the + initial call to init_register_ppc64. + +2008-04-21 Ulrich Weigand + * configure.srv (powerpc64-*-linux*, powerpc-*-linux*): Merge into single powerpc*-*-linux* case. (s390-*-linux*, s390x-*-linux*): Merge into single s390*-*-linux* case. diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c index 70f2558101..4c3e4efc4b 100644 --- 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. */ -- 2.11.0