From: Simon Pilgrim <llvm-dev@redking.me.uk>
Date: Wed, 31 Jul 2019 11:06:05 +0000 (+0000)
Subject: Re-disable C4324 MSVC warning that was enabled in D65458 / rL367383
X-Git-Tag: llvmorg-11-init~13202
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f823e63e3edf87ab029ba32b68f3eb5d2f392b5;p=platform%2Fupstream%2Fllvm.git

Re-disable C4324 MSVC warning that was enabled in D65458 / rL367383

This was breaking /WX builds

llvm-svn: 367409
---

diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
index f9cb5d3..a243507 100644
--- a/llvm/cmake/modules/HandleLLVMOptions.cmake
+++ b/llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -530,6 +530,14 @@ if (MSVC)
           # is fixed.
       -wd4709 # Suppress comma operator within array index expression
 
+      # Ideally, we'd like this warning to be enabled, but MSVC 2013 doesn't
+      # support the 'aligned' attribute in the way that clang sources requires (for
+      # any code that uses the LLVM_ALIGNAS macro), so this is must be disabled to
+      # avoid unwanted alignment warnings.
+      # When we switch to requiring a version of MSVC that supports the 'alignas'
+      # specifier (MSVC 2015?) this warning can be re-enabled.
+      -wd4324 # Suppress 'structure was padded due to __declspec(align())'
+
       # Promoted warnings.
       -w14062 # Promote 'enumerator in switch of enum is not handled' to level 1 warning.