X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=libiberty%2Fgather-docs;h=01f1e0bf325871409db9fe7e7ce5272a54d499e5;hb=708a2ffff5cc2d280968a6b28268d8276d391bb4;hp=b272c02ef2a9f2fd51cd3d13ec7e77201aad47e2;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git

diff --git a/libiberty/gather-docs b/libiberty/gather-docs
index b272c02ef2..01f1e0bf32 100644
--- a/libiberty/gather-docs
+++ b/libiberty/gather-docs
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 # -*- perl -*-
 
-#   Copyright (C) 2001
-#   Free Software Foundation
+#   Copyright (C) 2001-2020 Free Software Foundation, Inc.
 #
 # This file is part of the libiberty library.
 # Libiberty is free software; you can redistribute it and/or
@@ -17,8 +16,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with libiberty; see the file COPYING.LIB.  If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
 # Originally written by DJ Delorie <dj@redhat.com>
 
@@ -73,8 +72,8 @@ for $in (@ARGV) {
 
 	    if (/^\@def[a-z]*[a-wyz] /) {
 		
-		($name) = m/[^\(]* ([^\( \t\r\n]+) *\(/;
-		$name =~ s/[ 	]*$//;
+		($name) = m/[^\(]* ([^\( \t\r\n\@]+) *(\(|\@?$)/;
+		$name =~ s/[	 ]*\@?$//;
 		$key = $name;
 		$key =~ tr/A-Z/a-z/;
 		$key =~ s/[^a-z0-9]+/ /g;
@@ -110,7 +109,7 @@ print "Writing $outfile\n" if $verbose;
 print OUT "\@c Automatically generated from *.c and others (the comments before\n";
 print OUT "\@c each entry tell you which file and where in that file).  DO NOT EDIT!\n";
 print OUT "\@c Edit the *.c files, configure with --enable-maintainer-mode,\n";
-print OUT "\@c and let gather-docs build you a new copy.\n\n";
+print OUT "\@c run 'make stamp-functions' and gather-docs will build a new copy.\n\n";
 
 for $key (sort keys %name) {
     print OUT "\@c $src_file{$key}:$src_line{$key}\n";