From 28f83b276a2e9183ad842321875d476e1ad82cb1 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Thu, 30 Oct 2014 10:42:46 -0700
Subject: Cherry-pick: Only use <atomic> for C++11 and newer

See bionic 3ce0769aa5f9a991af1d167f730d987dd002253c
BUG=17736764

Change-Id: I275c2db726778e4f403a08e670b954ad0b607376
---
 9/platforms/android-21/arch-arm/usr/include/stdatomic.h    | 2 +-
 9/platforms/android-21/arch-arm64/usr/include/stdatomic.h  | 2 +-
 9/platforms/android-21/arch-mips/usr/include/stdatomic.h   | 2 +-
 9/platforms/android-21/arch-mips64/usr/include/stdatomic.h | 2 +-
 9/platforms/android-21/arch-x86/usr/include/stdatomic.h    | 2 +-
 9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/9/platforms/android-21/arch-arm/usr/include/stdatomic.h b/9/platforms/android-21/arch-arm/usr/include/stdatomic.h
index bcea859..58cb1bc 100644
--- a/9/platforms/android-21/arch-arm/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-arm/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
diff --git a/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h b/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h
index bcea859..58cb1bc 100644
--- a/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
diff --git a/9/platforms/android-21/arch-mips/usr/include/stdatomic.h b/9/platforms/android-21/arch-mips/usr/include/stdatomic.h
index bcea859..58cb1bc 100644
--- a/9/platforms/android-21/arch-mips/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-mips/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
diff --git a/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h b/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h
index bcea859..58cb1bc 100644
--- a/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
diff --git a/9/platforms/android-21/arch-x86/usr/include/stdatomic.h b/9/platforms/android-21/arch-x86/usr/include/stdatomic.h
index bcea859..58cb1bc 100644
--- a/9/platforms/android-21/arch-x86/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-x86/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
diff --git a/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h b/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h
index bcea859..58cb1bc 100644
--- a/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
-- 
cgit v1.1