dotnet · Sapana-Khemkar · Oct 20, 2021 · Oct 20, 2021 · Oct 20, 2021 · Oct 20, 2021
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -34,6 +34,7 @@
     <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(_hostArch)' == 'arm64'">arm64</TargetArchitecture>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(_hostArch)' == 'loongarch64'">loongarch64</TargetArchitecture>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(_hostArch)' == 's390x'">s390x</TargetArchitecture>
+    <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(_hostArch)' == 'ppc64le'">ppc64le</TargetArchitecture>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(TargetOS)' == 'Browser'">wasm</TargetArchitecture>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(TargetsMobile)' == 'true'">x64</TargetArchitecture>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>

diff --git a/eng/Subsets.props b/eng/Subsets.props
@@ -27,7 +27,7 @@
        flavor is used to decide when to build the hosts and installers. -->
   <PropertyGroup>
     <PrimaryRuntimeFlavor>CoreCLR</PrimaryRuntimeFlavor>
-    <PrimaryRuntimeFlavor Condition="'$(TargetArchitecture)' == 's390x' or '$(TargetArchitecture)' == 'armv6'">Mono</PrimaryRuntimeFlavor>
+    <PrimaryRuntimeFlavor Condition="'$(TargetArchitecture)' == 's390x' or '$(TargetArchitecture)' == 'ppc64le' or'$(TargetArchitecture)' == 'armv6'">Mono</PrimaryRuntimeFlavor>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/eng/build.sh b/eng/build.sh
@@ -17,7 +17,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 usage()
 {
   echo "Common settings:"
-  echo "  --arch (-a)                     Target platform: x86, x64, arm, armv6, armel, arm64, loongarch64, s390x or wasm."
+  echo "  --arch (-a)                     Target platform: x86, x64, arm, armv6, armel, arm64, loongarch64, s390x, ppc64le or wasm."
   echo "                                  [Default: Your machine's architecture.]"
   echo "  --binaryLog (-bl)               Output binary log."
   echo "  --cross                         Optional argument to signify cross compilation."
@@ -206,12 +206,12 @@ while [[ $# > 0 ]]; do
       fi
       passedArch="$(echo "$2" | tr "[:upper:]" "[:lower:]")"
       case "$passedArch" in
-        x64|x86|arm|armv6|armel|arm64|loongarch64|s390x|wasm)
+        x64|x86|arm|armv6|armel|arm64|loongarch64|s390x|wasm|ppc64le)
           arch=$passedArch
           ;;
         *)
           echo "Unsupported target architecture '$2'."
-          echo "The allowed values are x86, x64, arm, armv6, armel, arm64, loongarch64, s390x, and wasm."
+          echo "The allowed values are x86, x64, arm, armv6, armel, arm64, loongarch64, s390x, ppc64le and wasm."
           exit 1
           ;;
       esac

diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
@@ -138,6 +138,15 @@ while :; do
             __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
             unset __LLDB_Package
             ;;
+	ppc64le)
+            __BuildArch=ppc64le
+            __UbuntuArch=ppc64el
+            __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
+            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
+            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
+            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
+            unset __LLDB_Package
+            ;;
         x86)
             __BuildArch=x86
             __UbuntuArch=i386

diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
@@ -142,3 +142,4 @@ fi
 SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
 
 export CC CXX LDFLAGS SCAN_BUILD_COMMAND
+
diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh
@@ -197,7 +197,7 @@ usage()
     echo ""
     echo "Common Options:"
     echo ""
-    echo "BuildArch can be: -arm, -armv6, -armel, -arm64, -loongarch64, -s390x, x64, x86, -wasm"
+    echo "BuildArch can be: -arm, -armv6, -armel, -arm64, -loongarch64, -s390x, -ppc64le, x64, x86, -wasm"
     echo "BuildType can be: -debug, -checked, -release"
     echo "-os: target OS (defaults to running OS)"
     echo "-bindir: output directory (defaults to $__ProjectRoot/artifacts)"
