Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

external/corert/buildscripts/build-managed.sh

@@ -31,7 +31,13 @@ build_managed_corert()
         ToolchainMilestone=testing
     fi
 
-    $__ProjectRoot/Tools/msbuild.sh "$__buildproj" /m /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Build /p:RepoPath=$__ProjectRoot /p:RepoLocalBuild="true" /p:RelativeProductBinDir=$__RelativeProductBinDir /p:CleanedTheBuild=$__CleanBuild /p:NuPkgRid=$__NugetRuntimeId /p:TestNugetRuntimeId=$__NugetRuntimeId /p:OSGroup=$__BuildOS /p:Configuration=$__BuildType /p:Platform=$__BuildArch /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) /p:ToolchainMilestone=${ToolchainMilestone} $__UnprocessedBuildArgs $__ExtraMsBuildArgs
+    __buildarch="$__BuildArch"
+    if [ "$__buildarch" = "armel" ]; then
+        __buildarch=arm
+        __ExtraMsBuildArgs="$__ExtraMsBuildArgs /p:BinDirPlatform=armel"
+    fi
+
+    $__ProjectRoot/Tools/msbuild.sh "$__buildproj" /m /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Build /p:RepoPath=$__ProjectRoot /p:RepoLocalBuild="true" /p:RelativeProductBinDir=$__RelativeProductBinDir /p:CleanedTheBuild=$__CleanBuild /p:NuPkgRid=$__NugetRuntimeId /p:TestNugetRuntimeId=$__NugetRuntimeId /p:OSGroup=$__BuildOS /p:Configuration=$__BuildType /p:Platform=$__buildarch /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) /p:ToolchainMilestone=${ToolchainMilestone} $__UnprocessedBuildArgs $__ExtraMsBuildArgs
     export BUILDERRORLEVEL=$?
 
     echo
@@ -56,4 +62,4 @@ if $__buildmanaged; then
     build_managed_corert
 
     # Build complete
-fi
+fi

external/corert/buildscripts/build-native.sh

@@ -76,9 +76,45 @@ build_native_corert()
     popd
 }
 
+initHostDistroRid()
+{
+    if [ "$__HostOS" == "Linux" ]; then
+        if [ ! -e /etc/os-release ]; then
+            echo "WARNING: Can not determine runtime id for current distro."
+            __HostDistroRid=""
+        else
+            source /etc/os-release
+            __HostDistroRid="$ID.$VERSION_ID-$__HostArch"
+        fi
+    fi
+}
+
+initTargetDistroRid()
+{
+    if [ $__CrossBuild == 1 ]; then
+        if [ "$__BuildOS" == "Linux" ]; then
+            if [ ! -e $ROOTFS_DIR/etc/os-release ]; then
+                echo "WARNING: Can not determine runtime id for current distro."
+                export __DistroRid=""
+            else
+                source $ROOTFS_DIR/etc/os-release
+                export __DistroRid="$ID.$VERSION_ID-$__BuildArch"
+            fi
+        fi
+    else
+        export __DistroRid="$__HostDistroRid"
+    fi
+}
+
 
 if $__buildnative; then
 
+    # init the host distro name
+    initHostDistroRid
+
+    # init the target distro name
+    initTargetDistroRid
+
     # Check prereqs.
 
     check_native_prereqs

external/corert/buildscripts/build-tests.sh

@@ -2,14 +2,18 @@
 
 scriptRoot="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
+if [ "$__SkipTests" == "true" ]; then
+    exit 0
+fi
+
 if [ "$BUILDVARS_DONE" != 1 ]; then
     . $scriptRoot/buildvars-setup.sh $*
 fi
 
 pushd ${__ProjectRoot}/tests
-source ${__ProjectRoot}/tests/runtest.sh $__BuildOS $__BuildArch $__BuildType -dotnetclipath $__dotnetclipath
+source ${__ProjectRoot}/tests/runtest.sh $__BuildOS $__BuildArch $__BuildType -cross $__CrossBuild -dotnetclipath $__dotnetclipath
 TESTERRORLEVEL=$?
 popd
 if [ $TESTERRORLEVEL != 0 ]; then
     exit $TESTERRORLEVEL
-fi
+fi

external/corert/buildscripts/buildvars-setup.sh

@@ -6,14 +6,14 @@ usage()
     echo "managed - optional argument to build the managed code"
     echo "native - optional argument to build the native code"
     echo "The following arguments affect native builds only:"
-    echo "BuildArch can be: x64, x86, arm, arm64"
+    echo "BuildArch can be: x64, x86, arm, arm64, armel"
     echo "BuildType can be: Debug, Release"
     echo "clean - optional argument to force a clean build."
     echo "verbose - optional argument to enable verbose build output."
     echo "clangx.y - optional argument to build using clang version x.y."
     echo "cross - optional argument to signify cross compilation,"
     echo "      - will use ROOTFS_DIR environment variable if set."
-
+    echo "skiptests - optional argument to skip running tests after building."
     exit 1
 }
 
@@ -178,6 +178,11 @@ while [ "$1" != "" ]; do
         arm64)
             export __BuildArch=arm64
             ;;
+        armel)
+            export __BuildArch=armel
+            export __ClangMajorVersion=3
+            export __ClangMinorVersion=5
+            ;;
         debug)
             export __BuildType=Debug
             ;;
@@ -217,6 +222,9 @@ while [ "$1" != "" ]; do
             shift
             export __ExtraMsBuildArgs="$__ExtraMsBuildArgs /p:OfficialBuildId=$1"
             ;;
+        skiptests)
+            export __SkipTests=true
+            ;;
         *)
           export __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"
     esac
@@ -264,4 +272,4 @@ fi
 setup_dirs
 
 export BUILDERRORLEVEL=0
-export BUILDVARS_DONE=1
+export BUILDVARS_DONE=1