Re: [cplus] Add an entry point for cp-names

[Daniel Jacobowitz <drow@mvista.com>]

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 <drow@mvista.com>
> > 
> > > 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  <drow@mvista.com>

	* 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*,\