From 2d77119f72fa286dfd1c62904fc8ba9e46983ca8 Mon Sep 17 00:00:00 2001
From: Volodymyr Sapsai <vsapsai@apple.com>
Date: Wed, 2 May 2018 19:52:07 +0000
Subject: [PATCH] Revert "Emit an error when mixing <stdatomic.h> and <atomic>"

It reverts r331378 as it caused test failures

    ThreadSanitizer-x86_64 :: Darwin/gcd-groups-destructor.mm
    ThreadSanitizer-x86_64 :: Darwin/libcxx-shared-ptr-stress.mm
    ThreadSanitizer-x86_64 :: Darwin/xpc-race.mm

Only clang part of the change is reverted, libc++ part remains as is because it
emits error less aggressively.

llvm-svn: 331392
---
 clang/lib/Headers/stdatomic.h    |  4 ----
 clang/test/Headers/stdatomic.cpp | 10 ----------
 2 files changed, 14 deletions(-)
 delete mode 100644 clang/test/Headers/stdatomic.cpp

diff --git a/clang/lib/Headers/stdatomic.h b/clang/lib/Headers/stdatomic.h
index c05702c..b4845a7 100644
--- a/clang/lib/Headers/stdatomic.h
+++ b/clang/lib/Headers/stdatomic.h
@@ -31,10 +31,6 @@
 # include_next <stdatomic.h>
 #else
 
-#if !defined(__ALLOW_STDC_ATOMICS_IN_CXX__) && defined(__cplusplus)
-#error "<stdatomic.h> is incompatible with the C++ standard library; define __ALLOW_STDC_ATOMICS_IN_CXX__ to proceed."
-#endif
-
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/clang/test/Headers/stdatomic.cpp b/clang/test/Headers/stdatomic.cpp
deleted file mode 100644
index 322f26a..0000000
--- a/clang/test/Headers/stdatomic.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %clang_cc1 %s -verify
-// RUN: %clang_cc1 -D__ALLOW_STDC_ATOMICS_IN_CXX__ %s -verify
-
-#include <stdatomic.h>
-
-#ifndef __ALLOW_STDC_ATOMICS_IN_CXX__
-// expected-error@stdatomic.h:* {{<stdatomic.h> is incompatible with the C++ standard library}}
-#else
-// expected-no-diagnostics
-#endif
-- 
2.7.4