aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Newton <will.newton@linaro.org>2014-09-11 17:47:53 +0100
committerWill Newton <will.newton@linaro.org>2014-09-23 14:58:49 +0100
commitea58f202931fdf15450e54859aaea675efb93588 (patch)
tree016cc49f4bae26acb19824616eb24d65a7043998
parent69eb9a183c19e8739065e430758e4d3a2c5e4f1a (diff)
downloadtermbaud-ea58f202931fdf15450e54859aaea675efb93588.tar.gz
termbaud-ea58f202931fdf15450e54859aaea675efb93588.tar.xz
termbaud-ea58f202931fdf15450e54859aaea675efb93588.zip
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 <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.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/arm/bits/hwcap.h2
-rw-r--r--sysdeps/unix/sysv/linux/arm/sysdep.h1
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eaa16ced19d..7fa614ca0c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-09-23 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.
+
2014-09-20 Rasmus Villemoes <rv@rasmusvillemoes.dk>
* 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 cd8f93cf0ad..2ddc5a635e4 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 52e27d04436..91bdca52267 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__