From 1c3501a5249f29163627fb87edffc097b447d305 Mon Sep 17 00:00:00 2001
From: Olivier Houchard <cognet@ci0.org>
Date: Sun, 9 Aug 2015 14:48:54 +0200
Subject: [PATCH] ck_pr/arm : Don't try to build the 64bits version of CAS for
 armv6 either.

---
 include/gcc/arm/ck_f_pr.h | 4 ++++
 include/gcc/arm/ck_pr.h   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/gcc/arm/ck_f_pr.h b/include/gcc/arm/ck_f_pr.h
index 49e587a..0b9fe82 100644
--- a/include/gcc/arm/ck_f_pr.h
+++ b/include/gcc/arm/ck_f_pr.h
@@ -20,8 +20,10 @@
 #define CK_F_PR_CAS_16_VALUE
 #define CK_F_PR_CAS_32
 #define CK_F_PR_CAS_32_VALUE
+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
 #define CK_F_PR_CAS_64
 #define CK_F_PR_CAS_64_VALUE
+#endif
 #define CK_F_PR_CAS_8
 #define CK_F_PR_CAS_8_VALUE
 #define CK_F_PR_CAS_CHAR
@@ -29,8 +31,10 @@
 #define CK_F_PR_CAS_INT
 #define CK_F_PR_CAS_INT_VALUE
 #define CK_F_PR_CAS_PTR
+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
 #define CK_F_PR_CAS_PTR_2
 #define CK_F_PR_CAS_PTR_2_VALUE
+#endif
 #define CK_F_PR_CAS_PTR_VALUE
 #define CK_F_PR_CAS_SHORT
 #define CK_F_PR_CAS_SHORT_VALUE
diff --git a/include/gcc/arm/ck_pr.h b/include/gcc/arm/ck_pr.h
index 0c83042..3cf0f2c 100644
--- a/include/gcc/arm/ck_pr.h
+++ b/include/gcc/arm/ck_pr.h
@@ -192,8 +192,6 @@ ck_pr_md_store_64(const uint64_t *target, uint64_t value)
 				: "memory", "cc");
 }
 
-#endif
-
 CK_CC_INLINE static bool
 ck_pr_cas_64_value(uint64_t *target, uint64_t compare, uint64_t set, uint64_t *value)
 {
@@ -262,6 +260,8 @@ ck_pr_cas_ptr_2(void *target, void *compare, void *set)
 	return (ck_pr_cas_64(target, __compare, __set));
 }
 
+#endif
+
 CK_CC_INLINE static bool
 ck_pr_cas_ptr_value(void *target, void *compare, void *set, void *value)
 {