From 1056aa39196e0af454e6cdff193d7fd4bc638b9c Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Wed, 14 Jul 2021 01:30:46 -0400
Subject: [PATCH] gdb: clean up some things in features/Makefile

Clean up some things I noticed:

 - we generate a regformats/microblaze-with-stack-protect.dat file.  I
   don't think this is used.  It could be used by a GDBserver built for
   Microblaze, but GDBserver isn't ported to Microblaze.  So I don't
   think that's used at all.  Remove the entry in features/Makefile and
   the file itself.

 - There are a bunch of *-expedite values in features/Makefile for
   architectures for which we don't generate dat files.  AFAIK, these
   *-expedite values are only used when generating dat files.  Remove
   those that are not necessary.

 - 32bit-segments.xml is not listed in the Makfile, but it's used.  This
   means that it wouldn't get re-generated if we were to change how C
   files are generated from the XML.  It looks like it was simply
   forgotten, add it.

Change-Id: I112d00db317102270e1df924473c37122ccb6c3a
---
 gdb/features/Makefile                         |  9 +--
 .../microblaze-with-stack-protect.dat         | 64 -------------------
 2 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 gdb/regformats/microblaze-with-stack-protect.dat

diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index ded8c3bb9da..aa38d176539 100644
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -45,7 +45,6 @@
 
 # List of .dat files to create in ../regformats/
 WHICH = mips-linux mips-dsp-linux \
-	microblaze-with-stack-protect \
 	mips64-linux mips64-dsp-linux \
 	nios2-linux \
 	rs6000/powerpc-32 \
@@ -69,18 +68,11 @@ WHICH = mips-linux mips-dsp-linux \
 	tic6x-c64xp-linux tic6x-c64x-linux tic6x-c62x-linux
 
 # Record which registers should be sent to GDB by default after stop.
-aarch64-expedite = x29,sp,pc
-arm-expedite = r11,sp,pc
-i386-expedite = ebp,esp,eip
-amd64-expedite = rbp,rsp,rip
-x32-expedite = rbp,rsp,rip
 mips-expedite = r29,pc
 mips-dsp-expedite = r29,pc
 mips64-expedite = r29,pc
 mips64-dsp-expedite = r29,pc
-microblaze-expedite = r1,rpc
 nios2-linux-expedite = sp,pc
-or1k-expedite = r1,npc
 powerpc-expedite = r1,pc
 s390-linux32-expedite = r14,r15,pswa
 s390-linux32v1-expedite = r14,r15,pswa
@@ -222,6 +214,7 @@ FEATURE_XMLFILES = aarch64-core.xml \
 	i386/32bit-mpx.xml \
 	i386/32bit-avx512.xml \
 	i386/32bit-pkeys.xml \
+	i386/32bit-segments.xml \
 	i386/64bit-avx512.xml \
 	i386/64bit-core.xml \
 	i386/64bit-mpx.xml \
diff --git a/gdb/regformats/microblaze-with-stack-protect.dat b/gdb/regformats/microblaze-with-stack-protect.dat
deleted file mode 100644
index 8040a7b3fd0..00000000000
--- a/gdb/regformats/microblaze-with-stack-protect.dat
+++ /dev/null
@@ -1,64 +0,0 @@
-# THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi :set ro:
-# Generated from: microblaze-with-stack-protect.xml
-name:microblaze_with_stack_protect
-xmltarget:microblaze-with-stack-protect.xml
-expedite:r1,rpc
-32:r0
-32:r1
-32:r2
-32:r3
-32:r4
-32:r5
-32:r6
-32:r7
-32:r8
-32:r9
-32:r10
-32:r11
-32:r12
-32:r13
-32:r14
-32:r15
-32:r16
-32:r17
-32:r18
-32:r19
-32:r20
-32:r21
-32:r22
-32:r23
-32:r24
-32:r25
-32:r26
-32:r27
-32:r28
-32:r29
-32:r30
-32:r31
-32:rpc
-32:rmsr
-32:rear
-32:resr
-32:rfsr
-32:rbtr
-32:rpvr0
-32:rpvr1
-32:rpvr2
-32:rpvr3
-32:rpvr4
-32:rpvr5
-32:rpvr6
-32:rpvr7
-32:rpvr8
-32:rpvr9
-32:rpvr10
-32:rpvr11
-32:redr
-32:rpid
-32:rzpr
-32:rtlbx
-32:rtlbsx
-32:rtlblo
-32:rtlbhi
-32:rslr
-32:rshr
-- 
2.30.2