From: Jason Merrill <jason@redhat.com>
Date: Wed, 28 Oct 2015 19:45:33 +0000 (-0400)
Subject: Make-lang.in (c.tags): Also include libcpp TAGS.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=08585fba891c73790a3a4354bc26f0fe02be4d9c;p=gcc.git

Make-lang.in (c.tags): Also include libcpp TAGS.

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

From-SVN: r229504
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc863ce1025..c2d465a61e3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-28  Jason Merrill  <jason@redhat.com>
+
+	* Makefile.in (TAGS): Include libcpp and libiberty.
+
 2015-10-28  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* omp-low.c (MASK_GANG, MASK_WORKER, MASK_VECTOR): Delete.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 2685b3855c5..6778f7d7a9b 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/ChangeLog b/libiberty/ChangeLog
index 3fe0f69fac5..b5ac8363c36 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-28  Jason Merrill  <jason@redhat.com>
+
+	* Makefile.in (TAGS): Fix for separate build directory.
+
 2015-10-18  Roland McGrath  <roland@gnu.org>
 	    Iain Sandoe  <iain@codesourcery.com>
 
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 7d7e2f41efa..9f7f70dae21 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.