@@ -389,6 +389,10 @@ while :; do
             __BuildArch=s390x
             ;;
 
+		ppc64le|-ppc64le)
+            __BuildArch=ppc64le
+            ;;
+
         wasm|-wasm)
             __BuildArch=wasm
             ;;

diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake
@@ -236,6 +236,9 @@ elseif (CLR_CMAKE_HOST_ARCH_WASM)
 elseif (CLR_CMAKE_HOST_ARCH_MIPS64)
   set(ARCH_HOST_NAME mips64)
   add_definitions(-DHOST_MIPS64 -DHOST_64BIT=1)
+elseif (CLR_CMAKE_HOST_ARCH_POWERPC64)
+  set(ARCH_HOST_NAME ppc64le)
+  add_definitions(-DHOST_POWERPC64 -DHOST_64BIT)  
 else ()
   clr_unknown_arch()
 endif ()
@@ -256,6 +259,8 @@ if (CLR_CMAKE_HOST_UNIX)
       message("Detected Linux i686")
     elseif(CLR_CMAKE_HOST_UNIX_S390X)
       message("Detected Linux s390x")
+    elseif(CLR_CMAKE_HOST_UNIX_POWERPC64)
+      message("Detected Linux ppc64le")
     else()
       clr_unknown_arch()
     endif()
@@ -332,6 +337,11 @@ elseif (CLR_CMAKE_TARGET_ARCH_S390X)
     set(ARCH_SOURCES_DIR s390x)
     add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_ARCH>>>:TARGET_S390X>)
     add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_ARCH>>>:TARGET_64BIT>)
+elseif (CLR_CMAKE_TARGET_ARCH_POWERPC64)
+    set(ARCH_TARGET_NAME ppc64le)
+    set(ARCH_SOURCES_DIR ppc64le)
+    add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_ARCH>>>:TARGET_POWERPC64>)
+    add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_ARCH>>>:TARGET_64BIT>)
 elseif (CLR_CMAKE_TARGET_ARCH_WASM)
     set(ARCH_TARGET_NAME wasm)
     set(ARCH_SOURCES_DIR wasm)

diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake
@@ -51,6 +51,8 @@ if(CLR_CMAKE_HOST_OS STREQUAL Linux)
             set(CLR_CMAKE_HOST_UNIX_X86 1)
         elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL s390x)
             set(CLR_CMAKE_HOST_UNIX_S390X 1)
+        elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL ppc64le)
+	        set(CLR_CMAKE_HOST_UNIX_POWERPC64 1)
         elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL mips64)
             set(CLR_CMAKE_HOST_UNIX_MIPS64 1)
         else()
@@ -250,6 +252,9 @@ elseif(CLR_CMAKE_HOST_UNIX_X86)
 elseif(CLR_CMAKE_HOST_UNIX_S390X)
     set(CLR_CMAKE_HOST_ARCH_S390X 1)
     set(CLR_CMAKE_HOST_ARCH "s390x")
+elseif(CLR_CMAKE_HOST_UNIX_POWERPC64)
+    set(CLR_CMAKE_HOST_ARCH_POWERPC64 1)
+    set(CLR_CMAKE_HOST_ARCH "ppc64le")
 elseif(CLR_CMAKE_HOST_BROWSER)
     set(CLR_CMAKE_HOST_ARCH_WASM 1)
     set(CLR_CMAKE_HOST_ARCH "wasm")
@@ -303,6 +308,8 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
     set(ARM_SOFTFP 1)
   elseif(CLR_CMAKE_TARGET_ARCH STREQUAL s390x)
     set(CLR_CMAKE_TARGET_ARCH_S390X 1)
+  elseif(CLR_CMAKE_TARGET_ARCH STREQUAL ppc64le)
+    set(CLR_CMAKE_TARGET_ARCH_POWERPC64 1)
   elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
     set(CLR_CMAKE_TARGET_ARCH_WASM 1)
   elseif(CLR_CMAKE_TARGET_ARCH STREQUAL mips64)
