From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25648 invoked by alias); 29 Feb 2004 17:25:47 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 25640 invoked from network); 29 Feb 2004 17:25:46 -0000 Received: from unknown (HELO nevyn.them.org) (66.93.172.17) by sources.redhat.com with SMTP; 29 Feb 2004 17:25:46 -0000 Received: from drow by nevyn.them.org with local (Exim 4.30 #1 (Debian)) id 1AxUhF-0004VK-Sn; Sun, 29 Feb 2004 12:25:45 -0500 Date: Sun, 29 Feb 2004 17:25:00 -0000 From: Daniel Jacobowitz To: Eli Zaretskii Cc: gdb-patches@sources.redhat.com Subject: Re: [cplus] Add an entry point for cp-names Message-ID: <20040229172545.GL15749@nevyn.them.org> Mail-Followup-To: Eli Zaretskii , gdb-patches@sources.redhat.com References: <20031224223616.GA11606@nevyn.them.org> <20040209203434.GA12280@nevyn.them.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.1i X-SW-Source: 2004-02/txt/msg00899.txt.bz2 On Tue, Feb 10, 2004 at 08:36:43AM +0200, Eli Zaretskii wrote: > > Date: Mon, 9 Feb 2004 15:34:34 -0500 > > From: Daniel Jacobowitz > > > > > Actually, there's more to this: cp-names_tab.c and cp-names-main_tab.c > > > map to the same 8+3 DOS name, so they will break the script in > > > gdb/config/djgpp/djconfig.sh which accounts for renaming of *.tab.c > > > files (see config.sed for the gory details). Thus, please consider > > > some other name for cp-names-main.tab.c, one that doesn't conflict > > > with cp-names.tab.c. > > > > I don't think any of that code is live in this case. It looks for > > [yp*].tab.c and cp-names.tab.c won't match that. > > That just means that the problem is slightly more complicated than I > remembered. > > > I really don't want to dig my hands into a 43-line sed script > > editing another sed expression when I can't test it, so I'm afraid I > > will have to leave this to someone with DJGPP installed. > > Oh, come on! Just changing [yp*] to [yps*] is all we need. That, and > renaming one of the two object files produced from cp-names.tab.c, to > avoid file-name clashes. My point was that I couldn't make heads or tails out of what the sed script was doing, but I'm willing to follow instructions :) I've checked in this to drow-cplus-branch. Do you think I need to tweak anything further? -- Daniel Jacobowitz MontaVista Software Debian GNU/Linux Developer 2004-02-29 Daniel Jacobowitz * Makefile.in (cp-names-main.tab.o): Rename to test-cp-names.tab.o. * config/djgpp/config.sed: Handle new *cp-names.tab.* references. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.268.2.13 diff -u -p -r1.268.2.13 Makefile.in --- Makefile.in 9 Feb 2004 19:43:29 -0000 1.268.2.13 +++ Makefile.in 29 Feb 2004 17:22:39 -0000 @@ -1462,11 +1462,11 @@ c-exp.tab.c: c-exp.y cp-names.tab.o: cp-names.tab.c $(safe_ctype_h) $(libiberty_h) $(demangle_h) -cp-names-main.tab.o: cp-names.tab.c $(safe_ctype_h) $(libiberty_h) $(demangle_h) +test-cp-names.tab.o: cp-names.tab.c $(safe_ctype_h) $(libiberty_h) $(demangle_h) $(CC) -c $(INTERNAL_CFLAGS) -DTEST_CPNAMES \ - -o cp-names-main.tab.o cp-names.tab.c -test-cpnames: cp-names-main.tab.o $(LIBIBERTY) - $(CC) -o test-cpnames cp-names-main.tab.o $(LIBIBERTY) + -o test-cp-names.tab.o cp-names.tab.c +test-cpnames: test-cp-names.tab.o $(LIBIBERTY) + $(CC) -o test-cpnames test-cp-names.tab.o $(LIBIBERTY) .PRECIOUS: cp-names.tab.c cp-names.tab.c: cp-names.y Index: config/djgpp/config.sed =================================================================== RCS file: /cvs/src/src/gdb/config/djgpp/config.sed,v retrieving revision 1.4.18.1 diff -u -p -r1.4.18.1 config.sed --- config/djgpp/config.sed 13 Jan 2004 16:12:04 -0000 1.4.18.1 +++ config/djgpp/config.sed 29 Feb 2004 17:22:39 -0000 @@ -5,7 +5,7 @@ s|\.gdbinit|gdb.ini|g /^ac_given_INSTALL=/,/^CEOF/ { /^s%@prefix@%/a\ - s,\\([yp*]\\)\\.tab,\\1_tab,g\ + s,\\([yps*]\\)\\.tab,\\1_tab,g\ /^ @rm -f/s,\\$@-\\[0-9\\]\\[0-9\\],& *.i[1-9] *.i[1-9][0-9],\ s,standards\\.info\\*,standard*.inf*,\ s,configure\\.info\\*,configur*.inf*,\