aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 eaa16ce..7fa614c 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 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__