address review feedback

Signed-off-by: Joel Dice <[email protected]>

Author: dicej

eng/native/gen-buildsys.sh

@@ -59,7 +59,7 @@ for i in "${@:6}"; do
     esac
 done
 
-cmake_extra_defines=()
+cmake_extra_defines=
 if [[ "$CROSSCOMPILE" == "1" ]]; then
     platform="$(uname -s | tr '[:upper:]' '[:lower:]')"
     # OSX doesn't use rootfs
@@ -71,17 +71,17 @@ if [[ "$CROSSCOMPILE" == "1" ]]; then
     TARGET_BUILD_ARCH="$host_arch"
     export TARGET_BUILD_ARCH
 
-    cmake_extra_defines+=("-C" "$scriptroot/tryrun.cmake")
+    cmake_extra_defines="$cmake_extra_defines -C $scriptroot/tryrun.cmake"
 
     if [[ "$platform" == "darwin" ]]; then
-        cmake_extra_defines+=("-DCMAKE_SYSTEM_NAME=Darwin")
+        cmake_extra_defines="$cmake_extra_defines -DCMAKE_SYSTEM_NAME=Darwin"
     else
-        cmake_extra_defines+=("-DCMAKE_TOOLCHAIN_FILE=$scriptroot/../common/cross/toolchain.cmake")
+        cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$scriptroot/../common/cross/toolchain.cmake"
     fi
 fi
 
 if [[ "$host_arch" == "armel" ]]; then
-    cmake_extra_defines+=("-DARM_SOFTFP=1")
+    cmake_extra_defines="$cmake_extra_defines -DARM_SOFTFP=1"
 fi
 
 if ! cmake_command=$(command -v cmake); then
@@ -93,6 +93,7 @@ if [[ "$scan_build" == "ON" && -n "$SCAN_BUILD_COMMAND" ]]; then
     cmake_command="$SCAN_BUILD_COMMAND $cmake_command"
 fi
 
+cmake_extra_defines_wasm=()
 if [[ "$host_arch" == "wasm" ]]; then
     if [[ "$target_os" == "browser" ]]; then
         cmake_command="emcmake $cmake_command"
@@ -102,7 +103,7 @@ if [[ "$host_arch" == "wasm" ]]; then
             exit 1
         fi
 
-        cmake_extra_defines+=("-DCLR_CMAKE_TARGET_OS=wasi" "-DCLR_CMAKE_TARGET_ARCH=wasm" "-DWASI_SDK_PREFIX=$WASI_SDK_PATH" "-DCMAKE_TOOLCHAIN_FILE=$WASI_SDK_PATH/share/cmake/wasi-sdk.cmake" "-DCMAKE_CROSSCOMPILING_EMULATOR=node --experimental-wasm-bigint --experimental-wasi-unstable-preview1")
+        cmake_extra_defines_wasm=("-DCLR_CMAKE_TARGET_OS=wasi" "-DCLR_CMAKE_TARGET_ARCH=wasm" "-DWASI_SDK_PREFIX=$WASI_SDK_PATH" "-DCMAKE_TOOLCHAIN_FILE=$WASI_SDK_PATH/share/cmake/wasi-sdk.cmake" "-DCMAKE_CROSSCOMPILING_EMULATOR=node --experimental-wasm-bigint --experimental-wasi-unstable-preview1")
     else
         echo "target_os was not specified"
         exit 1
@@ -114,7 +115,8 @@ $cmake_command \
   -G "$generator" \
   "-DCMAKE_BUILD_TYPE=$buildtype" \
   "-DCMAKE_INSTALL_PREFIX=$__CMakeBinDir" \
-  "${cmake_extra_defines[@]}" \
+  $cmake_extra_defines \
+  "${cmake_extra_defines_wasm[@]}" \
   $__UnprocessedCMakeArgs \
   -S "$1" \
   -B "$2"

src/coreclr/jit/llvmlssa.cpp

@@ -1636,8 +1636,10 @@ class ShadowStackAllocator
         template <typename... TArgs>
         void PrintFormatted(char** pBuffer, const char* format, TArgs... args)
         {
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wformat-security"
+#endif // __clang__
             if (pBuffer == nullptr)
             {
                 printf(format, args...);
@@ -1646,7 +1648,9 @@ class ShadowStackAllocator
             {
                 *pBuffer += sprintf(*pBuffer, format, args...);
             }
+#ifdef __clang__
 #pragma clang diagnostic pop            
+#endif // __clang__
         }
 
         void PrintAction(const AllocationAction& action, char** pBuffer = nullptr)

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

@@ -391,6 +391,8 @@ The .NET Foundation licenses this file to you under the MIT license.
            Condition="'$(EMSDK)' == '' and '$(_targetOS)' == 'browser'" />
     <Error Text="Wasi SDK not found, not compiling to WebAssembly. To enable WebAssembly compilation, install Wasi SDK and ensure the WASI_SDK_PATH environment variable points to the directory containing share/wasi-sysroot"
            Condition="'$(WASI_SDK_PATH)' == '' and '$(_targetOS)' == 'wasi'" />
+    <Warning Text="The WASI SDK version is too low. Please use WASI SDK 22 or newer with a 64 bit Clang."
+             Condition="!Exists('$(WASI_SDK_PATH)/VERSION')" />
   </Target>
 
   <Target Name="CompileWasmObjects"