svn commit: r294138 - head/sys/arm/include
Andrew Turner
andrew at FreeBSD.org
Sat Jan 16 10:12:52 UTC 2016
Author: andrew
Date: Sat Jan 16 10:12:50 2016
New Revision: 294138
URL: https://svnweb.freebsd.org/changeset/base/294138
Log:
Use __ARM_ARCH to decide when ARM_TP_ADDRESS needs to be set. This fixes
an issue with clang 3.8.0 where none of the __ARM_ARCH_*__ macros were
defined on some ARMv6 kernel configs.
Sponsored by: ABT Systems Ltd
Modified:
head/sys/arm/include/sysarch.h
Modified: head/sys/arm/include/sysarch.h
==============================================================================
--- head/sys/arm/include/sysarch.h Sat Jan 16 10:06:33 2016 (r294137)
+++ head/sys/arm/include/sysarch.h Sat Jan 16 10:12:50 2016 (r294138)
@@ -37,7 +37,9 @@
#ifndef _ARM_SYSARCH_H_
#define _ARM_SYSARCH_H_
+#include <machine/acle-compat.h>
#include <machine/armreg.h>
+
/*
* The ARM_TP_ADDRESS points to a special purpose page, which is used as local
* store for the ARM per-thread data and Restartable Atomic Sequences support.
@@ -53,11 +55,7 @@
/* ARM_TP_ADDRESS is needed for processors that don't support
* the exclusive-access opcodes introduced with ARMv6K. */
-/* TODO: #if !defined(_HAVE_ARMv6K_INSTRUCTIONS) */
-#if !defined (__ARM_ARCH_7__) && \
- !defined (__ARM_ARCH_7A__) && \
- !defined (__ARM_ARCH_6K__) && \
- !defined (__ARM_ARCH_6ZK__)
+#if __ARM_ARCH <= 5
#define ARM_TP_ADDRESS (ARM_VECTORS_HIGH + 0x1000)
#define ARM_RAS_START (ARM_TP_ADDRESS + 4)
#define ARM_RAS_END (ARM_TP_ADDRESS + 8)
More information about the svn-src-all
mailing list