* top/maint.mk: Adjust to new noreturn support.

(gl_extract_significant_defines_): Omit pattern ATTRIBUTE_NORETURN.
(def_sym_regex): Do not remove ATTRIBUTE_NORETURN.

diff --git a/ChangeLog b/ChangeLog
index e555f5a9fa0175a2251108621bc45a20b2e240ba..373c721e1a02e09636a508ba0b46e91c4eba60fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * top/maint.mk: Adjust to new noreturn support.
+       (gl_extract_significant_defines_): Omit pattern ATTRIBUTE_NORETURN.
+       (def_sym_regex): Do not remove ATTRIBUTE_NORETURN.
+
        xalloc: use stdnoreturn.h
        * lib/xalloc.h: Include <stdnoreturn.h>.
        (_GL_ATTRIBUTE_NORETURN): Remove; all uses replaced with noreturn.

diff --git a/top/maint.mk b/top/maint.mk
index 725e52de097d5f07bedcf0e446947b20ea796462..2da93bf9fee93532b4cd71cdc0cfe740f8bd90a3 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -746,7 +746,7 @@ gl_other_headers_ ?= \
 gl_extract_significant_defines_ = \
   /^\# *define ([^_ (][^ (]*)(\s*\(|\s+\w+)/\
     && $$2 !~ /(?:rpl_|_used_without_)/\
-    && $$1 !~ /^(?:NSIG|ATTRIBUTE_NORETURN)$$/\
+    && $$1 !~ /^(?:NSIG)$$/\
     and print $$1
 
 # Create a list of regular expressions matching the names
@@ -758,7 +758,6 @@ define def_sym_regex
            perl -lne '$(gl_extract_significant_defines_)' $$f;         \
          done;                                                         \
        ) | sort -u                                                     \
-         | grep -Ev '^ATTRIBUTE_NORETURN'                              \
          | sed 's/^/^ *# *(define|undef)  */;s/$$/\\>/'
 endef