summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongkyun Son <dongkyun.s@samsung.com>2017-10-26 08:16:15 (GMT)
committerDongkyun Son <dongkyun.s@samsung.com>2017-10-26 09:15:34 (GMT)
commit35a7407f70edfbe659eb5877ab0971fa063d0e36 (patch)
tree5554eaae7befb9315dfa0446341ed4551b711fad
parent545c80cb6bc36d0867a588de3b67fbe9aa707138 (diff)
downloadcoreclr-sandbox/dkson95/hardfp_rebase.zip
coreclr-sandbox/dkson95/hardfp_rebase.tar.gz
coreclr-sandbox/dkson95/hardfp_rebase.tar.bz2
Add armv7hl architecture supportsandbox/dkson95/hardfp_rebase
- Use python-accel-armv7hl-*, clang-accel-armv7hl-* to accelerate build. - Add hard-float option support('-mfloat-abi=hard') Change-Id: I0701ca9f9648ab85e7f0a6730e23caf7fdbd860e Signed-off-by: Jaehun Jeong <jh4u.jeong@samsung.com> Signed-off-by: Dongkyun Son <dongkyun.s@samsung.com>
-rw-r--r--packaging/coreclr.spec12
-rw-r--r--packaging/tizen-toolchain-support.patch52
2 files changed, 56 insertions, 8 deletions
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 18de9a8..d5690be 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -79,11 +79,16 @@ Requires: libunwind
Requires: libuuid
# Accelerate python, clang
-%ifarch %{arm}
+%ifarch armv7l
BuildRequires: python-accel-armv7l-cross-arm
BuildRequires: clang-accel-armv7l-cross-arm
%endif
+%ifarch armv7hl
+BuildRequires: python-accel-armv7hl-cross-arm
+BuildRequires: clang-accel-armv7hl-cross-arm
+%endif
+
%ifarch aarch64
BuildRequires: python-accel-aarch64-cross-aarch64
BuildRequires: clang-accel-aarch64-cross-aarch64
@@ -242,7 +247,12 @@ export CFLAGS=$(echo $CFLAGS | sed -e 's/--target=i686/--target=i586/')
export CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/--target=i686/--target=i586/')
%else
%ifarch %{arm}
+%ifarch armv7l
%define _barch armel
+%endif
+%ifarch armv7hl
+%define _barch arm
+%endif
export CLANG_NO_LIBDIR_SUFFIX=1
%else
diff --git a/packaging/tizen-toolchain-support.patch b/packaging/tizen-toolchain-support.patch
index 531bf78..bcb1658 100644
--- a/packaging/tizen-toolchain-support.patch
+++ b/packaging/tizen-toolchain-support.patch
@@ -1,27 +1,65 @@
-From 8f291c286db9813e6c797030707b41872b9616a6 Mon Sep 17 00:00:00 2001
+From 7e86543b7db46e7e6432f858db246f562f563208 Mon Sep 17 00:00:00 2001
From: Jiyoung Yun <jy910.yun@samsung.com>
Date: Fri, 14 Jul 2017 11:58:39 +0900
Subject: [PATCH] tizen toolchain support
Change-Id: Idb48d26dc1dfff8a6dc758b90bc94cb48963f8a2
---
- compileoptions.cmake | 2 +-
- cross/armel/toolchain.cmake | 9 +--------
- 2 files changed, 2 insertions(+), 9 deletions(-)
+ compileoptions.cmake | 5 +++--
+ cross/arm/toolchain.cmake | 11 ++++++++---
+ cross/armel/toolchain.cmake | 9 +--------
+ 3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/compileoptions.cmake b/compileoptions.cmake
-index 75d51fd..4649ea3 100644
+index 9f9f28e..a5f0f62 100644
--- a/compileoptions.cmake
+++ b/compileoptions.cmake
-@@ -59,7 +59,7 @@ if(CLR_CMAKE_PLATFORM_UNIX_ARM)
+@@ -61,9 +61,10 @@ if(CLR_CMAKE_PLATFORM_UNIX_ARM)
if(ARM_SOFTFP)
add_definitions(-DARM_SOFTFP)
add_compile_options(-mfloat-abi=softfp)
- add_compile_options(-target armv7-linux-gnueabi)
+ add_compile_options(-target armv7l-tizen-linux-gnueabi)
else()
- add_compile_options(-target armv7-linux-gnueabihf)
+- add_compile_options(-target armv7-linux-gnueabihf)
++ add_compile_options(-mfloat-abi=hard)
++ add_compile_options(-target armv7hl-tizen-linux-gnueabihf)
endif(ARM_SOFTFP)
+ endif(CLR_CMAKE_PLATFORM_UNIX_ARM)
+
+diff --git a/cross/arm/toolchain.cmake b/cross/arm/toolchain.cmake
+index 7ecb34a..d38b624 100644
+--- a/cross/arm/toolchain.cmake
++++ b/cross/arm/toolchain.cmake
+@@ -2,20 +2,25 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
+
+ set(CMAKE_SYSTEM_NAME Linux)
+ set(CMAKE_SYSTEM_VERSION 1)
+-set(CMAKE_SYSTEM_PROCESSOR armv7l)
++set(CMAKE_SYSTEM_PROCESSOR armv7hl)
+
+ set(TOOLCHAIN "arm-linux-gnueabihf")
+
+ add_compile_options(-target armv7-linux-gnueabihf)
+ add_compile_options(-mthumb)
+ add_compile_options(-mfpu=vfpv3)
++add_compile_options(-mfloat-abi=hard)
+ 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}" MATCHES "tizen.*")
++ add_compile_options(-target armv7hl-tizen-linux-gnueabihf)
++ add_compile_options(-Wno-deprecated-declarations) # compile-time option
++ add_compile_options(-D__extern_always_inline=inline) # compile-time option
++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/armel/toolchain.cmake b/cross/armel/toolchain.cmake
index 86e2306..84f41f1 100644
--- a/cross/armel/toolchain.cmake