tools update

Author: raedrizqie

tools/clang/include/clang/AST/Attr.h

@@ -149,6 +149,11 @@ class InheritableParamAttr : public InheritableAttr {
   }
 };
 
+// MinGW defines interface as struct
+#ifdef interface
+#undef interface
+#endif
+
 #include "clang/AST/Attrs.inc"
 
 inline const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB,

tools/clang/tools/dxclib/dxc.cpp

@@ -62,14 +62,14 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
-#ifdef _WIN32
+#ifdef _MSC_VER
 #include <comdef.h>
 #include <dia2.h>
 #endif
 #include <algorithm>
 #include <unordered_map>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma comment(lib, "version.lib")
 #endif
 
@@ -138,12 +138,12 @@ class DxcContext {
                                   IDxcBlob **ppResult);
 
 // Dia is only supported on Windows.
-#ifdef _WIN32
+#ifdef _MSC_VER
   // TODO : Refactor two functions below. There are duplicate functions in
   // DxcContext in dxa.cpp
   HRESULT GetDxcDiaTable(IDxcLibrary *pLibrary, IDxcBlob *pTargetBlob,
                          IDiaTable **ppTable, LPCWSTR tableName);
-#endif // _WIN32
+#endif // _MSC_VER
 
   HRESULT FindModuleBlob(hlsl::DxilFourCC fourCC, IDxcBlob *pSource,
                          IDxcLibrary *pLibrary, IDxcBlob **ppTargetBlob);
@@ -1149,7 +1149,7 @@ HRESULT DxcContext::FindModuleBlob(hlsl::DxilFourCC fourCC, IDxcBlob *pSource,
 
 // This function is currently only supported on Windows due to usage of
 // IDiaTable.
-#ifdef _WIN32
+#ifdef _MSC_VER
 // TODO : There is an identical code in DxaContext in Dxa.cpp. Refactor this
 // function.
 HRESULT DxcContext::GetDxcDiaTable(IDxcLibrary *pLibrary, IDxcBlob *pTargetBlob,
@@ -1183,7 +1183,7 @@ HRESULT DxcContext::GetDxcDiaTable(IDxcLibrary *pLibrary, IDxcBlob *pTargetBlob,
   *ppTable = pTable.Detach();
   return S_OK;
 }
-#endif // _WIN32
+#endif // _MSC_VER
 
 bool GetDLLFileVersionInfo(const char *dllPath, unsigned int *version) {
   // This function is used to get version information from the DLL file.

tools/clang/tools/dxcompiler/DXCompiler.cpp

@@ -16,7 +16,7 @@
 #include "dxc/config.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/ManagedStatic.h"
-#ifdef LLVM_ON_WIN32
+#ifdef _MSC_VER
 #include "dxcetw.h"
 #endif
 

tools/clang/tools/dxcompiler/DXCompiler.rc

@@ -11,4 +11,6 @@
 #define VER_ORIGINALFILENAME_STR      "DXCompiler.dll"
 
 // #include <common.ver>
+#ifdef _MSC_VER
 #include "dxcetw.rc"
+#endif

tools/clang/tools/dxcompiler/dxcapi.cpp

@@ -11,7 +11,7 @@
 
 #include "dxc/Support/WinIncludes.h"
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #define DXC_API_IMPORT __declspec(dllexport)
 #else
 #define DXC_API_IMPORT __attribute__((visibility("default")))
@@ -21,7 +21,7 @@
 #include "dxc/config.h"
 #include "dxc/dxcisense.h"
 #include "dxc/dxctools.h"
-#ifdef _WIN32
+#ifdef _MSC_VER
 #include "dxcetw.h"
 #endif
 #include "dxc/DxilContainer/DxcContainerBuilder.h"
@@ -96,7 +96,7 @@ static HRESULT ThreadMallocDxcCreateInstance(REFCLSID rclsid, REFIID riid,
     hr = CreateDxcLinker(riid, ppv);
   }
 // Note: The following targets are not yet enabled for non-Windows platforms.
-#ifdef _WIN32
+#ifdef _MSC_VER
   else if (IsEqualCLSID(rclsid, CLSID_DxcDiaDataSource)) {
     hr = CreateDxcDiaDataSource(riid, ppv);
   }

tools/clang/tools/dxcompiler/dxcompilerobj.cpp

@@ -50,7 +50,7 @@
 #include "dxc/Support/dxcapi.use.h"
 #include "dxc/Support/microcom.h"
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #include "dxcetw.h"
 #endif
 #include "dxcompileradapter.h"

tools/clang/tools/dxcompiler/dxcpdbutils.cpp

@@ -47,7 +47,7 @@
 #include <string>
 #include <vector>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #include "dxc/dxcpix.h"
 #include <dia2.h>
 #endif
@@ -273,7 +273,7 @@ struct DxcPdbUtilsAdapter : public IDxcPdbUtils {
 };
 
 struct DxcPdbUtils : public IDxcPdbUtils2
-#ifdef _WIN32
+#ifdef _MSC_VER
     // Skip Pix debug info on linux for dia dependence.
     ,
                      public IDxcPixDxilDebugInfoFactory
@@ -843,7 +843,7 @@ struct DxcPdbUtils : public IDxcPdbUtils2
 
   HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,
                                            void **ppvObject) override {
-#ifdef _WIN32
+#ifdef _MSC_VER
     HRESULT hr =
         DoBasicQueryInterface<IDxcPdbUtils2, IDxcPixDxilDebugInfoFactory>(
             this, iid, ppvObject);
@@ -1071,7 +1071,7 @@ struct DxcPdbUtils : public IDxcPdbUtils2
     return CopyBlobWide(m_Name, ppResult);
   }
 
-#ifdef _WIN32
+#ifdef _MSC_VER
   virtual STDMETHODIMP
   NewDxcPixDxilDebugInfo(IDxcPixDxilDebugInfo **ppDxilDebugInfo) override {
     if (!m_pDebugProgramBlob)

tools/clang/tools/dxcvalidator/dxcvalidator.cpp

@@ -26,7 +26,7 @@
 #include "dxc/Support/Global.h"
 #include "dxc/Support/dxcapi.impl.h"
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #include "dxcetw.h"
 #endif
 

tools/clang/tools/dxildll/dxildll.cpp

@@ -10,7 +10,7 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #define DXC_API_IMPORT
 #else
 #define DXC_API_IMPORT __attribute__((visibility("default")))
@@ -22,7 +22,7 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/ManagedStatic.h"
 #include <algorithm>
-#ifdef _WIN32
+#ifdef _MSC_VER
 #include "Tracing/DxcRuntimeEtw.h"
 #include "dxc/Tracing/dxcetw.h"
 #endif