From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 115345 invoked by alias); 26 May 2016 18:14:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 115332 invoked by uid 89); 26 May 2016 18:14:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=srcdir, royalty, recv, stat X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 26 May 2016 18:14:46 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D36A91FAF0; Thu, 26 May 2016 18:14:44 +0000 (UTC) Received: from localhost (unused-10-15-17-51.yyz.redhat.com [10.15.17.51]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4QIEh7d007223 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 26 May 2016 14:14:44 -0400 From: Sergio Durigan Junior To: Gabriel Krisman Bertazi Cc: gdb-patches@sourceware.org, palves@redhat.com, dje@google.com Subject: Re: [RESEND PATCH v6 4/5] Include group information to xml syscall files. References: <87shxd1mx2.fsf@oberon.home> <1463713807-11250-1-git-send-email-gabriel@krisman.be> X-URL: http://blog.sergiodj.net Date: Thu, 26 May 2016 18:14:00 -0000 In-Reply-To: <1463713807-11250-1-git-send-email-gabriel@krisman.be> (Gabriel Krisman Bertazi's message of "Fri, 20 May 2016 00:10:07 -0300") Message-ID: <87r3co8z58.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2016-05/txt/msg00468.txt.bz2 On Thursday, May 19 2016, Gabriel Krisman Bertazi wrote: > Patch 4/5 bounced due to size. Resending with -M to detect renames... > > Sorry for duplicates.. > > -- >8 -- > > We maintain linux-defaults.xml.in, a template file to hold generic group > information. It is used by the XSL script that parses the architecture > specific files to generate the final xml files, which are actually > installed and loaded by GDB. The script is not run during the normal > build process, only when building in maintainer mode. Hey Gabriel, Thanks for the patch. I am pleased to see the nice work you did by creating the XSLT. FWIW, this patch looks good to me. > gdb/ > > * data-directory/Makefile.in: Generate syscall xml when building > in maintainer mode. > * configure.ac: Include dependency for xsltproc when building > in maintainer-mode. > * syscalls/apply-defaults.xsl: New file. > * syscalls/linux-defaults.xml.in: New file. > * syscalls/aarch64-linux.xml: Rename to aarch64-linux.xml.in. > * syscalls/amd64-linux.xml: Rename to amd64-linux.xml.in. > * syscalls/arm-linux.xml: Rename to arm-linux.xml.in. > * syscalls/bfin-linux.xml: Rename to bfin-linux.xml.in. > * syscalls/i386-linux.xml: Rename to i386-linux.xml.in. > * syscalls/mips-n32-linux.xml: Rename to mips-n32-linux.xml.in. > * syscalls/mips-n64-linux.xml: Rename to mips-n64-linux.xml.in. > * syscalls/mips-o32-linux.xml: Rename to mips-o32-linux.xml.in. > * syscalls/ppc-linux.xml: Rename to ppc-linux.xml.in. > * syscalls/ppc64-linux.xml: Rename to ppc64-linux.xml.in. > * syscalls/s390-linux.xml: Rename to s390-linux.xml.in. > * syscalls/s390x-linux.xml: Rename to s390x-linux.xml.in. > * syscalls/sparc-linux.xml: Rename to sparc-linux.xml.in. > * syscalls/sparc64-linux.xml: Rename to sparc64-linux.xml.in. > --- > gdb/configure.ac | 10 + > gdb/data-directory/Makefile.in | 4 + > .../{aarch64-linux.xml => aarch64-linux.xml.in} | 0 > .../{amd64-linux.xml => amd64-linux.xml.in} | 0 > gdb/syscalls/apply-defaults.xsl | 31 +++ > gdb/syscalls/{arm-linux.xml => arm-linux.xml.in} | 0 > gdb/syscalls/{bfin-linux.xml => bfin-linux.xml.in} | 0 > gdb/syscalls/{i386-linux.xml => i386-linux.xml.in} | 0 > gdb/syscalls/linux-defaults.xml.in | 243 +++++++++++++++++++++ > .../{mips-n32-linux.xml => mips-n32-linux.xml.in} | 0 > .../{mips-n64-linux.xml => mips-n64-linux.xml.in} | 0 > .../{mips-o32-linux.xml => mips-o32-linux.xml.in} | 0 > gdb/syscalls/{ppc-linux.xml => ppc-linux.xml.in} | 0 > .../{ppc64-linux.xml => ppc64-linux.xml.in} | 0 > gdb/syscalls/{s390-linux.xml => s390-linux.xml.in} | 0 > .../{s390x-linux.xml => s390x-linux.xml.in} | 0 > .../{sparc-linux.xml => sparc-linux.xml.in} | 0 > .../{sparc64-linux.xml => sparc64-linux.xml.in} | 0 > 18 files changed, 288 insertions(+) > rename gdb/syscalls/{aarch64-linux.xml => aarch64-linux.xml.in} (100%) > rename gdb/syscalls/{amd64-linux.xml => amd64-linux.xml.in} (100%) > create mode 100644 gdb/syscalls/apply-defaults.xsl > rename gdb/syscalls/{arm-linux.xml => arm-linux.xml.in} (100%) > rename gdb/syscalls/{bfin-linux.xml => bfin-linux.xml.in} (100%) > rename gdb/syscalls/{i386-linux.xml => i386-linux.xml.in} (100%) > create mode 100644 gdb/syscalls/linux-defaults.xml.in > rename gdb/syscalls/{mips-n32-linux.xml => mips-n32-linux.xml.in} (100%) > rename gdb/syscalls/{mips-n64-linux.xml => mips-n64-linux.xml.in} (100%) > rename gdb/syscalls/{mips-o32-linux.xml => mips-o32-linux.xml.in} (100%) > rename gdb/syscalls/{ppc-linux.xml => ppc-linux.xml.in} (100%) > rename gdb/syscalls/{ppc64-linux.xml => ppc64-linux.xml.in} (100%) > rename gdb/syscalls/{s390-linux.xml => s390-linux.xml.in} (100%) > rename gdb/syscalls/{s390x-linux.xml => s390x-linux.xml.in} (100%) > rename gdb/syscalls/{sparc-linux.xml => sparc-linux.xml.in} (100%) > rename gdb/syscalls/{sparc64-linux.xml => sparc64-linux.xml.in} (100%) > > diff --git a/gdb/configure.ac b/gdb/configure.ac > index 4364c02..4b57175 100644 > --- a/gdb/configure.ac > +++ b/gdb/configure.ac > @@ -2338,6 +2338,16 @@ if test "${nativefile}" != ""; then > fi > AC_SUBST(GDB_NM_FILE) > > +dnl Add dependency for xsltproc if building with maintainer-mode enabled. > +if test "x$USE_MAINTAINER_MODE" = xyes; then > + AC_PATH_PROGS(XSLTPROC, xsltproc, missing) > + if test "${XSLTPROC}" = missing; then > + AC_ERROR(unable to find xsltproc. maintainer-mode requires xsltproc.) > + fi > +fi > +AC_SUBST(XSLTPROC) > + > + > AC_LINK_FILES($files, $links) > > dnl Check for exe extension set on certain hosts (e.g. Win32) > diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in > index c05f379..9be925a 100644 > --- a/gdb/data-directory/Makefile.in > +++ b/gdb/data-directory/Makefile.in > @@ -22,6 +22,7 @@ PYTHON_SRCDIR = $(srcdir)/../python/lib > GUILE_SRCDIR = $(srcdir)/../guile/lib > SYSTEM_GDBINIT_SRCDIR = $(srcdir)/../system-gdbinit > VPATH = $(srcdir):$(SYSCALLS_SRCDIR):$(PYTHON_SRCDIR):$(GUILE_SRCDIR):$(SYSTEM_GDBINIT_SRCDIR) > +XSLTPROC = @XSLTPROC@ > > top_srcdir = @top_srcdir@ > top_builddir = @top_builddir@ > @@ -162,6 +163,9 @@ FLAGS_TO_PASS = \ > .PHONY: all > all: stamp-syscalls stamp-python stamp-guile stamp-system-gdbinit > > +@MAINTAINER_MODE_TRUE@%.xml: %.xml.in apply-defaults.xsl linux-defaults.xml.in > +@MAINTAINER_MODE_TRUE@ $(XSLTPROC) -o $(SYSCALLS_SRCDIR)/$@ $(SYSCALLS_SRCDIR)/apply-defaults.xsl $<;\ > + > # For portability's sake, we need to handle systems that don't have > # symbolic links. > stamp-syscalls: Makefile $(SYSCALLS_FILES) > diff --git a/gdb/syscalls/aarch64-linux.xml b/gdb/syscalls/aarch64-linux.xml.in > similarity index 100% > rename from gdb/syscalls/aarch64-linux.xml > rename to gdb/syscalls/aarch64-linux.xml.in > diff --git a/gdb/syscalls/amd64-linux.xml b/gdb/syscalls/amd64-linux.xml.in > similarity index 100% > rename from gdb/syscalls/amd64-linux.xml > rename to gdb/syscalls/amd64-linux.xml.in > diff --git a/gdb/syscalls/apply-defaults.xsl b/gdb/syscalls/apply-defaults.xsl > new file mode 100644 > index 0000000..fb9b8f1 > --- /dev/null > +++ b/gdb/syscalls/apply-defaults.xsl > @@ -0,0 +1,31 @@ > + > + > + + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + , > + > + > + > + > + > + > diff --git a/gdb/syscalls/arm-linux.xml b/gdb/syscalls/arm-linux.xml.in > similarity index 100% > rename from gdb/syscalls/arm-linux.xml > rename to gdb/syscalls/arm-linux.xml.in > diff --git a/gdb/syscalls/bfin-linux.xml b/gdb/syscalls/bfin-linux.xml.in > similarity index 100% > rename from gdb/syscalls/bfin-linux.xml > rename to gdb/syscalls/bfin-linux.xml.in > diff --git a/gdb/syscalls/i386-linux.xml b/gdb/syscalls/i386-linux.xml.in > similarity index 100% > rename from gdb/syscalls/i386-linux.xml > rename to gdb/syscalls/i386-linux.xml.in > diff --git a/gdb/syscalls/linux-defaults.xml.in b/gdb/syscalls/linux-defaults.xml.in > new file mode 100644 > index 0000000..1c4e187 > --- /dev/null > +++ b/gdb/syscalls/linux-defaults.xml.in > @@ -0,0 +1,243 @@ > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > diff --git a/gdb/syscalls/mips-n32-linux.xml b/gdb/syscalls/mips-n32-linux.xml.in > similarity index 100% > rename from gdb/syscalls/mips-n32-linux.xml > rename to gdb/syscalls/mips-n32-linux.xml.in > diff --git a/gdb/syscalls/mips-n64-linux.xml b/gdb/syscalls/mips-n64-linux.xml.in > similarity index 100% > rename from gdb/syscalls/mips-n64-linux.xml > rename to gdb/syscalls/mips-n64-linux.xml.in > diff --git a/gdb/syscalls/mips-o32-linux.xml b/gdb/syscalls/mips-o32-linux.xml.in > similarity index 100% > rename from gdb/syscalls/mips-o32-linux.xml > rename to gdb/syscalls/mips-o32-linux.xml.in > diff --git a/gdb/syscalls/ppc-linux.xml b/gdb/syscalls/ppc-linux.xml.in > similarity index 100% > rename from gdb/syscalls/ppc-linux.xml > rename to gdb/syscalls/ppc-linux.xml.in > diff --git a/gdb/syscalls/ppc64-linux.xml b/gdb/syscalls/ppc64-linux.xml.in > similarity index 100% > rename from gdb/syscalls/ppc64-linux.xml > rename to gdb/syscalls/ppc64-linux.xml.in > diff --git a/gdb/syscalls/s390-linux.xml b/gdb/syscalls/s390-linux.xml.in > similarity index 100% > rename from gdb/syscalls/s390-linux.xml > rename to gdb/syscalls/s390-linux.xml.in > diff --git a/gdb/syscalls/s390x-linux.xml b/gdb/syscalls/s390x-linux.xml.in > similarity index 100% > rename from gdb/syscalls/s390x-linux.xml > rename to gdb/syscalls/s390x-linux.xml.in > diff --git a/gdb/syscalls/sparc-linux.xml b/gdb/syscalls/sparc-linux.xml.in > similarity index 100% > rename from gdb/syscalls/sparc-linux.xml > rename to gdb/syscalls/sparc-linux.xml.in > diff --git a/gdb/syscalls/sparc64-linux.xml b/gdb/syscalls/sparc64-linux.xml.in > similarity index 100% > rename from gdb/syscalls/sparc64-linux.xml > rename to gdb/syscalls/sparc64-linux.xml.in > -- > 2.4.11 Thanks, -- Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible http://sergiodj.net/