支持鸿蒙，以及鸿蒙的编译脚本

Author: CeSun

build-openharmony-arm64.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+sudo docker run --rm \
+    -v ./:/runtime \
+    -w /runtime \
+    -e ROOTFS_DIR="/crossrootfs/arm64" \
+    mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64-musl \
+    bash -c "./build.sh --subset clr.aot+libs --configuration Release -arch arm64 --cross \
+    && mkdir -p ./artifacts/openharmony/arm64/sdk/ \
+    && mkdir -p ./artifacts/openharmony/arm64/framework/ \
+    && cp -p ./artifacts/bin/coreclr/linux.arm64.Release/aotsdk/* ./artifacts/openharmony/arm64/sdk/ \
+    && cp -p ./artifacts/bin/runtime/net9.0-linux-Release-arm64/*.a ./artifacts/openharmony/arm64/framework/ \
+    && cp -p ./artifacts/bin/runtime/net9.0-linux-Release-arm64/*.dbg ./artifacts/openharmony/arm64/framework/"

build-openharmony-x64.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+sudo docker run --rm \
+    -v ./:/runtime \
+    -w /runtime \
+    -e ROOTFS_DIR="/crossrootfs/x64" \
+    mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64-musl \
+    bash -c "./build.sh --subset clr.aot+libs --configuration Release -arch x64 --cross \
+    && mkdir -p ./artifacts/openharmony/x64/sdk/ \
+    && mkdir -p ./artifacts/openharmony/x64/framework/ \
+    && cp -p ./artifacts/bin/coreclr/linux.x64.Release/aotsdk/* ./artifacts/openharmony/x64/sdk/ \
+    && cp -p ./artifacts/bin/runtime/net9.0-linux-Release-x64/*.a ./artifacts/openharmony/x64/framework/ \
+    && cp -p ./artifacts/bin/runtime/net9.0-linux-Release-x64/*.dbg ./artifacts/openharmony/x64/framework/"

eng/native/configurecompiler.cmake

@@ -722,6 +722,8 @@ if(CLR_CMAKE_TARGET_UNIX)
     add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_LINUX>)
     if(CLR_CMAKE_TARGET_LINUX_MUSL)
         add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_LINUX_MUSL>)
+        # 为OpenHarmony平台做的临时修改
+        add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_OPENHARMONY>)
     endif()
   elseif(CLR_CMAKE_TARGET_NETBSD)
     add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_NETBSD>)

src/coreclr/gc/gcpriv.h

@@ -144,7 +144,7 @@ inline void FATAL_GC_ERROR()
 // For SunOS or illumos this is temporary, until we can add MAP_PRIVATE
 // to the mmap() calls in unix/gcenv.unix.cpp  More details here:
 //    https://github.com/dotnet/runtime/issues/104211
-#if defined (HOST_64BIT) && !defined (BUILD_AS_STANDALONE) && !defined(__APPLE__) && !defined(__sun)
+#if defined (HOST_64BIT) && !defined (BUILD_AS_STANDALONE) && !defined(__APPLE__) && !defined(__sun) && !defined(TARGET_OPENHARMONY)
 #define USE_REGIONS
 #endif //HOST_64BIT && BUILD_AS_STANDALONE && !__APPLE__
 

src/coreclr/gc/unix/numasupport.cpp

@@ -18,7 +18,7 @@ int g_highestNumaNode = 0;
 // Is numa available
 bool g_numaAvailable = false;
 
-#ifdef TARGET_LINUX
+#if defined(TARGET_LINUX) && !defined(TARGET_OPENHARMONY)
 static int GetNodeNum(const char* path, bool firstOnly)
 {
     DIR *dir;
@@ -53,7 +53,8 @@ static int GetNodeNum(const char* path, bool firstOnly)
 
 void NUMASupportInitialize()
 {
-#ifdef TARGET_LINUX
+#if defined(TARGET_LINUX) && !defined(TARGET_OPENHARMONY)
+111
     if (syscall(__NR_get_mempolicy, NULL, NULL, 0, 0, 0) < 0 && errno == ENOSYS)
         return;
 
@@ -69,7 +70,7 @@ void NUMASupportInitialize()
 
 int GetNumaNodeNumByCpu(int cpu)
 {
-#ifdef TARGET_LINUX
+#if defined(TARGET_LINUX) && !defined(TARGET_OPENHARMONY)
     char path[64];
     if (snprintf(path, sizeof(path), "/sys/devices/system/cpu/cpu%d", cpu) < 0)
         return -1;
@@ -82,7 +83,7 @@ int GetNumaNodeNumByCpu(int cpu)
 
 long BindMemoryPolicy(void* start, unsigned long len, const unsigned long* nodemask, unsigned long maxnode)
 {
-#ifdef TARGET_LINUX
+#if defined(TARGET_LINUX) && !defined(TARGET_OPENHARMONY)
     return syscall(__NR_mbind, (long)start, len, 1, (long)nodemask, maxnode, 0);
 #else
     return -1;

src/coreclr/gc/vxsort/isa_detection.cpp

@@ -84,6 +84,9 @@ SupportedISA DetermineSupportedISA()
 
 SupportedISA DetermineSupportedISA()
 {
+#ifdef TARGET_OPENHARMONY
+    return SupportedISA::None;
+#else
     __builtin_cpu_init();
     if (__builtin_cpu_supports("avx2"))
     {
@@ -96,6 +99,7 @@ SupportedISA DetermineSupportedISA()
     {
         return SupportedISA::None;
     }
+#endif
 }
 
 #endif // defined(TARGET_UNIX)

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

@@ -505,6 +505,9 @@ int32_t GlobalizationNative_LoadICU(void)
 
 #if defined(ANDROID_FORCE_ICU_DATA_DIR)
     setenv ("ICU_DATA", "/system/usr/icu/", 0);
+#endif
+#ifdef TARGET_OPENHARMONY
+    setenv ("ICU_DATA", "/system/usr/ohos_icu", 0);
 #endif
     FOR_ALL_ICU_FUNCTIONS
     ValidateICUDataCanLoad();