svn commit: r357043 - head/sys/conf

[Takahashi Yoshihiro]

Author: nyan
Date: Thu Jan 23 13:56:12 2020
New Revision: 357043
URL: https://svnweb.freebsd.org/changeset/base/357043

Log:
  Fix kernel-tags target.
    - A depend-file is broken up into .depend.*.o files. [1]
    - Fix an assembly file support.
  
  PR:		241746
  Submitted by:	leres [1]
  MFC after:	1 week

Modified:
  head/sys/conf/kern.post.mk
  head/sys/conf/systags.sh

Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk	Thu Jan 23 11:05:03 2020	(r357042)
+++ head/sys/conf/kern.post.mk	Thu Jan 23 13:56:12 2020	(r357043)
@@ -389,7 +389,8 @@ kernel-cleandepend: .PHONY
 	rm -f .depend .depend.* ${_ILINKS}
 
 kernel-tags:
-	@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
+	@ls .depend.* > /dev/null 2>&1 || \
+	    { echo "you must make depend first"; exit 1; }
 	sh $S/conf/systags.sh
 
 kernel-install: .PHONY

Modified: head/sys/conf/systags.sh
==============================================================================
--- head/sys/conf/systags.sh	Thu Jan 23 11:05:03 2020	(r357042)
+++ head/sys/conf/systags.sh	Thu Jan 23 13:56:12 2020	(r357043)
@@ -39,14 +39,14 @@
 
 rm -f tags tags.tmp tags.cfiles tags.sfiles tags.hfiles
 sed -e "s, machine/, ../../include/,g" \
-	-e 's,[a-z][^/    ]*/\.\./,,g' .depend | awk '{
+	-e 's,[a-z][^/    ]*/\.\./,,g' .depend.* | awk '{
 		for (i = 1; i <= NF; ++i) {
 			t = substr($i, length($i) - 1)
 			if (t == ".c")
 				cfiles[$i] = 1;
 			else if (t == ".h")
 				hfiles[$i] = 1;
-			else if (t == ".s")
+			else if (t == ".s" || t == ".S")
 				sfiles[$i] = 1;
 		}
 	};