diff options
| -rwxr-xr-x | build.sh | 6 | ||||
| -rw-r--r-- | cross/arm-softfp/sources.list.jessie | 3 | ||||
| -rw-r--r-- | cross/armel/sources.list.jessie | 3 | ||||
| -rw-r--r-- | cross/armel/toolchain.cmake (renamed from cross/arm-softfp/toolchain.cmake) | 15 | ||||
| -rw-r--r-- | cross/armel/tryrun.cmake (renamed from cross/arm-softfp/tryrun.cmake) | 0 | ||||
| -rwxr-xr-x | cross/build-rootfs.sh | 12 | ||||
| -rw-r--r-- | src/mscorlib/System.Private.CoreLib.csproj | 4 | ||||
| -rw-r--r-- | src/mscorlib/facade/mscorlib.csproj | 4 | ||||
| -rwxr-xr-x | src/pal/tools/gen-buildsys-clang.sh | 2 | ||||
| -rwxr-xr-x | tests/scripts/arm32_ci_script.sh | 11 |
10 files changed, 35 insertions, 25 deletions
@@ -28,7 +28,7 @@ fi usage() { echo "Usage: $0 [BuildArch] [BuildType] [verbose] [coverage] [cross] [clangx.y] [ninja] [configureonly] [skipconfigure] [skipnative] [skipmscorlib] [skiptests] [cmakeargs] [bindir]" - echo "BuildArch can be: x64, x86, arm, arm-softfp, arm64" + echo "BuildArch can be: x64, x86, arm, armel, arm64" echo "BuildType can be: debug, checked, release" echo "coverage - optional argument to enable code coverage build (currently supported only for Linux and OSX)." echo "ninja - target ninja instead of GNU make" @@ -552,8 +552,8 @@ while :; do __BuildArch=arm ;; - arm-softfp) - __BuildArch=arm-softfp + armel) + __BuildArch=armel ;; arm64) diff --git a/cross/arm-softfp/sources.list.jessie b/cross/arm-softfp/sources.list.jessie deleted file mode 100644 index 4d142ac9b1..0000000000 --- a/cross/arm-softfp/sources.list.jessie +++ /dev/null @@ -1,3 +0,0 @@ -# Debian (sid) # UNSTABLE -deb http://ftp.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.debian.org/debian/ sid main contrib non-free diff --git a/cross/armel/sources.list.jessie b/cross/armel/sources.list.jessie new file mode 100644 index 0000000000..3d9c3059d8 --- /dev/null +++ b/cross/armel/sources.list.jessie @@ -0,0 +1,3 @@ +# Debian (jessie) # Stable +deb http://ftp.debian.org/debian/ jessie main contrib non-free +deb-src http://ftp.debian.org/debian/ jessie main contrib non-free diff --git a/cross/arm-softfp/toolchain.cmake b/cross/armel/toolchain.cmake index 407ab53849..e1e7282f09 100644 --- a/cross/arm-softfp/toolchain.cmake +++ b/cross/armel/toolchain.cmake @@ -20,10 +20,21 @@ add_compile_options(-mfpu=vfpv3) add_compile_options(--sysroot=${CROSS_ROOTFS}) set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -target ${TOOLCHAIN}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN}") set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}") +if("$ENV{__DistroRid}" STREQUAL "tizen.3.0.0-armel") + add_compile_options(-I$ENV{ROOTFS_DIR}/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/include/c++/) + add_compile_options(-I$ENV{ROOTFS_DIR}/usr/lib/gcc/armv7l-tizen-linux-gnueabi/4.9.2/include/c++/armv7l-tizen-linux-gnueabi) + add_compile_options(-Wno-deprecated-declarations) # compile-time option + add_compile_options(-D__extern_always_inline=inline) + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/4.9.2") + set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") +else() + set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") + set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") +endif() + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) diff --git a/cross/arm-softfp/tryrun.cmake b/cross/armel/tryrun.cmake index 26a30e5e40..26a30e5e40 100644 --- a/cross/arm-softfp/tryrun.cmake +++ b/cross/armel/tryrun.cmake diff --git a/cross/build-rootfs.sh b/cross/build-rootfs.sh index cfa1a66f4a..529cc50d1e 100755 --- a/cross/build-rootfs.sh +++ b/cross/build-rootfs.sh @@ -3,8 +3,8 @@ usage() { echo "Usage: $0 [BuildArch] [UbuntuCodeName] [lldbx.y]" - echo "BuildArch can be: arm(default), arm-softfp, arm64, x86" - echo "UbuntuCodeName - optional, Code name for Ubuntu, can be: trusty(default), vivid, wily, xenial. If BuildArch is arm-softfp, UbuntuCodeName is ignored." + echo "BuildArch can be: arm(default), armel, arm64, x86" + echo "UbuntuCodeName - optional, Code name for Ubuntu, can be: trusty(default), vivid, wily, xenial. If BuildArch is armel, UbuntuCodeName is ignored." echo "lldbx.y - optional, LLDB version, can be: lldb3.6(default), lldb3.8" exit 1 @@ -37,8 +37,8 @@ for i in "$@" __BuildArch=arm64 __UbuntuArch=arm64 ;; - arm-softfp) - __BuildArch=arm-softfp + armel) + __BuildArch=armel __UbuntuArch=armel __UbuntuRepo="http://ftp.debian.org/debian/" __UbuntuCodeName=jessie @@ -79,6 +79,10 @@ for i in "$@" esac done +if [ "$__BuildArch" == "armel" ]; then + __LLDB_Package="lldb-3.5-dev" +fi + __RootfsDir="$__CrossDir/rootfs/$__BuildArch" __UbuntuPackages="$__UbuntuPackagesBase $__LLDB_Package" diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj index 13a894a0ea..2d3d3fdb66 100644 --- a/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/mscorlib/System.Private.CoreLib.csproj @@ -11,13 +11,13 @@ <!-- Compilation options --> <PropertyGroup> - <AvailablePlatforms>amd64,x86,arm,arm-softfp,arm64</AvailablePlatforms> + <AvailablePlatforms>amd64,x86,arm,armel,arm64</AvailablePlatforms> <Configuration Condition=" '$(Configuration)' == '' ">$(BuildType)</Configuration> <Platform Condition=" '$(Platform)' == '' ">$(BuildArch)</Platform> <!-- The CLR properties use amd64 as their platform string, we want to keep in sync with those, so set Platform appropriately, though still use the 'x64' output path (see use of BuildArch below) --> <Platform Condition=" '$(Platform)' == 'x64' ">amd64</Platform> - <Platform Condition=" '$(Platform)' == 'arm-softfp' ">arm</Platform> + <Platform Condition=" '$(Platform)' == 'armel' ">arm</Platform> <ProjectGuid>{3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/src/mscorlib/facade/mscorlib.csproj b/src/mscorlib/facade/mscorlib.csproj index 7d0133af39..bf007603cf 100644 --- a/src/mscorlib/facade/mscorlib.csproj +++ b/src/mscorlib/facade/mscorlib.csproj @@ -19,13 +19,13 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> - <AvailablePlatforms>amd64,x86,arm,arm-softfp,arm64</AvailablePlatforms> + <AvailablePlatforms>amd64,x86,arm,armel,arm64</AvailablePlatforms> <Configuration Condition=" '$(Configuration)' == '' ">$(BuildType)</Configuration> <Platform Condition=" '$(Platform)' == '' ">$(BuildArch)</Platform> <!-- The CLR properties use amd64 as their platform string, we want to keep in sync with those, so set Platform appropriately, though still use the 'x64' output path (see use of BuildArch below) --> <Platform Condition=" '$(Platform)' == 'x64' ">amd64</Platform> - <Platform Condition=" '$(Platform)' == 'arm-softfp' ">arm</Platform> + <Platform Condition=" '$(Platform)' == 'armel' ">arm</Platform> <!-- We want to exclude the transitive closure of the packages pulled in via project.json as that introduces ambiguity --> <OmitTransitiveCompileReferences>true</OmitTransitiveCompileReferences> diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index 4054266f0b..a25e5a0645 100755 --- a/src/pal/tools/gen-buildsys-clang.sh +++ b/src/pal/tools/gen-buildsys-clang.sh @@ -141,7 +141,7 @@ else cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$CONFIG_DIR/toolchain.cmake" fi fi -if [ "$build_arch" == "arm-softfp" ]; then +if [ "$build_arch" == "armel" ]; then cmake_extra_defines="$cmake_extra_defines -DARM_SOFTFP=1" fi diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh index 85ee4d21f5..6745e63145 100755 --- a/tests/scripts/arm32_ci_script.sh +++ b/tests/scripts/arm32_ci_script.sh @@ -17,8 +17,8 @@ function usage { echo ' --mountPath=/opt/linux-arm-emulator-root' echo ' --buildConfig=Release' echo ' --testRootDir=~/Downloads/Windows_NT.x64.Release' - echo ' --mscorlibDir=~/clr/bin/Product/Linux.arm-softfp.Release' - echo ' --coreFxNativeBinDir=~/cfx/bin/Linux.arm-softfp.Release' + echo ' --mscorlibDir=~/clr/bin/Product/Linux.armel.Release' + echo ' --coreFxNativeBinDir=~/cfx/bin/Linux.armel.Release' echo ' --coreFxBinDir="~/cfx/bin/Linux.AnyCPU.Release;~/cfx/bin/Unix.AnyCPU.Release;~/cfx/bin/AnyOS.AnyCPU.Release"' echo ' --testDirFile=~/clr/tests/testsRunningInsideARM.txt' echo '' @@ -213,10 +213,6 @@ function cross_build_coreclr { (set +x; echo 'Exporting LINUX_ARM_* environment variable') source "$__ARMEmulRootfs"/dotnet/setenv/setenv_incpath.sh "$__ARMEmulRootfs" - #Apply the changes needed to build for the emulator rootfs - (set +x; echo 'Applying cross build patch to suit Linux ARM emulator rootfs') - git am < "$__ARMEmulRootfs"/dotnet/setenv/coreclr_cross.patch - #Apply release optimization patch if needed if [[ "$__buildConfig" == "Release" ]]; then (set +x; echo 'Applying release optimization patch to build in Release mode') @@ -228,7 +224,6 @@ function cross_build_coreclr { #Reset the code to the upstream version (set +x; echo 'Rewinding HEAD to master code') - git reset --hard HEAD^ if [[ "$__buildConfig" == "Release" ]]; then git reset --hard HEAD^ fi @@ -316,7 +311,7 @@ __coreFxBinDir= __testDirFile= __verboseFlag= __buildOS="Linux" -__buildArch="arm-softfp" +__buildArch="armel" __buildDirName= __initialGitHead=`git rev-parse --verify HEAD` |