Revert r296139; it accidentally merged multiple things
authorHans Wennborg <hans@hanshq.net>
Fri, 24 Feb 2017 18:42:59 +0000 (18:42 +0000)
committerHans Wennborg <hans@hanshq.net>
Fri, 24 Feb 2017 18:42:59 +0000 (18:42 +0000)
commitb5cac107dc7fc13b635f1348e3f07a926d790443
treede6b84d1ae7d54da69d9232597b95dbe438238a4
parent07d306340988dd9be254fc2ca1d69268afd5d018
Revert r296139; it accidentally merged multiple things

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@296150 91177308-0d34-0410-b5e6-96231b3b80d8
lib/CodeGen/CGOpenMPRuntime.cpp
lib/Frontend/InitPreprocessor.cpp
test/OpenMP/cancellation_point_codegen.cpp
test/Sema/atomic-ops.c