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        |  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 9f9f28e..a5f0f62 100644
--- a/compileoptions.cmake
+++ b/compileoptions.cmake
@@ -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(-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
+++ b/cross/armel/toolchain.cmake
@@ -16,16 +16,9 @@ set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -target ${TOOLCHAIN}")
 set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}")
 
 if("$ENV{__DistroRid}" MATCHES "tizen.*")
-    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/6.2.1")
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
+    add_compile_options(-target armv7l-tizen-linux-gnueabi)
     add_compile_options(-Wno-deprecated-declarations) # compile-time option
     add_compile_options(-D__extern_always_inline=inline) # compile-time option
-
-    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}/lib")
-    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib")
-    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
 else()
     # TODO: this setting assumes debian armel rootfs
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/include/c++/4.9)
-- 
1.9.1