Add local build for System.Globalization shim

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets

@@ -64,7 +64,9 @@ The .NET Foundation licenses this file to you under the MIT license.
       <NetCoreAppNativeLibrary Include="@(NetCoreAppNativeLibrary->'%(Identity)')">
         <EscapedPath>$(IlcFrameworkNativePath)lib%(Identity).a</EscapedPath>
       </NetCoreAppNativeLibrary>
+      <NativeLibrary Include="$(IntermediateOutputPath)/shim_source_code/libs/System.Globalization.Native/build/libSystem.Globalization.Native-Static.a" Condition="'$(LocalSystemGlobalizationNative)' != ''"/>
       <NativeLibrary Include="@(NetCoreAppNativeLibrary->'%(EscapedPath)')" />
+      <StaticICULibs Include="-Wl,-Bstatic -licuio -licutu -licui18n -licuuc -licudata -Wl,-Bdynamic" Condition="'$(LocalSystemGlobalizationNative)' != ''" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetOS)' == 'OSX'">
@@ -74,8 +76,11 @@ The .NET Foundation licenses this file to you under the MIT license.
       <NativeFramework Include="GSS" />
     </ItemGroup>
 
+    <Exec Command="$(IlcSdkPath)/../shim_source_code/libs/System.Globalization.Native/build-nativeaot-shim-standalone.sh $(IlcSdkPath)/../ $(IntermediateOutputPath)" Condition="'$(LocalSystemGlobalizationNative)' != ''"/>
+
     <ItemGroup>
       <LinkerArg Include="@(NativeLibrary)" />
+      <LinkerArg Include="@(StaticICULibs)" Condition="'$(LocalSystemGlobalizationNative)' != ''" />
       <LinkerArg Include="--sysroot=$(SysRoot)" Condition="'$(SysRoot)' != ''" />
       <LinkerArg Include="--target=$(TargetTriple)" Condition="'$(TargetTriple)' != ''" />
       <LinkerArg Include="-g" Condition="$(NativeDebugSymbols) == 'true'" />

src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj

@@ -21,6 +21,9 @@
       <File Include="$(CoreCLRBuildIntegrationDir)*" TargetPath="build" />
       <File Include="$(CoreCLRILCompilerDir)netstandard\*" TargetPath="tools/netstandard" />
       <File Include="sdk\Sdk.props" TargetPath="Sdk" />
+      <File Include="$(MSBuildThisFileDirectory)\..\..\..\..\native\libs\System.Globalization.Native\*" TargetPath="shim_source_code/libs/System.Globalization.Native"/>
+      <File Include="$(MSBuildThisFileDirectory)\..\..\..\..\native\minipal\*" TargetPath="shim_source_code/minipal"/>
+      <File Include="$(MSBuildThisFileDirectory)\..\..\..\..\native\libs\Common\*" TargetPath="shim_source_code/libs/Common"/>
     </ItemGroup>
   </Target>
 

src/native/libs/System.Globalization.Native/CMakeLists-standalone.txt

@@ -0,0 +1,45 @@
+cmake_minimum_required(VERSION 3.6)
+
+project(System.Globalization.Native.User.Machine.Build C)
+
+include(configure.cmake)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux") # Only Linux for now
+
+set(NATIVEGLOBALIZATION_SOURCES
+  pal_calendarData.c
+  pal_casing.c
+  pal_collation.c
+  pal_idna.c
+  pal_locale.c
+  pal_localeNumberData.c
+  pal_localeStringData.c
+  pal_normalization.c
+  pal_icushim_static.c
+  pal_timeZoneInfo.c
+)
+
+add_library(System.Globalization.Native-Static
+    STATIC
+    ${NATIVEGLOBALIZATION_SOURCES}
+)
+
+add_compile_options(-Wno-switch-enum)
+add_compile_options(-Wno-covered-switch-default)
+
+# Workaround for warnings produced by ICU headers
+add_compile_options(-Wno-reserved-id-macro)
+add_compile_options(-Wno-documentation)
+add_compile_options(-Wno-documentation-unknown-command)
+
+# Workaround for https://unicode-org.atlassian.net/browse/ICU-20601
+add_compile_options(-Wno-extra-semi-stmt)
+add_compile_options(-Wno-unknown-warning-option)
+
+add_definitions(-D_GNU_SOURCE -g -fPIC -DBUILDENV_DEBUG=1 -DDEBUG -DDISABLE_CONTRACTS -DHOST_64BIT -DHOST_AMD64 -DHOST_UNIX -DPALEXPORT=EXTERN_C -DTARGET_64BIT -DTARGET_AMD64 -DTARGET_LINUX -DTARGET_UNIX -DURTBLDENV_FRIENDLY=Debug -D_DBG -D_DEBUG -D_FILE_OFFSET_BITS=64 -DSTATIC_ICU -DSTATIC_SHIM_COMPILE)
+
+target_compile_options(System.Globalization.Native-Static PUBLIC -std=gnu99 -Wno-declaration-after-statement -D_GNU_SOURCE -g -fPIC -O0 -g -Wall -fno-omit-frame-pointer -fms-extensions -fwrapv -fstack-protector-strong)
+
+target_include_directories (System.Globalization.Native-Static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Common ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../)
+
+endif()

