From ea58f202931fdf15450e54859aaea675efb93588 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Thu, 11 Sep 2014 17:47:53 +0100 Subject: ARM: Don't define _SYS_AUXV_H in sysdep.h sysdep.h was defining _SYS_AUXV_H in order to avoid an include guard check in hwcap.h. Unfortunately it didn't undefine it so it could leak out into code and caused a build failure with -Wimplicit-function-declaration building tst-auxv on ARM. ChangeLog: 2014-09-23 Will Newton * sysdeps/unix/sysv/linux/arm/bits/hwcap.h: Check for _LINUX_ARM_SYSDEP_H include guard too. * sysdeps/unix/sysv/linux/arm/sysdep.h (_SYS_AUXV_H): Remove define. --- ChangeLog | 7 +++++++ sysdeps/unix/sysv/linux/arm/bits/hwcap.h | 2 +- sysdeps/unix/sysv/linux/arm/sysdep.h | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eaa16ce..7fa614c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-09-23 Will Newton + + * sysdeps/unix/sysv/linux/arm/bits/hwcap.h: Check for + _LINUX_ARM_SYSDEP_H include guard too. + * sysdeps/unix/sysv/linux/arm/sysdep.h (_SYS_AUXV_H): Remove + define. + 2014-09-20 Rasmus Villemoes * sysdeps/unix/sysv/linux/eventfd.c: diff --git a/sysdeps/unix/sysv/linux/arm/bits/hwcap.h b/sysdeps/unix/sysv/linux/arm/bits/hwcap.h index cd8f93c..2ddc5a6 100644 --- a/sysdeps/unix/sysv/linux/arm/bits/hwcap.h +++ b/sysdeps/unix/sysv/linux/arm/bits/hwcap.h @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#ifndef _SYS_AUXV_H +#if !defined (_SYS_AUXV_H) && !defined (_LINUX_ARM_SYSDEP_H) # error "Never include directly; use instead." #endif diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h index 52e27d0..91bdca5 100644 --- a/sysdeps/unix/sysv/linux/arm/sysdep.h +++ b/sysdeps/unix/sysv/linux/arm/sysdep.h @@ -40,7 +40,6 @@ #undef SYS_ify #define SYS_ify(syscall_name) (__NR_##syscall_name) -#define _SYS_AUXV_H 1 #include #ifdef __ASSEMBLER__ -- cgit v1.1