Don't write to inferior_ptid in go32-nat.c

[deliverable/binutils-gdb.git] / gdb / arch / ppc-linux-common.c

diff --git a/gdb/arch/ppc-linux-common.c b/gdb/arch/ppc-linux-common.c
index b8a7cdb2ad3ba5a05bf8f07aaa1e5a484bb5b01f..183fc03395b693127d65a825de4c52e504be33a4 100644 (file)
--- a/gdb/arch/ppc-linux-common.c
+++ b/gdb/arch/ppc-linux-common.c
@@ -1,6 +1,6 @@
 /* Common target dependent code for GNU/Linux on PPC systems.
 
-   Copyright (C) 2018 Free Software Foundation, Inc.
+   Copyright (C) 2018-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "arch/ppc-linux-common.h"
 #include "arch/ppc-linux-tdesc.h"
 
@@ -50,10 +50,9 @@ ppc_linux_match_description (struct ppc_linux_features features)
 
   if (features.wordsize == 8)
     {
-      if (features.cell)
-       tdesc = tdesc_powerpc_cell64l;
-      else if (features.vsx)
-       tdesc = (features.isa207? tdesc_powerpc_isa207_vsx64l
+      if (features.vsx)
+       tdesc = (features.htm? tdesc_powerpc_isa207_htm_vsx64l
+                : features.isa207? tdesc_powerpc_isa207_vsx64l
                 : features.ppr_dscr? tdesc_powerpc_isa205_ppr_dscr_vsx64l
                 : features.isa205? tdesc_powerpc_isa205_vsx64l
                 : tdesc_powerpc_vsx64l);
@@ -68,10 +67,9 @@ ppc_linux_match_description (struct ppc_linux_features features)
     {
       gdb_assert (features.wordsize == 4);
 
-      if (features.cell)
-       tdesc = tdesc_powerpc_cell32l;
-      else if (features.vsx)
-       tdesc = (features.isa207? tdesc_powerpc_isa207_vsx32l
+      if (features.vsx)
+       tdesc = (features.htm? tdesc_powerpc_isa207_htm_vsx32l
+                : features.isa207? tdesc_powerpc_isa207_vsx32l
                 : features.ppr_dscr? tdesc_powerpc_isa205_ppr_dscr_vsx32l
                 : features.isa205? tdesc_powerpc_isa205_vsx32l
                 : tdesc_powerpc_vsx32l);