mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-18 12:16:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make check-installed-headers.sh ignore sys/sysctl.h for x32.

Browse Source 
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.
This commit is contained in:
Joseph Myers 2016-11-07 23:32:17 +00:00
parent 327792ce57
commit 06b9e94f79
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 2016-11-07 Yury Norov <ynorov@caviumnetworks.com>
Steve Ellcey <sellcey@caviumnetworks.com> Steve Ellcey <sellcey@caviumnetworks.com>

23
scripts/check-installed-headers.sh
View File

@ -66,6 +66,7 @@ trap "rm -f '$cih_test_c'" 0
failed=0 failed=0
is_x86_64=unknown is_x86_64=unknown
is_x32=unknown
for header in "$@"; do for header in "$@"; do
# Skip various headers for which this test gets a false failure. # Skip various headers for which this test gets a false failure.
case "$header" in case "$header" in
@ -83,6 +84,28 @@ for header in "$@"; do
(sys/elf.h) (sys/elf.h)
continue;; 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 is "unsupported on x86-64" and errors out on that target.
(sys/vm86.h) (sys/vm86.h)
case "$is_x86_64" in case "$is_x86_64" in