@@ -413,6 +420,8 @@ if(CLR_CMAKE_TARGET_UNIX)
         set(CLR_CMAKE_TARGET_UNIX_X86 1)
     elseif(CLR_CMAKE_TARGET_ARCH STREQUAL s390x)
         set(CLR_CMAKE_TARGET_UNIX_S390X 1)
+    elseif(CLR_CMAKE_TARGET_ARCH STREQUAL ppc64le)
+	set(CLR_CMAKE_TARGET_UNIX_POWERPC64 1)
     elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
         set(CLR_CMAKE_TARGET_UNIX_WASM 1)
     elseif(CLR_CMAKE_TARGET_ARCH STREQUAL mips64)

diff --git a/eng/native/configuretools.cmake b/eng/native/configuretools.cmake
@@ -53,7 +53,7 @@ if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_BROWSER)
     if(CLR_CMAKE_TARGET_ANDROID)
       set(TOOLSET_PREFIX ${ANDROID_TOOLCHAIN_PREFIX})
     elseif(CMAKE_CROSSCOMPILING AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD AND
-        CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv8l|armv7l|armv6l|aarch64|arm|s390x)$")
+        CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv8l|armv7l|armv6l|aarch64|arm|s390x|ppc64le)$")
       set(TOOLSET_PREFIX "${TOOLCHAIN}-")
     else()
       set(TOOLSET_PREFIX "")

diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake
@@ -175,6 +175,10 @@ function(find_unwind_libs UnwindLibs)
       find_library(UNWIND_ARCH NAMES unwind-s390x)
     endif()
 
+    if(CLR_CMAKE_HOST_ARCH_POWERPC64)
+      find_library(UNWIND_ARCH NAMES unwind-ppc64le)
+    endif()
+
     if(NOT UNWIND_ARCH STREQUAL UNWIND_ARCH-NOTFOUND)
        set(UNWIND_LIBS ${UNWIND_ARCH})
     endif()

diff --git a/eng/native/init-os-and-arch.sh b/eng/native/init-os-and-arch.sh
@@ -65,6 +65,9 @@ case "$CPUName" in
     s390x)
         arch=s390x
 	;;
+    ppc64le)
+	arch=ppc64le
+	;;
 
     *)
         echo "Unknown CPU $CPUName detected, configuring as if for x64"

diff --git a/eng/native/tryrun.cmake b/eng/native/tryrun.cmake
@@ -68,7 +68,7 @@ if(DARWIN)
   else()
     message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm64 or x64 is supported for OSX cross build!")
   endif()
-elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|s390x|x86)$" OR FREEBSD OR ILLUMOS)
+elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|s390x|ppc64le|x86)$" OR FREEBSD OR ILLUMOS)
   set_cache_value(FILE_OPS_CHECK_FERROR_OF_PREVIOUS_CALL_EXITCODE 1)
   set_cache_value(GETPWUID_R_SETS_ERRNO_EXITCODE 0)
   set_cache_value(HAS_POSIX_SEMAPHORES_EXITCODE 0)
@@ -146,9 +146,9 @@ elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|s390x|x86)$
     set_cache_value(HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES_EXITCODE 0)
   endif()
 else()
-  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, loongarch64, s390x and x86 are supported!")
+  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, loongarch64, s390x, ppc64le and x86 are supported!")
 endif()
 
-if(TARGET_ARCH_NAME STREQUAL "x86" OR TARGET_ARCH_NAME STREQUAL "s390x" OR TARGET_ARCH_NAME STREQUAL "armv6" OR TARGET_ARCH_NAME STREQUAL "loongarch64")
+if(TARGET_ARCH_NAME STREQUAL "x86" OR TARGET_ARCH_NAME STREQUAL "s390x" OR TARGET_ARCH_NAME STREQUAL "armv6" OR TARGET_ARCH_NAME STREQUAL "loongarch64" OR TARGET_ARCH_NAME STREQUAL "ppc64le")
   set_cache_value(HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES_EXITCODE 0)
 endif()
