This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] ARM: Don't define _SYS_AUXV_H in sysdep.h
- From: Will Newton <will dot newton at linaro dot org>
- To: libc-alpha at sourceware dot org
- Date: Fri, 12 Sep 2014 11:31:08 +0100
- Subject: [PATCH] ARM: Don't define _SYS_AUXV_H in sysdep.h
- Authentication-results: sourceware.org; auth=none
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-11 Will Newton <will.newton@linaro.org>
* 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.
---
sysdeps/unix/sysv/linux/arm/bits/hwcap.h | 2 +-
sysdeps/unix/sysv/linux/arm/sysdep.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
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
<http://www.gnu.org/licenses/>. */
-#ifndef _SYS_AUXV_H
+#if !defined (_SYS_AUXV_H) && !defined (_LINUX_ARM_SYSDEP_H)
# error "Never include <bits/hwcap.h> directly; use <sys/auxv.h> 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 <bits/hwcap.h>
#ifdef __ASSEMBLER__
--
1.9.3