GNU C Library master sources branch master updated. glibc-2.24-346-g06b9e94

jsm28@sourceware.org jsm28@sourceware.org
Mon Nov 7 23:32:00 GMT 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  06b9e94f797b910da782b4608545e416ec5af1df (commit)
      from  327792ce5709dd9f6cc8d15732c4af65705eff76 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=06b9e94f797b910da782b4608545e416ec5af1df

commit 06b9e94f797b910da782b4608545e416ec5af1df
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Mon Nov 7 23:32:17 2016 +0000

    Make check-installed-headers.sh ignore sys/sysctl.h for x32.
    
    check-installed-headers tests were failing for x32 because of the x86
    bits/sysctl.h containing a #error for x32.  This patch makes the tests
    ignore sys/sysctl.h for x32, similar to the other special-casing of
    particular headers.
    
    Tested for x86_64 (full testing for -m64, compile-only for x32).
    
    	* scripts/check-installed-headers.sh: Ignore sys/sysctl.h for x32.

diff --git a/ChangeLog b/ChangeLog
index 87559da..18d74ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-07  Joseph Myers  <joseph@codesourcery.com>
+
+	* scripts/check-installed-headers.sh: Ignore sys/sysctl.h for x32.
+
 2016-11-07  Yury Norov  <ynorov@caviumnetworks.com>
 	    Steve Ellcey  <sellcey@caviumnetworks.com>
 
diff --git a/scripts/check-installed-headers.sh b/scripts/check-installed-headers.sh
index 87d6142..a245fe6 100644
--- a/scripts/check-installed-headers.sh
+++ b/scripts/check-installed-headers.sh
@@ -66,6 +66,7 @@ trap "rm -f '$cih_test_c'" 0
 
 failed=0
 is_x86_64=unknown
+is_x32=unknown
 for header in "$@"; do
     # Skip various headers for which this test gets a false failure.
     case "$header" in
@@ -83,6 +84,28 @@ for header in "$@"; do
         (sys/elf.h)
             continue;;
 
+	# sys/sysctl.h is unsupported for x32.
+	(sys/sysctl.h)
+            case "$is_x32" in
+                (yes) continue;;
+                (no)  ;;
+                (unknown)
+                    cat >"$cih_test_c" <<EOF
+#if defined __x86_64__ && defined __ILP32__
+# error "is x32"
+#endif
+EOF
+                    if $cc_cmd -fsyntax-only "$cih_test_c" > /dev/null 2>&1
+                    then
+                        is_x32=no
+                    else
+                        is_x32=yes
+                        continue
+                    fi
+                ;;
+            esac
+	    ;;
+
         # sys/vm86.h is "unsupported on x86-64" and errors out on that target.
         (sys/vm86.h)
             case "$is_x86_64" in

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                          |    4 ++++
 scripts/check-installed-headers.sh |   23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources



More information about the Glibc-cvs mailing list