RFA (Makefiles): PATCH to include libcpp and libiberty in GCC etags

RFA (Makefiles): PATCH to include libcpp and libiberty in GCC etags

[Jason Merrill]

[-- Attachment #1: Type: text/plain, Size: 395 bytes --]

Periodically I try to use M-. to pull up a function from libcpp and am 
frustrated that it doesn't work.  This patch fixes that, and throws in 
libiberty for good measure.

I also considered using --include for the TAGS files in those 
directories, but that would require people to 'make TAGS' separately in 
those directories for it to work, so I decided to go this way instead.

OK for trunk?

[-- Attachment #2: tags.patch --]
[-- Type: text/x-patch, Size: 538 bytes --]

commit 9f68b2e2d4ccd5f9522ac33e42882fa2e60332a3
Author: Jason Merrill <jason@redhat.com>
Date:   Wed Oct 28 13:29:32 2015 -0400

    comment

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 2745b40..a37e516 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -23476,6 +23476,7 @@ do_auto_deduction (tree type, tree init, tree auto_node,
     }
   else
     {
+      // multiple autos: walk all autos and replace/collect them into parms
       tree parms = build_tree_list (NULL_TREE, type);
       tree tparms = make_tree_vec (1);
       int val;

Re: RFA (Makefiles): PATCH to include libcpp and libiberty in GCC etags

[Jeff Law]

On 10/28/2015 12:49 PM, Jason Merrill wrote:
> Periodically I try to use M-. to pull up a function from libcpp and am
> frustrated that it doesn't work.  This patch fixes that, and throws in
> libiberty for good measure.
>
> I also considered using --include for the TAGS files in those
> directories, but that would require people to 'make TAGS' separately in
> those directories for it to work, so I decided to go this way instead.
>
> OK for trunk?
Looks like you attached the wrong patch :-)

Jeff

Re: RFA (Makefiles): PATCH to include libcpp and libiberty in GCC etags

[Jason Merrill]

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

On 10/28/2015 03:27 PM, Jeff Law wrote:
> On 10/28/2015 12:49 PM, Jason Merrill wrote:
>> Periodically I try to use M-. to pull up a function from libcpp and am
>> frustrated that it doesn't work.  This patch fixes that, and throws in
>> libiberty for good measure.
>>
>> I also considered using --include for the TAGS files in those
>> directories, but that would require people to 'make TAGS' separately in
>> those directories for it to work, so I decided to go this way instead.
>>
>> OK for trunk?
> Looks like you attached the wrong patch :-)

Oops.




[-- Attachment #2: tags.patch --]
[-- Type: text/x-patch, Size: 1618 bytes --]

commit 90c51a6e2c114051009da9894db4446265b50295
Author: Jason Merrill <jason@redhat.com>
Date:   Sun Oct 25 04:54:54 2015 -1000

    gcc/c/
    	* Make-lang.in (c.tags): Also include libcpp TAGS.
    gcc/cp/
    	* Make-lang.in (c++.tags): Also include libcpp TAGS.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 2685b38..6778f7d 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3907,7 +3907,8 @@ TAGS: lang.tags
 	  fi;						\
 	done;						\
 	etags -o TAGS.sub c-family/*.h c-family/*.c *.h *.c *.cc \
-	      ../include/*.h \
+	      ../include/*.h ../libiberty/*.c \
+	      ../libcpp/*.c ../libcpp/include/*.h \
 	      --language=none --regex="/\(char\|unsigned int\|int\|bool\|void\|HOST_WIDE_INT\|enum [A-Za-z_0-9]+\) [*]?\([A-Za-z_0-9]+\)/\2/" common.opt	\
 	      --language=none --regex="/\(DEF_RTL_EXPR\|DEFTREECODE\|DEFGSCODE\).*(\([A-Za-z_0-9]+\)/\2/" rtl.def tree.def gimple.def \
 	      --language=none --regex="/DEFTIMEVAR (\([A-Za-z_0-9]+\)/\1/" timevar.def \
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 7d7e2f4..9f7f70d 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -406,12 +406,10 @@ stamp-noasandir:
 	else true; fi
 	touch stamp-noasandir
 
-.PHONY: all etags tags ls clean stage1 stage2
+.PHONY: all etags tags TAGS ls clean stage1 stage2
 
-etags tags: TAGS etags-subdir
-
-TAGS: $(CFILES)
-	etags `for i in $(CFILES); do echo $(srcdir)/$$i ; done`
+etags tags TAGS: etags-subdir
+	cd $(srcdir); etags $(CFILES)
 
 # The standalone demangler (c++filt) has been moved to binutils.
 # But make this target work anyway for demangler hacking.

Re: RFA (Makefiles): PATCH to include libcpp and libiberty in GCC etags

[Jeff Law]

On 10/28/2015 01:43 PM, Jason Merrill wrote:
> On 10/28/2015 03:27 PM, Jeff Law wrote:
>> On 10/28/2015 12:49 PM, Jason Merrill wrote:
>>> Periodically I try to use M-. to pull up a function from libcpp and am
>>> frustrated that it doesn't work.  This patch fixes that, and throws in
>>> libiberty for good measure.
>>>
>>> I also considered using --include for the TAGS files in those
>>> directories, but that would require people to 'make TAGS' separately in
>>> those directories for it to work, so I decided to go this way instead.
>>>
>>> OK for trunk?
>> Looks like you attached the wrong patch :-)
>
> Oops.
>
>
>
>
> tags.patch
>
>
> commit 90c51a6e2c114051009da9894db4446265b50295
> Author: Jason Merrill<jason@redhat.com>
> Date:   Sun Oct 25 04:54:54 2015 -1000
>
>      gcc/c/
>      	* Make-lang.in (c.tags): Also include libcpp TAGS.
>      gcc/cp/
>      	* Make-lang.in (c++.tags): Also include libcpp TAGS.
Looks good to me.

jeff