about summary refs log tree commit diff
path: root/sysdeps/sparc/bits/hwcap.h
diff options
context:
space:
mode:
authorAdam Conrad <adconrad@0c3.net>2014-02-21 00:24:03 -0700
committerAdam Conrad <adconrad@0c3.net>2014-02-21 00:24:03 -0700
commit105fa3815690f5e370421701daf89cfa49afd5b3 (patch)
tree5aaffde227d307ff56ef4e66d331456928a4bcdd /sysdeps/sparc/bits/hwcap.h
parentb8cd1c4ea5788d10bdb586f22a75f38f284ccdf0 (diff)
downloadglibc-105fa3815690f5e370421701daf89cfa49afd5b3.tar.gz
glibc-105fa3815690f5e370421701daf89cfa49afd5b3.tar.xz
glibc-105fa3815690f5e370421701daf89cfa49afd5b3.zip
Allow sys/auxv.h to be used from the testsuite on powerpc and sparc.
elf/tst-auxv.c includes misc/sys/auxv.h, which ends up not actually
being included due to the guard overlap, and getauxval becomes an
implicit declaration and implicit pointer conversion which means, at
best, the test isn't actually testing what it thinks it is and, at
worst, it'll crash and burn on platforms where implict pointer
conversion is a Very Bad Thing.

	* sysdeps/powerpc/bits/hwcap.h: Allow _SYSDEPS_SYSDEP_H guard as a
	synonym for _SYS_AUXV_H to allow direct inclusion.
	* sysdeps/sparc/bits/hwcap.h: Likewise.
	* sysdeps/powerpc/sysdep.h: Define _SYSDEPS_SYSDEP_H instead of
	_SYS_AUXV_H so we can include sysdep.h and sys/auxv.h together.
	* sysdeps/sparc/sysdep.h: Likewise.
Diffstat (limited to 'sysdeps/sparc/bits/hwcap.h')
-rw-r--r--sysdeps/sparc/bits/hwcap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/sparc/bits/hwcap.h b/sysdeps/sparc/bits/hwcap.h
index cf7c3db6c0..74e1d7fcea 100644
--- a/sysdeps/sparc/bits/hwcap.h
+++ b/sysdeps/sparc/bits/hwcap.h
@@ -16,7 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _SYS_AUXV_H
+#if !defined(_SYS_AUXV_H) && !defined(_SYSDEPS_SYSDEP_H)
 # error "Never include <bits/hwcap.h> directly; use <sys/auxv.h> instead."
 #endif