This is an archive of the discontinued LLVM Phabricator instance.

Differential D86448

[OpenMP] Check if `_MSC_VER` is defined before using it
ClosedPublic

Authored by mati865 on Aug 24 2020, 5:15 AM.

Details

Reviewers
jdoerfert
AndreyChurbanov
Group Reviewers
Restricted Project
Commits
rGd0f4f5a182d7: [OpenMP] Check if _MSC_VER is defined before using it
Summary

MinGW compilers don't define _MSC_VER so _MSC_VER < 1600 expands to true.

Diff Detail

Event Timeline

mati865 created this revision.Aug 24 2020, 5:15 AM
Herald added subscribers: openmp-commits, mstorsjo, guansong, yaxunl. · View Herald TranscriptAug 24 2020, 5:15 AM
mati865 requested review of this revision.Aug 24 2020, 5:15 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptAug 24 2020, 5:15 AM
Herald added a subscriber: sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B69301: Diff 287343.Aug 24 2020, 5:53 AM
AndreyChurbanov accepted this revision.Aug 24 2020, 6:33 AM
AndreyChurbanov added a subscriber: AndreyChurbanov.

LGTM

This revision is now accepted and ready to land.Aug 24 2020, 6:33 AM
mati865 added a comment.Aug 24 2020, 7:08 AM

Could you commit it for me please? I don't have write permission to the repo.

Closed by commit rGd0f4f5a182d7: [OpenMP] Check if _MSC_VER is defined before using it (authored by AndreyChurbanov). · Explain WhyAug 24 2020, 7:51 AM
This revision was automatically updated to reflect the committed changes.
AndreyChurbanov added a commit: rGd0f4f5a182d7: [OpenMP] Check if _MSC_VER is defined before using it.

Revision Contents

PathSize
openmp/
runtime/
src/
2 lines

Diff 287397

openmp/runtime/src/kmp_atomic.h

Show All 33 Lines
// Visual Studio cannot have function parameters that have the // Visual Studio cannot have function parameters that have the
// align __declspec attribute, so we must remove it. (Compiler Error C2719) // align __declspec attribute, so we must remove it. (Compiler Error C2719)
#if KMP_COMPILER_MSVC #if KMP_COMPILER_MSVC
#undef KMP_DO_ALIGN #undef KMP_DO_ALIGN
#define KMP_DO_ALIGN(alignment) /* Nothing */ #define KMP_DO_ALIGN(alignment) /* Nothing */
#endif #endif
#if (_MSC_VER < 1600) && defined(_DEBUG) #if defined(_MSC_VER) && (_MSC_VER < 1600) && defined(_DEBUG)
// Workaround for the problem of _DebugHeapTag unresolved external. // Workaround for the problem of _DebugHeapTag unresolved external.
// This problem prevented to use our static debug library for C tests // This problem prevented to use our static debug library for C tests
// compiled with /MDd option (the library itself built with /MTd), // compiled with /MDd option (the library itself built with /MTd),
#undef _DEBUG #undef _DEBUG
#define _DEBUG_TEMPORARILY_UNSET_ #define _DEBUG_TEMPORARILY_UNSET_
#endif #endif
#include <complex> #include <complex>
▲ Show 20 Lines • Show All 1,717 Lines • Show Last 20 Lines