[PATCH] D90158: [Aarch64] Fix assumption that Windows implies x86

[David Truby via Phabricator via llvm-commits]

DavidTruby created this revision.
DavidTruby added reviewers: joechrisellis, Meinersbur.
Herald added subscribers: llvm-commits, danielkiss, pengfei, hiraditya, kristof.beyls, mgorny.
Herald added a project: LLVM.
DavidTruby requested review of this revision.

[Aarch64] Fix assumption that Windows implies x86


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D90158

Files:
  llvm/lib/DebugInfo/PDB/CMakeLists.txt


Index: llvm/lib/DebugInfo/PDB/CMakeLists.txt
===================================================================
--- llvm/lib/DebugInfo/PDB/CMakeLists.txt
+++ llvm/lib/DebugInfo/PDB/CMakeLists.txt
@@ -6,7 +6,12 @@
 if(LLVM_ENABLE_DIA_SDK)
   include_directories(${MSVC_DIA_SDK_DIR}/include)
   set(LIBPDB_LINK_FOLDERS "${MSVC_DIA_SDK_DIR}\\lib")
-  if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+
+  if ("$ENV{VSCMD_ARG_TGT_ARCH}" STREQUAL "arm64")
+    set(LIBPDB_LINK_FOLDERS "${LIBPDB_LINK_FOLDERS}\\arm64")
+  elseif ("$ENV{VSCMD_ARG_TGT_ARCH}" STREQUAL "arm")
+    set(LIBPDB_LINK_FOLDERS "${LIBPDB_LINK_FOLDERS}\\arm")
+  elseif (CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(LIBPDB_LINK_FOLDERS "${LIBPDB_LINK_FOLDERS}\\amd64")
   endif()
   file(TO_CMAKE_PATH "${LIBPDB_LINK_FOLDERS}\\diaguids.lib" LIBPDB_ADDITIONAL_LIBRARIES)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D90158.300673.patch
Type: text/x-patch
Size: 828 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201026/2c3808ea/attachment.bin>