diff options
| author | Brad Smith <brad@comstyle.com> | 2021-10-29 02:34:38 -0400 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2021-11-08 09:07:16 -0800 |
| commit | ff2cb6e400c3a130a9bb9f7be1e45beb9c316160 (patch) | |
| tree | 199c3981e2c0071986913022335f40ace98075bf | |
| parent | ed38280d006c91d7098b0a02e160835ee09fd08a (diff) | |
| download | llvm-ff2cb6e400c3a130a9bb9f7be1e45beb9c316160.tar.gz | |
[clang] Partially revert d8cd7806310c51af912a647a6ca46de62ff13214.
The C11 atomics part was wrong.
(cherry picked from commit 95e6e1cc923d6b88ebb4ac5e8f0887c2c77476cc)
| -rw-r--r-- | clang/lib/Basic/Targets/OSTargets.h | 4 | ||||
| -rw-r--r-- | clang/test/Preprocessor/init.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/clang/lib/Basic/Targets/OSTargets.h b/clang/lib/Basic/Targets/OSTargets.h index 3fe39ed64d9c..12df95c19f35 100644 --- a/clang/lib/Basic/Targets/OSTargets.h +++ b/clang/lib/Basic/Targets/OSTargets.h @@ -461,10 +461,8 @@ protected: if (this->HasFloat128) Builder.defineMacro("__FLOAT128__"); - if (Opts.C11) { - Builder.defineMacro("__STDC_NO_ATOMICS__"); + if (Opts.C11) Builder.defineMacro("__STDC_NO_THREADS__"); - } } public: diff --git a/clang/test/Preprocessor/init.c b/clang/test/Preprocessor/init.c index 43708837c4ae..5aba07860f6d 100644 --- a/clang/test/Preprocessor/init.c +++ b/clang/test/Preprocessor/init.c @@ -1467,11 +1467,9 @@ // RUN: %clang_cc1 -x c -std=c11 -E -dM -ffreestanding -triple=amd64-unknown-openbsd < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD-STDC %s // RUN: %clang_cc1 -x c -std=gnu11 -E -dM -ffreestanding -triple=amd64-unknown-openbsd < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD-STDC %s // RUN: %clang_cc1 -x c -std=c17 -E -dM -ffreestanding -triple=amd64-unknown-openbsd < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD-STDC %s -// OPENBSD-STDC:#define __STDC_NO_ATOMICS__ 1 // OPENBSD-STDC:#define __STDC_NO_THREADS__ 1 // // RUN: %clang_cc1 -x c -std=c99 -E -dM -ffreestanding -triple=amd64-unknown-openbsd < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD-STDC-N %s -// OPENBSD-STDC-N-NOT:#define __STDC_NO_ATOMICS__ 1 // OPENBSD-STDC-N-NOT:#define __STDC_NO_THREADS__ 1 // // RUN: %clang_cc1 -E -dM -ffreestanding -triple=xcore-none-none < /dev/null | FileCheck -match-full-lines -check-prefix XCORE %s |