Minor corrections to scripts/check-installed-headers.sh.

	* scripts/check-installed-headers.sh: Generalize treatment of
	sys/elf.h to all target architectures.

diff --git a/ChangeLog b/ChangeLog
index 048480926122b85627d6578b632e136dc2c824ae..88ea4b1ed1d47c1310ce87eb7068aa59722b5cc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-09-28  Zack Weinberg  <zackw@panix.com>
 
+       * scripts/check-installed-headers.sh: Generalize treatment of
+       sys/elf.h to all target architectures.
+
        * sysdeps/unix/sysv/linux/s390/sys/ucontext.h: Restore accidentally-
        deleted typedef ucontext_t.
 

diff --git a/scripts/check-installed-headers.sh b/scripts/check-installed-headers.sh
index 7fbc725c0fd9fe3f970a4adfec9c7c73ecca1667..87d6142fa64b74ee8f3bf993afaa198a1f74aaa2 100644 (file)
--- a/scripts/check-installed-headers.sh
+++ b/scripts/check-installed-headers.sh
@@ -77,9 +77,14 @@ for header in "$@"; do
         (bits/* | regexp.h | rpcsvc/*.x)
             continue;;
 
-        # sys/elf.h and sys/vm86.h are "unsupported on x86-64" and
-        # #error out on that target.
-        (sys/elf.h | sys/vm86.h)
+        # All extant versions of sys/elf.h contain nothing more than an
+        # exhortation (either a #warning or an #error) to use sys/procfs.h
+        # instead, plus an inclusion of that header.
+        (sys/elf.h)
+            continue;;
+
+        # sys/vm86.h is "unsupported on x86-64" and errors out on that target.
+        (sys/vm86.h)
             case "$is_x86_64" in
                 (yes) continue;;
                 (no)  ;;