From a205407e165e4570b8b6d6e4b7a019b51962ecba Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 14 Jun 2025 17:43:36 +0900 Subject: [PATCH] merge revision(s) 72bda0f981c7136f50254c433bbfb97a953f634b: [Backport #21255] [Bug #21255] Win32: Do not export `__declspec(selectany)` symbols ``` x64-vcruntime140-ruby350.def : error LNK2001: unresolved external symbol Avx2WmemEnabledWeakValue ``` --- version.h | 2 +- win32/mkexports.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/version.h b/version.h index 69c199b40a..2b30770a75 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 159 +#define RUBY_PATCHLEVEL 160 #include "ruby/version.h" #include "ruby/internal/abi.h" diff --git a/win32/mkexports.rb b/win32/mkexports.rb index dd0fbf6313..0c6db1de11 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -114,6 +114,7 @@ class Exports::Mswin < Exports case filetype when /OBJECT/, /LIBRARY/ l.chomp! + next if (/^ .*\(pick any\)$/ =~ l)...true next if /^[[:xdigit:]]+ 0+ UNDEF / =~ l next unless /External/ =~ l next if /(?:_local_stdio_printf_options|v(f|sn?)printf(_s)?_l)\Z/ =~ l