From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 12 Jul 2011 08:12:10 +0000 (-0700)
Subject: * top/maint.mk: Adjust to new noreturn support.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3264f061d45e6bbde76b9055514613d72c5c016;p=pspp

* 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 e555f5a9fa..373c721e1a 100644
--- 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 725e52de09..2da93bf9fe 100644
--- 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