From patchwork Fri Oct 28 14:52:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 16914 Received: (qmail 52087 invoked by alias); 28 Oct 2016 14:53:07 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 52053 invoked by uid 89); 28 Oct 2016 14:53:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=reduces, dat, expedite, WHICH X-HELO: mailapp01.imgtec.com Received: from mailapp01.imgtec.com (HELO mailapp01.imgtec.com) (195.59.15.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Oct 2016 14:53:03 +0000 Received: from HHMAIL01.hh.imgtec.org (unknown [10.100.10.19]) by Forcepoint Email with ESMTPS id 08737AC4C7FE0 for ; Fri, 28 Oct 2016 15:52:57 +0100 (IST) Received: from [10.20.78.229] (10.20.78.229) by HHMAIL01.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server id 14.3.294.0; Fri, 28 Oct 2016 15:52:58 +0100 Date: Fri, 28 Oct 2016 15:52:52 +0100 From: "Maciej W. Rozycki" To: Subject: [PATCH] Restore the order of file lists in features/Makefile Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Expedite register and XML file lists used to be sorted alphabetically, but they have recently kept diverging more and more from that order. Using the alphabetic order improves legibility and reduces the risk of merge conflicts, which is very high if new entries are added at the end instead. gdb/ * features/Makefile: Restore the alphabetic order of expedite register and XML file lists. --- Hi, I think the goal list in WHICH was supposed to be alphabetic as well and has also diverged, but unlike these it has multiple entries per line and the change required will be somewhat more complex than mere line shuffling this patch consists of. So I'll defer it to a separate patch which I'll send if we agree we want to restore and then keep the order. OK to apply? Maciej gdb-features-order.diff Index: binutils/gdb/features/Makefile =================================================================== --- binutils.orig/gdb/features/Makefile 2016-10-21 04:08:19.669732345 +0100 +++ binutils/gdb/features/Makefile 2016-10-21 04:09:45.471189710 +0100 @@ -81,15 +81,14 @@ WHICH = aarch64 \ # Record which registers should be sent to GDB by default after stop. aarch64-expedite = x29,sp,pc +amd64-expedite = rbp,rsp,rip arm-expedite = r11,sp,pc i386-expedite = ebp,esp,eip -amd64-expedite = rbp,rsp,rip -x32-expedite = rbp,rsp,rip -mips-expedite = r29,pc +microblaze-expedite = r1,rpc mips-dsp-expedite = r29,pc -mips64-expedite = r29,pc +mips-expedite = r29,pc mips64-dsp-expedite = r29,pc -microblaze-expedite = r1,rpc +mips64-expedite = r29,pc nios2-linux-expedite = sp,pc powerpc-expedite = r1,pc rs6000/powerpc-cell32l-expedite = r1,pc,r0,orig_r3,r4 @@ -101,20 +100,21 @@ s390-linux64-expedite = r14l,r15l,pswa s390-linux64v1-expedite = r14l,r15l,pswa s390-linux64v2-expedite = r14l,r15l,pswa s390-te-linux64-expedite = r14l,r15l,pswa -s390-vx-linux64-expedite = r14l,r15l,pswa s390-tevx-linux64-expedite = r14l,r15l,pswa +s390-vx-linux64-expedite = r14l,r15l,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 -tic6x-c64xp-expedite = A15,PC -tic6x-c64x-expedite = A15,PC +s390x-vx-linux64-expedite = r14,r15,pswa tic6x-c62x-expedite = A15,PC -tic6x-c64xp-linux-expedite = A15,PC -tic6x-c64x-linux-expedite = A15,PC tic6x-c62x-linux-expedite = A15,PC +tic6x-c64x-expedite = A15,PC +tic6x-c64x-linux-expedite = A15,PC +tic6x-c64xp-expedite = A15,PC +tic6x-c64xp-linux-expedite = A15,PC +x32-expedite = rbp,rsp,rip XSLTPROC = xsltproc @@ -127,8 +127,8 @@ OUTPUTS = $(patsubst %,$(outdir)/%.dat,$ # to make on the command line. XMLTOC = \ aarch64.xml \ - arc-v2.xml \ arc-arcompact.xml \ + arc-v2.xml \ arm/arm-with-iwmmxt.xml \ arm/arm-with-m-fpa-layout.xml \ arm/arm-with-m-vfp-d16.xml \ @@ -137,16 +137,18 @@ XMLTOC = \ arm/arm-with-vfpv2.xml \ arm/arm-with-vfpv3.xml \ i386/amd64-avx-linux.xml \ + i386/amd64-avx-mpx-linux.xml \ + i386/amd64-avx-mpx.xml \ i386/amd64-avx.xml \ i386/amd64-avx512-linux.xml \ i386/amd64-avx512.xml \ i386/amd64-linux.xml \ i386/amd64-mpx-linux.xml \ i386/amd64-mpx.xml \ - i386/amd64-avx-mpx-linux.xml \ - i386/amd64-avx-mpx.xml \ i386/amd64.xml \ i386/i386-avx-linux.xml \ + i386/i386-avx-mpx-linux.xml \ + i386/i386-avx-mpx.xml \ i386/i386-avx.xml \ i386/i386-avx512-linux.xml \ i386/i386-avx512.xml \ @@ -155,8 +157,6 @@ XMLTOC = \ i386/i386-mmx.xml \ i386/i386-mpx-linux.xml \ i386/i386-mpx.xml \ - i386/i386-avx-mpx-linux.xml \ - i386/i386-avx-mpx.xml \ i386/i386.xml \ i386/x32-avx-linux.xml \ i386/x32-avx.xml \ @@ -214,12 +214,12 @@ XMLTOC = \ s390-linux64v1.xml \ s390-linux64v2.xml \ s390-te-linux64.xml \ + s390-tevx-linux64.xml \ + s390-vx-linux64.xml \ s390x-linux64.xml \ s390x-linux64v1.xml \ s390x-linux64v2.xml \ s390x-te-linux64.xml \ - s390-tevx-linux64.xml \ - s390-vx-linux64.xml \ s390x-tevx-linux64.xml \ s390x-vx-linux64.xml \ tic6x-c62x-linux.xml \