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 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"