src/native/libs/System.Globalization.Native/build-nativeaot-shim-standalone.sh

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the MIT license.
+#
+
+# This script is used only for building libSystem.Globalization.Native.a
+# in the end-user's computer for NativeAOT purposes (static linking).
+# It is not used during the dotnet runtime build.
+
+# Currently, only Linux is supported
+
+SHIM_SOURCE_DIR=$1/shim_source_code
+INTERMEDIATE_OUTPUT_PATH=$2
+
+if [ -d "$SHIM_SOURCE_DIR" ]; then
+    cp -r "$SHIM_SOURCE_DIR" "$INTERMEDIATE_OUTPUT_PATH"
+    if [ $? -ne 0 ]; then echo "build-standalone.sh::ERROR: Cannot copy into $INTERMEDIATE_OUTPUT_PATH"; exit 1; fi
+    LOCAL_SHIM_DIR="$INTERMEDIATE_OUTPUT_PATH"/shim_source_code/libs/System.Globalization.Native
+    cd "$LOCAL_SHIM_DIR"
+    if [ $? -ne 0 ]; then echo "build-standalone.sh::ERROR: Cannot cd into $LOCAL_SHIM_DIR"; exit 1; fi
+    cp CMakeLists-standalone.txt CMakeLists.txt
+    if [ $? -ne 0 ]; then echo "build-standalone.sh::ERROR: Cannot copy CMakeLists.txt"; exit 1; fi
+    cp config-standalone.h config.h
+    if [ $? -ne 0 ]; then echo "build-standalone.sh::ERROR: Cannot copy config.h"; exit 1; fi
+    mkdir -p build
+    if [ $? -ne 0 ]; then echo "build-standalone.sh::ERROR: Cannot mkdir build directory"; exit 1; fi
+    cd build
+    if [ $? -ne 0 ]; then echo "build-standalone.sh::ERROR: Build directory does not exist"; exit 1; fi
+    cmake ../
+    if [ $? -ne 0 ]; then echo "build-standalone.sh::ERROR: cmake failed"; exit 1; fi
+    make -j;
+    if [ $? -ne 0 ]; then echo "build-standalone.sh::ERROR: Build failed"; exit 1; fi
+fi
+
+exit 0

src/native/libs/System.Globalization.Native/config-standalone.h

@@ -0,0 +1,8 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+//
+
+#pragma once
+
+#define HAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS 1
+#define HAVE_SET_MAX_VARIABLE 1

src/native/libs/System.Globalization.Native/pal_icushim.c

@@ -481,6 +481,10 @@ int32_t GlobalizationNative_LoadICU()
     FOR_ALL_ICU_FUNCTIONS
     ValidateICUDataCanLoad();
 
+#if defined(USE_ICUSHIM_STATIC_BUILD)
+    InitWithStaticLibICUFunctions();
+#endif
+
     InitializeVariableMaxAndTopPointers(symbolVersion);
     InitializeUColClonePointers(symbolVersion);
 

src/native/libs/System.Globalization.Native/pal_icushim_internal.h

@@ -15,7 +15,9 @@
 #include "pal_icushim_internal_android.h"
 #else
 
+#if !defined(STATIC_SHIM_COMPILE)
 #define U_DISABLE_RENAMING 1
+#endif
 
 // All ICU headers need to be included here so that all function prototypes are
 // available before the function pointers are declared below.

src/native/libs/System.Globalization.Native/pal_icushim_static.c

@@ -217,12 +217,17 @@ const char* GlobalizationNative_GetICUDTName(const char* culture)
 
 int32_t GlobalizationNative_LoadICU(void)
 {
+#if !defined(STATIC_SHIM_COMPILE)
+// Static NativeAOT compilation does not have
+// GlobalizationNative_LoadICUData() as entrypoint
     if (!isDataSet)
     {
         // don't try to locate icudt.dat automatically if mono_wasm_load_icu_data wasn't called
         // and fallback to invariant mode
         return 0;
     }
+#endif
+
     UErrorCode status = 0;
     UVersionInfo version;
     // Request the CLDR version to perform basic ICU initialization and find out