Skip to content

Commit c7ada75

Browse files
mkhamoyanakoeplinger
mkhamoyan
and
akoeplinger
authored
Move out globalization code from runtime (#98495)
* Move out globalization code from runtime --------- Co-authored-by: Alexander Köplinger <[email protected]>
1 parent b6585cc commit c7ada75

File tree

14 files changed

+88
-265
lines changed

14 files changed

+88
-265
lines changed

‎eng/liveBuilds.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@
180180
IsNative="" />
181181
<ExcludeNativeLibrariesRuntimeFiles Condition="'$(IncludeOOBLibraries)' != 'true'"
182182
Include="$(LibrariesNativeArtifactsPath)libSystem.IO.Ports.Native.*" />
183+
184+
<ExcludeNativeLibrariesRuntimeFiles Condition="'$(RuntimeFlavor)' != 'Mono'"
185+
Include="$(LibrariesNativeArtifactsPath)System.Globalization.Native.dll;$(LibrariesNativeArtifactsPath)System.Globalization.Native.so;$(LibrariesNativeArtifactsPath)System.Globalization.Native.dylib" />
183186
<LibrariesRuntimeFiles Include="
184187
$(LibrariesNativeArtifactsPath)*.dat;
185188
$(LibrariesNativeArtifactsPath)*.dll;

‎src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
<PlatformManifestFileEntry Include="msquic.dll" IsNative="true" FallbackFileVersion="$(MsQuicFileVersion)" />
129129
<PlatformManifestFileEntry Include="libmsquic.dylib" IsNative="true" FallbackFileVersion="$(MsQuicFileVersion)" Condition="'$(Configuration)' == 'Debug' or '$(LibrariesConfiguration)' == 'Debug'"/>
130130
<PlatformManifestFileEntry Include="System.IO.Compression.Native.dll" IsNative="true" />
131+
<PlatformManifestFileEntry Include="System.Globalization.Native.dll" IsNative="true" />
131132
<PlatformManifestFileEntry Include="createdump.exe" IsNative="true" />
132133
<PlatformManifestFileEntry Include="createdump" IsNative="true" />
133134
<PlatformManifestFileEntry Include="libcoreclrtraceptprovider.so" IsNative="true" />

‎src/libraries/native-binplace.proj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@
1313
<!-- Ordering matters! Overriding GetBinPlaceItems and Build targets after the Sdk import. -->
1414
<Target Name="GetBinPlaceItems">
1515
<ItemGroup>
16-
<BinPlaceItem Include="$(NativeBinDir)*.dll" />
16+
<ExcludeNativeLibrariesRuntimeFiles Condition="'$(RuntimeFlavor)' != 'Mono'"
17+
Include="$(NativeBinDir)System.Globalization.Native.dll;$(NativeBinDir)System.Globalization.Native.so;$(NativeBinDir)System.Globalization.Native.dylib" />
18+
<BinPlaceItem Include="$(NativeBinDir)*.dll" Exclude="@(ExcludeNativeLibrariesRuntimeFiles)" />
1719
<BinPlaceItem Include="$(NativeBinDir)*.pdb" />
1820
<BinPlaceItem Include="$(NativeBinDir)*.lib" />
1921
<BinPlaceItem Include="$(NativeBinDir)*.a" />
2022
<BinPlaceItem Include="$(NativeBinDir)*.bc" />
21-
<BinPlaceItem Include="$(NativeBinDir)*.so" />
23+
<BinPlaceItem Include="$(NativeBinDir)*.so" Exclude="@(ExcludeNativeLibrariesRuntimeFiles)" />
2224
<BinPlaceItem Include="$(NativeBinDir)*.dbg" />
23-
<BinPlaceItem Include="$(NativeBinDir)*.dylib" />
25+
<BinPlaceItem Include="$(NativeBinDir)*.dylib" Exclude="@(ExcludeNativeLibrariesRuntimeFiles)" />
2426
<BinPlaceItem Include="$(NativeBinDir)*.dwarf" />
2527
<BinPlaceItem Include="$(NativeBinDir)*.dex" />
2628
<BinPlaceItem Include="$(NativeBinDir)*.jar" />

‎src/mono/CMakeLists.txt

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ endif()
124124

125125
if(NOT AOT_TARGET_TRIPLE STREQUAL "")
126126
set(MONO_CROSS_COMPILE 1)
127-
add_definitions(-DNO_GLOBALIZATION_SHIM)
128127
if(NOT AOT_OFFSETS_FILE STREQUAL "")
129128
set(MONO_OFFSETS_FILE "${AOT_OFFSETS_FILE}")
130129
endif()
@@ -241,7 +240,6 @@ elseif(CLR_CMAKE_HOST_OS STREQUAL "android")
241240
# FIXME: Rest of the flags from configure.ac
242241
elseif(CLR_CMAKE_HOST_OS STREQUAL "emscripten")
243242
set(HOST_BROWSER 1)
244-
add_definitions(-DNO_GLOBALIZATION_SHIM)
245243
add_definitions(-D_THREAD_SAFE)
246244
add_compile_options(-Wno-strict-prototypes)
247245
add_compile_options(-Wno-unused-but-set-variable)
@@ -255,7 +253,6 @@ elseif(CLR_CMAKE_HOST_OS STREQUAL "emscripten")
255253
elseif(CLR_CMAKE_HOST_OS STREQUAL "wasi")
256254
set(HOST_WASI 1)
257255
add_definitions(-D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_MMAN -DHOST_WASI)
258-
add_definitions(-DNO_GLOBALIZATION_SHIM)
259256
add_definitions(-D_THREAD_SAFE)
260257
add_definitions(-DDISABLE_SOCKET_TRANSPORT)
261258
add_definitions(-DDISABLE_EGD_SOCKET)
@@ -711,79 +708,6 @@ if(LLVM_PREFIX)
711708
add_definitions(-DLLVM_API_VERSION=${llvm_api_version})
712709
endif()
713710

714-
######################################
715-
# ICU CHECKS
716-
######################################
717-
if(HOST_OSX OR HOST_MACCAT OR HOST_IOS OR HOST_TVOS)
718-
# FIXME: Handle errors
719-
execute_process(COMMAND brew --prefix OUTPUT_VARIABLE brew_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
720-
721-
if((HOST_MACCAT OR HOST_IOS OR HOST_TVOS) AND "${CMAKE_SHARED_LINKER_FLAGS}" MATCHES "${brew_prefix}/opt/icu4c/lib")
722-
message(FATAL_ERROR "Linker flags contain the Homebrew version of ICU which conflicts with the iOS/tvOS/MacCatalyst version: ${CMAKE_SHARED_LINKER_FLAGS}")
723-
endif()
724-
endif()
725-
726-
set(ICU_SHIM_PATH "${CLR_SRC_NATIVE_DIR}/libs/System.Globalization.Native")
727-
if(MONO_CROSS_COMPILE)
728-
elseif(HOST_OSX AND NOT HOST_MACCAT)
729-
include(FindPkgConfig)
730-
set(ENV{PKG_CONFIG_PATH} "{$PKG_CONFIG_PATH}:${brew_prefix}/lib/pkgconfig:${brew_prefix}/opt/icu4c/lib/pkgconfig")
731-
# Defines ICU_INCLUDEDIR/ICU_LIBDIR
732-
pkg_check_modules(ICU icu-uc)
733-
set(OSX_ICU_LIBRARY_PATH /usr/lib/libicucore.dylib)
734-
set(ICU_FLAGS "-DTARGET_UNIX -DU_DISABLE_RENAMING -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option -Wno-deprecated-declarations")
735-
set(HAVE_SYS_ICU 1)
736-
elseif(HOST_WASI)
737-
set(ICU_FLAGS "-DPALEXPORT=\"\" -DU_DISABLE_RENAMING -DHAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS -DHAVE_SET_MAX_VARIABLE -DTARGET_UNIX -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option")
738-
set(HAVE_SYS_ICU 1)
739-
set(STATIC_ICU 1)
740-
set(ICU_LIBS "icucore")
741-
elseif(HOST_BROWSER)
742-
set(ICU_FLAGS "-DPALEXPORT=\"\" -DU_DISABLE_RENAMING -DHAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS -DHAVE_SET_MAX_VARIABLE -DTARGET_UNIX -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option")
743-
set(HAVE_SYS_ICU 1)
744-
set(STATIC_ICU 1)
745-
set(ICU_LIBS "icucore")
746-
elseif(HOST_IOS OR HOST_TVOS OR HOST_MACCAT)
747-
set(ICU_FLAGS "-DTARGET_UNIX -DU_DISABLE_RENAMING -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option -Wno-deprecated-declarations")
748-
if(HOST_IOS)
749-
string(APPEND ICU_FLAGS " -DTARGET_IOS")
750-
elseif(HOST_TVOS)
751-
string(APPEND ICU_FLAGS " -DTARGET_TVOS")
752-
elseif(HOST_MACCAT)
753-
string(APPEND ICU_FLAGS " -DTARGET_MACCATALYST")
754-
endif()
755-
string(APPEND ICU_FLAGS " -DAPPLE_HYBRID_GLOBALIZATION")
756-
set(HAVE_SYS_ICU 1)
757-
set(STATIC_ICU 1)
758-
elseif(HOST_ANDROID)
759-
set(ICU_FLAGS "-DPALEXPORT=\"\" -DHAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS -DHAVE_SET_MAX_VARIABLE -DTARGET_UNIX -DTARGET_ANDROID -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option")
760-
set(HAVE_SYS_ICU 1)
761-
elseif(HOST_LINUX)
762-
include(FindPkgConfig)
763-
if(CROSS_ROOTFS)
764-
set(ENV{PKG_CONFIG_SYSROOT_DIR} "${CROSS_ROOTFS}")
765-
endif(CROSS_ROOTFS)
766-
pkg_check_modules(ICU icu-uc)
767-
set(ICU_FLAGS "-DTARGET_UNIX -DU_DISABLE_RENAMING -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option -Wno-deprecated-declarations")
768-
set(HAVE_SYS_ICU 1)
769-
elseif(HOST_WIN32)
770-
set(ICU_FLAGS "-DTARGET_WINDOWS -DPALEXPORT=EXTERN_C")
771-
set(HAVE_SYS_ICU 1)
772-
elseif(HOST_SOLARIS)
773-
set(ICU_FLAGS "-DPALEXPORT=\"\" -DTARGET_UNIX -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option")
774-
set(HAVE_SYS_ICU 1)
775-
elseif(TARGET_FREEBSD)
776-
set(ICU_FLAGS "-DTARGET_UNIX -Wno-deprecated-declarations")
777-
set(HAVE_SYS_ICU 1)
778-
set(ICU_INCLUDEDIR "${CROSS_ROOTFS}/usr/local/include")
779-
set(ICU_LIBDIR "${CROSS_ROOTFS}/usr/local/lib")
780-
elseif(HOST_HAIKU)
781-
set(ICU_FLAGS "-DTARGET_UNIX -DU_DISABLE_RENAMING -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option -Wno-deprecated-declarations")
782-
set(HAVE_SYS_ICU 1)
783-
else()
784-
message(FATAL_ERROR "Unknown host")
785-
endif()
786-
787711
######################################
788712
# GC CHECKS
789713
######################################

‎src/mono/cmake/config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@
183183
/* Define to 1 if you have the <unwind.h> header file. */
184184
#cmakedefine HAVE_UNWIND_H 1
185185

186-
/* Use static ICU */
187-
#cmakedefine STATIC_ICU 1
188-
189186
/* Use in-tree zlib */
190187
#cmakedefine INTERNAL_ZLIB 1
191188

‎src/mono/mono.proj

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
</PropertyGroup>
8181

8282
<ItemGroup Condition="'$(TargetsBrowser)' == 'true' or '$(TargetsWasi)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsMacCatalyst)' == 'true'">
83-
<PackageReference Include="Microsoft.NETCore.Runtime.ICU.Transport" PrivateAssets="all" Version="$(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty="true" />
8483
<PackageReference Condition="'$(HostOS)' == 'windows'"
8584
Include="Microsoft.NET.Runtime.Emscripten.3.1.34.Python.win-x64"
8685
PrivateAssets="all"
@@ -297,9 +296,6 @@
297296
<_MonoBuildEnv Condition="'$(Platform)' == 'arm64'" Include="TARGET_BUILD_ARCH=arm64" />
298297
<_MonoBuildEnv Condition="'$(Platform)' == 'arm'" Include="TARGET_BUILD_ARCH=arm" />
299298
<_MonoBuildEnv Condition="'$(Platform)' == 'armv6'" Include="TARGET_BUILD_ARCH=armv6" />
300-
<_MonoBuildEnv Condition="'$(Platform)' == 'arm64'" Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/aarch64-linux-gnu/pkgconfig" />
301-
<_MonoBuildEnv Condition="'$(Platform)' == 'arm'" Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/arm-linux-gnueabihf/pkgconfig" />
302-
<_MonoBuildEnv Condition="'$(Platform)' == 'armv6'" Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/arm-linux-gnueabihf/pkgconfig" />
303299
<_MonoCFLAGS Condition="'$(TargetArchitecture)' == 'armv6'" Include="-march=armv6zk" />
304300
<_MonoCFLAGS Condition="'$(TargetArchitecture)' == 'armv6'" Include="-mcpu=arm1176jzf-s" />
305301
<_MonoCFLAGS Condition="'$(TargetArchitecture)' == 'armv6'" Include="-mfpu=vfp" />
@@ -314,49 +310,42 @@
314310
<ItemGroup Condition="'$(Targetsillumos)' == 'true' and '$(MonoCrossDir)' != ''">
315311
<_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
316312
<_MonoBuildEnv Include="TARGET_BUILD_ARCH=x64" />
317-
<_MonoBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/lib/pkgconfig" />
318313
</ItemGroup>
319314

320315
<!-- x64 Haiku cross build options -->
321316
<ItemGroup Condition="'$(TargetsHaiku)' == 'true' and '$(MonoCrossDir)' != ''">
322317
<_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
323318
<_MonoBuildEnv Include="TARGET_BUILD_ARCH=x64" />
324-
<_MonoBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/boot/system/lib/pkgconfig" />
325319
</ItemGroup>
326320

327321
<!-- x64 linux cross build options -->
328322
<ItemGroup Condition="'$(TargetsLinux)' == 'true' and '$(MonoCrossDir)' != '' and '$(TargetArchitecture)' == 'x64'">
329323
<_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
330324
<_MonoBuildEnv Include="TARGET_BUILD_ARCH=x64" />
331-
<_MonoBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/pkgconfig" />
332325
</ItemGroup>
333326

334327
<!-- x86 linux cross build options -->
335328
<ItemGroup Condition="'$(TargetsLinux)' == 'true' and '$(MonoCrossDir)' != '' and '$(TargetArchitecture)' == 'x86'">
336329
<_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
337330
<_MonoBuildEnv Include="TARGET_BUILD_ARCH=x86" />
338-
<_MonoBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/pkgconfig" />
339331
</ItemGroup>
340332

341333
<!-- riscv64 Linux cross build options -->
342334
<ItemGroup Condition="'$(MonoCrossDir)' != '' and '$(TargetArchitecture)' == 'riscv64'">
343335
<_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
344336
<_MonoBuildEnv Include="TARGET_BUILD_ARCH=riscv64" />
345-
<_MonoBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/riscv64-linux-gnu/pkgconfig" />
346337
</ItemGroup>
347338

348339
<!-- s390x Linux cross build options -->
349340
<ItemGroup Condition="'$(MonoCrossDir)' != '' and '$(TargetArchitecture)' == 's390x'">
350341
<_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
351342
<_MonoBuildEnv Include="TARGET_BUILD_ARCH=s390x" />
352-
<_MonoBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/s390x-linux-gnu/pkgconfig" />
353343
</ItemGroup>
354344

355345
<!-- ppc64le Linux cross build options -->
356346
<ItemGroup Condition="'$(MonoCrossDir)' != '' and '$(TargetArchitecture)' == 'ppc64le'">
357347
<_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" />
358348
<_MonoBuildEnv Include="TARGET_BUILD_ARCH=ppc64le" />
359-
<_MonoBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/powerpc64le-linux-gnu/pkgconfig" />
360349
</ItemGroup>
361350

362351
<!-- x64 FreeBSD cross build options -->
@@ -443,9 +432,6 @@
443432
<ItemGroup Condition="'$(TargetsBrowser)' == 'true'">
444433
<_MonoCMakeArgs Include="-DENABLE_LLVM_RUNTIME=1"/>
445434
<_MonoCMakeArgs Include="-DEMSCRIPTEN_SYSTEM_PROCESSOR=wasm"/>
446-
<_MonoCFLAGS Condition="'$(WasmEnableThreads)' == 'true'" Include="$(EscapedQuoteW)-I$([MSBuild]::NormalizePath('$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)', 'runtimes', 'browser-wasm-threads', 'native', 'include'))$(EscapedQuoteW)"/>
447-
448-
<_MonoCFLAGS Condition="'$(WasmEnableThreads)' != 'true'" Include="$(EscapedQuoteW)-I$([MSBuild]::NormalizePath('$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)', 'runtimes', 'browser-wasm', 'native', 'include'))$(EscapedQuoteW)"/>
449435
</ItemGroup>
450436
<!-- WASI specific options -->
451437
<ItemGroup Condition="'$(TargetsWasi)' == 'true'">
@@ -460,8 +446,6 @@
460446
<_MonoCFLAGS Include="-D_WASI_EMULATED_PROCESS_CLOCKS"/>
461447
<_MonoCFLAGS Include="-D_WASI_EMULATED_SIGNAL"/>
462448
<_MonoCFLAGS Include="-D_WASI_EMULATED_MMAN"/>
463-
<_MonoCFLAGS Condition="'$(WasmEnableThreads)' == 'true'" Include="$(EscapedQuoteW)-I$([MSBuild]::NormalizePath('$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)', 'runtimes', 'wasi-wasm-threads', 'native', 'include').Replace('\','/'))$(EscapedQuoteW)"/>
464-
<_MonoCFLAGS Condition="'$(WasmEnableThreads)' != 'true'" Include="$(EscapedQuoteW)-I$([MSBuild]::NormalizePath('$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)', 'runtimes', 'wasi-wasm', 'native', 'include').Replace('\','/'))$(EscapedQuoteW)"/>
465449
</ItemGroup>
466450

467451
<!-- iOS/tvOS specific options -->
@@ -832,21 +816,6 @@
832816
<_MonoAotBuildEnv Include="TARGET_BUILD_ARCH=$(AotHostArchitecture)" />
833817
</ItemGroup>
834818

835-
<!-- x64 Linux cross build options -->
836-
<ItemGroup Condition="'$(AotHostArchitecture)' == 'x64' and '$(AotHostOS)' == 'linux'">
837-
<_MonoAotBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/x86_64-linux-gnu/pkgconfig" />
838-
</ItemGroup>
839-
840-
<!-- ARM Linux cross build options on CI -->
841-
<ItemGroup Condition="'$(AotHostArchitecture)' == 'arm64' and '$(AotHostOS)' == 'linux'">
842-
<_MonoAotBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/aarch64-linux-gnu/pkgconfig" />
843-
</ItemGroup>
844-
845-
<!-- ARM Linux cross build options on CI -->
846-
<ItemGroup Condition="'$(AotHostOS)' == 'linux-musl'">
847-
<_MonoAotBuildEnv Include="PKG_CONFIG_PATH=$(MonoCrossDir)/usr/lib/pkgconfig" />
848-
</ItemGroup>
849-
850819
<PropertyGroup>
851820
<_MonoAOTCFLAGSOption>-DCMAKE_C_FLAGS=&quot;@(_MonoAOTCPPFLAGS, ' ') @(_MonoAOTCFLAGS, ' ')&quot;</_MonoAOTCFLAGSOption>
852821
<_MonoAOTCXXFLAGSOption>-DCMAKE_CXX_FLAGS=&quot;@(_MonoAOTCPPFLAGS, ' ') @(_MonoAOTCXXFLAGS, ' ')&quot;</_MonoAOTCXXFLAGSOption>

‎src/mono/mono/eventpipe/test/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,7 @@ if(ENABLE_PERFTRACING)
3939
set(CMAKE_SKIP_RPATH 1)
4040
add_executable(ep-test ${EVENTPIPE_TEST_SOURCES} ${EVENTPIPE_TEST_HEADERS})
4141
target_sources(ep-test PRIVATE "${mono-components-objects}")
42-
target_link_libraries(ep-test PRIVATE eglib_api monosgen-static ${OS_LIBS} ${LLVM_LIBS} ${ICU_LIBS} ${Z_LIBS} monoapi)
43-
if(HAVE_SYS_ICU)
44-
target_link_libraries(ep-test PRIVATE icu_shim_objects)
45-
endif()
46-
if(ICU_LDFLAGS)
47-
set_target_properties(ep-test PROPERTIES LINK_FLAGS ${ICU_LDFLAGS})
48-
endif()
42+
target_link_libraries(ep-test PRIVATE eglib_api monosgen-static ${OS_LIBS} ${LLVM_LIBS} ${Z_LIBS} monoapi)
4943
install_with_stripped_symbols(ep-test TARGETS bin)
5044
else(ENABLE_EVENTPIPE_TEST AND STATIC_COMPONENTS AND (NOT DISABLE_COMPONENTS) AND (NOT DISABLE_LIBS) AND (NOT DISABLE_EXECUTABLES))
5145
message(VERBOSE "Skip building native EventPipe library test runner.")

‎src/mono/mono/metadata/native-library.c

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ static GHashTable *native_library_module_map;
4747
*/
4848
static GHashTable *native_library_module_blocklist;
4949

50-
#ifndef NO_GLOBALIZATION_SHIM
51-
extern const void *GlobalizationResolveDllImport (const char *name);
52-
#endif
53-
5450
static GHashTable *global_module_map; // should only be accessed with the global loader data lock
5551

5652
static MonoDl *internal_module; // used when pinvoking `__Internal`
@@ -786,26 +782,6 @@ get_dllimportsearchpath_flags (MonoCustomAttrInfo *cinfo)
786782
return flags;
787783
}
788784

789-
#ifndef NO_GLOBALIZATION_SHIM
790-
#ifdef HOST_WIN32
791-
#define GLOBALIZATION_DLL_NAME "System.Globalization.Native"
792-
#else
793-
#define GLOBALIZATION_DLL_NAME "libSystem.Globalization.Native"
794-
#endif
795-
796-
static gpointer
797-
default_resolve_dllimport (const char *dll, const char *func)
798-
{
799-
if (strcmp (dll, GLOBALIZATION_DLL_NAME) == 0) {
800-
const void *method_impl = GlobalizationResolveDllImport (func);
801-
if (method_impl)
802-
return (gpointer)method_impl;
803-
}
804-
805-
return NULL;
806-
}
807-
#endif // NO_GLOBALIZATION_SHIM
808-
809785
gpointer
810786
lookup_pinvoke_call_impl (MonoMethod *method, MonoLookupPInvokeStatus *status_out)
811787
{
@@ -881,12 +857,6 @@ lookup_pinvoke_call_impl (MonoMethod *method, MonoLookupPInvokeStatus *status_ou
881857
}
882858
#endif
883859

884-
#ifndef NO_GLOBALIZATION_SHIM
885-
addr = default_resolve_dllimport (new_scope, new_import);
886-
if (addr)
887-
goto exit;
888-
#endif
889-
890860
if (pinvoke_override) {
891861
addr = pinvoke_override (new_scope, new_import);
892862
if (addr)

0 commit comments

Comments
 (0)