diff --git a/src/coreclr/jit/CMakeLists.txt b/src/coreclr/jit/CMakeLists.txt
@@ -44,6 +44,9 @@ function(create_standalone_jit)
   elseif(TARGETDETAILS_ARCH STREQUAL "s390x")
     set(JIT_ARCH_SOURCES ${JIT_S390X_SOURCES})
     set(JIT_ARCH_HEADERS ${JIT_S390X_HEADERS})
+  elseif(TARGETDETAILS_ARCH STREQUAL "ppc64le")
+    set(JIT_ARCH_SOURCES ${JIT_POWERPC64_SOURCES})
+    set(JIT_ARCH_HEADERS ${JIT_POWERPC64_HEADERS})
   else()
     clr_unknown_arch()
   endif()
@@ -225,6 +228,10 @@ set( JIT_ARM64_SOURCES
   hwintrinsiccodegenarm64.cpp
 )
 
+
+set( JIT_POWERPC64_SOURCES
+  # Not supported as JIT target
+)
 set( JIT_ARMV6_SOURCES
   # Not supported as JIT target
 )
@@ -379,6 +386,10 @@ set ( JIT_S390X_HEADERS
   # Not supported as JIT target
 )
 
+set ( JIT_POWERPC64_HEADERS
+  # Not supported as JIT target
+)
+
 convert_to_absolute_path(JIT_SOURCES ${JIT_SOURCES})
 convert_to_absolute_path(JIT_HEADERS ${JIT_HEADERS})
 convert_to_absolute_path(JIT_RESOURCES ${JIT_RESOURCES})
@@ -416,6 +427,9 @@ elseif(CLR_CMAKE_TARGET_ARCH_ARM64)
 elseif(CLR_CMAKE_TARGET_ARCH_S390X)
   set(JIT_ARCH_SOURCES ${JIT_S390X_SOURCES})
   set(JIT_ARCH_HEADERS ${JIT_S390X_HEADERS})
+elseif(CLR_CMAKE_TARGET_ARCH_POWERPC64)
+  set(JIT_ARCH_SOURCES ${JIT_POWERPC64_SOURCES})
+  set(JIT_ARCH_HEADERS ${JIT_POWERPC64_HEADERS})
 else()
   clr_unknown_arch()
 endif()
@@ -567,13 +581,13 @@ if (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_UNIX)
 endif (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_UNIX)
 
 if (CLR_CMAKE_TARGET_UNIX)
-    if (NOT ARCH_TARGET_NAME STREQUAL s390x AND NOT ARCH_TARGET_NAME STREQUAL armv6)
+    if (NOT ARCH_TARGET_NAME STREQUAL s390x AND NOT ARCH_TARGET_NAME STREQUAL armv6 AND NOT ARCH_TARGET_NAME STREQUAL ppc64le)
       if(CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_ARM64)
         install_clr(TARGETS clrjit_universal_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME} DESTINATIONS . COMPONENT jit)
       else()
         install_clr(TARGETS clrjit_unix_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME} DESTINATIONS . COMPONENT jit)
       endif()
-    endif(NOT ARCH_TARGET_NAME STREQUAL s390x AND NOT ARCH_TARGET_NAME STREQUAL armv6)
+    endif(NOT ARCH_TARGET_NAME STREQUAL s390x AND NOT ARCH_TARGET_NAME STREQUAL armv6 AND NOT ARCH_TARGET_NAME STREQUAL ppc64le)
 endif()
 
 if (CLR_CMAKE_TARGET_WIN32 AND CLR_CMAKE_PGO_INSTRUMENT)

