From 2399fe6ab0b6ee64c569992e4bc3bbae3b5b2193 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 13 Oct 2017 15:36:49 +0100 Subject: [PATCH] Simplify tic6x and s390x expedite registers Nowadays, we have six tic6x expedite registers, which are duplicated. tic6x-c64xp-expedite = A15,PC tic6x-c64x-expedite = A15,PC tic6x-c62x-expedite = A15,PC tic6x-c64xp-linux-expedite = A15,PC tic6x-c64x-linux-expedite = A15,PC tic6x-c62x-linux-expedite = A15,PC in features/Makefile, we have echo "expedite:$(if $($*-expedite),$($*-expedite),$($(firstword $(subst -, ,$(notdir $*)))-expedite))" \ >> $(outdir)/$*.tmp which means for a given bar/foo-baz.xml, we'll look for either bar/foo-baz-expedite or foo-expedite. We can define only one generic expedite register for all different ti6cx and s390x target descriptions. Actually, we've done that for x86 target descriptions. Re-run 'make GDB=/path/build/gdb all' to regenerate regformats/*.dat files, and they are not changed. gdb: 2017-10-13 Yao Qi * features/Makefile: Remove tic6x-*-expedite, add tic6x-expedite. Remove s390x-*-expedite, add s390x-expedite. --- gdb/ChangeLog | 5 +++++ gdb/features/Makefile | 15 ++------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e341e34d8d7..56f253e84b6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-10-13 Yao Qi + + * features/Makefile: Remove tic6x-*-expedite, add tic6x-expedite. + Remove s390x-*-expedite, add s390x-expedite. + 2017-10-13 Yao Qi * features/s390-gs-linux64.c: Regenerated. diff --git a/gdb/features/Makefile b/gdb/features/Makefile index 8a7f3777cdf..fb9e8dde2e2 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -107,19 +107,8 @@ s390-te-linux64-expedite = r14l,r15l,pswa s390-vx-linux64-expedite = r14l,r15l,pswa s390-tevx-linux64-expedite = r14l,r15l,pswa s390-gs-linux64-expedite = r14,r15,pswa -s390x-linux64-expedite = r14,r15,pswa -s390x-linux64v1-expedite = r14,r15,pswa -s390x-linux64v2-expedite = r14,r15,pswa -s390x-te-linux64-expedite = r14,r15,pswa -s390x-vx-linux64-expedite = r14,r15,pswa -s390x-tevx-linux64-expedite = r14,r15,pswa -s390x-gs-linux64-expedite = r14,r15,pswa -tic6x-c64xp-expedite = A15,PC -tic6x-c64x-expedite = A15,PC -tic6x-c62x-expedite = A15,PC -tic6x-c64xp-linux-expedite = A15,PC -tic6x-c64x-linux-expedite = A15,PC -tic6x-c62x-linux-expedite = A15,PC +s390x-expedite = r14,r15,pswa +tic6x-expedite = A15,PC XSLTPROC = xsltproc -- 2.30.2