[llvm] 314b5a0 - [llvm-shlib] Fix the i686 MSVC triple check for listing symbols to export in LLVM-C.dll

[Martin Storsjö via llvm-commits]

Author: Martin Storsjö
Date: 2021-09-11T19:50:03+03:00
New Revision: 314b5a0efda75dcd195f1631333078de67be13c0

URL: https://github.com/llvm/llvm-project/commit/314b5a0efda75dcd195f1631333078de67be13c0
DIFF: https://github.com/llvm/llvm-project/commit/314b5a0efda75dcd195f1631333078de67be13c0.diff

LOG: [llvm-shlib] Fix the i686 MSVC triple check for listing symbols to export in LLVM-C.dll

https://reviews.llvm.org/D47381 / eb46c95c3e7aeba4d183ca614fe238067eddf97f
changed the triples set up by GetHostTriple.cmake for i686 MSVC
from i686-pc-win32 to i686-pc-windows-msvc without changing
the corresponding condition in llvm-shlib.

Since then, the 32 bit x86 build of LLVM-C.dll has contained no
exported symbols at all.

Differential Revision: https://reviews.llvm.org/D109493

Added: 
    

Modified: 
    llvm/tools/llvm-shlib/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/tools/llvm-shlib/CMakeLists.txt b/llvm/tools/llvm-shlib/CMakeLists.txt
index 76b9a25cbbcdc..db013a8a59672 100644
--- a/llvm/tools/llvm-shlib/CMakeLists.txt
+++ b/llvm/tools/llvm-shlib/CMakeLists.txt
@@ -124,7 +124,7 @@ if(LLVM_BUILD_LLVM_C_DYLIB AND MSVC)
   list(REMOVE_DUPLICATES LIB_NAMES)
 
   # The python script needs to know whether symbols are prefixed with underscores or not.
-  if(LLVM_HOST_TRIPLE STREQUAL "i686-pc-win32")
+  if(LLVM_HOST_TRIPLE MATCHES "i?86-.*win.*")
     set(GEN_UNDERSCORE "--underscore")
   else()
     set(GEN_UNDERSCORE "")