summaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorHyung-Kyu Choi <hqueue@users.noreply.github.com>2017-01-05 09:29:49 (GMT)
committerJan Vorlicek <janvorli@microsoft.com>2017-01-05 09:29:49 (GMT)
commit165fa5cebf0b937f74855584ca5b658e7e83c41b (patch)
tree015f5d3d5cb5a9e163450d8981ef87fa014995a0 /cross
parentd2daeccabf5c64c67a080928fc48a4d18d0464f9 (diff)
downloadcoreclr-165fa5cebf0b937f74855584ca5b658e7e83c41b.zip
coreclr-165fa5cebf0b937f74855584ca5b658e7e83c41b.tar.gz
coreclr-165fa5cebf0b937f74855584ca5b658e7e83c41b.tar.bz2
Use armel instead of arm-softfp (#8771)
* Use armel instead of arm-softfp for CoreCLR - Update scripts for rootfs, build, build system generation and CI - Update managed build project - Rename rootfs directory - Fix bug in rootfs script related to lldb package lldb package only usable lldb-3.5-dev for jessie/arm-softfp We cannot get lldb-3.6-dev or lldb-3.8-dev from jessie/arm-softfp repository Signed-off-by: Hyung-Kyu Choi <hk0110.choi@samsung.com> Singed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com> * Update ARM32 CI script We don't need a patch anymore, because we fixed cmake file. Signed-off-by: Hyung-Kyu Choi <hk0110.choi@samsung.com>
Diffstat (limited to 'cross')
-rw-r--r--cross/arm-softfp/sources.list.jessie3
-rw-r--r--cross/armel/sources.list.jessie3
-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-xcross/build-rootfs.sh12
5 files changed, 24 insertions, 9 deletions
diff --git a/cross/arm-softfp/sources.list.jessie b/cross/arm-softfp/sources.list.jessie
deleted file mode 100644
index 4d142ac..0000000
--- 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 0000000..3d9c305
--- /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 407ab53..e1e7282 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 26a30e5..26a30e5 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 cfa1a66..529cc50 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"