diff --git a/src/coreclr/pal/src/CMakeLists.txt b/src/coreclr/pal/src/CMakeLists.txt
@@ -56,6 +56,8 @@ elseif(CLR_CMAKE_HOST_ARCH_I386)
   set(PAL_ARCH_SOURCES_DIR i386)
 elseif(CLR_CMAKE_HOST_ARCH_S390X)
   set(PAL_ARCH_SOURCES_DIR s390x)
+elseif(CLR_CMAKE_HOST_ARCH_POWERPC64)
+  set(PAL_ARCH_SOURCES_DIR ppc64le)
 endif()
 
 if(CLR_CMAKE_USE_SYSTEM_LIBUNWIND)

diff --git a/src/coreclr/pal/src/misc/perfjitdump.cpp b/src/coreclr/pal/src/misc/perfjitdump.cpp
@@ -50,6 +50,8 @@ namespace
         ELF_MACHINE = EM_LOONGARCH,
 #elif defined(HOST_S390X)
         ELF_MACHINE = EM_S390,
+#elif defined(HOST_POWERPC)
+	ELF_MACHINE = EM_PPC64,
 #else
 #error ELF_MACHINE unsupported for target
 #endif

diff --git a/src/installer/pkg/projects/netcoreappRIDs.props b/src/installer/pkg/projects/netcoreappRIDs.props
@@ -55,5 +55,12 @@
     <UnofficialBuildRID Include="linux-musl-s390x">
       <Platform>s390x</Platform>
     </UnofficialBuildRID>
+    <UnofficialBuildRID Include="linux-ppc64le">
+      <Platform>ppc64le</Platform>
+    </UnofficialBuildRID>
+    <UnofficialBuildRID Include="linux-musl-ppc64le">
+      <Platform>ppc64le</Platform>
+    </UnofficialBuildRID>
+
   </ItemGroup>
 </Project>
diff --git a/src/installer/pkg/sfx/installers/osx_scripts/host/postinstall b/src/installer/pkg/sfx/installers/osx_scripts/host/postinstall
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -4009,6 +4009,16 @@
     "unix",
     "any",
     "base"
+  ],
+   "linux-musl-ppc64le": [
+    "linux-musl-ppc64le",
+    "linux-musl",
+    "linux-ppc64le",
+    "linux",
+    "unix-ppc64le",
+    "unix",
+    "any",
+    "base"
   ],
   "linux-musl-x64": [
     "linux-musl-x64",
@@ -4038,6 +4048,14 @@
     "any",
     "base"
   ],
+  "linux-ppc64le": [
+    "linux-ppc64le",
+    "linux",
+    "unix-ppc64le",
+    "unix",
+    "any",
+    "base"
+  ],
   "linux-x64": [
     "linux-x64",
     "linux",
@@ -8598,6 +8616,12 @@
     "any",
     "base"
   ],
+  "unix-ppc64le": [
+    "unix-ppc64le",
+    "unix",
+    "any",
+    "base"
+  ],
   "unix-x64": [
     "unix-x64",
     "unix",
@@ -9240,4 +9264,5 @@
     "any",
     "base"
   ]
-}
+}
+
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -1591,6 +1591,12 @@
         "linux-s390x"
       ]
     },
+    "linux-musl-ppc64le": {
+      "#import": [
+        "linux-musl",
+        "linux-ppc64le"
+      ]
+    },
     "linux-musl-x64": {
       "#import": [
         "linux-musl",
@@ -1609,6 +1615,12 @@
         "unix-s390x"
       ]
     },
+    "linux-ppc64le": {
+      "#import": [
+        "linux",
+        "unix-ppc64le"
+      ]
+    },
     "linux-x64": {
       "#import": [
         "linux",
@@ -3577,6 +3589,11 @@
         "unix"
       ]
     },
+    "unix-ppc64le": {
+      "#import": [
+        "unix"
+      ]
+    },
     "unix-x64": {
       "#import": [
         "unix"
@@ -3911,4 +3928,4 @@
       ]
     }
   }
-}
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -142,3 +142,4 @@ fi
		SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"

		export CC CXX LDFLAGS SCAN_BUILD_COMMAND