From 2a6244795ba341b449deb05f9ed452a9663c936b Mon Sep 17 00:00:00 2001
From: chunseoklee <chunseok.lee@samsung.com>
Date: Tue, 3 Jan 2017 10:10:48 +0900
Subject: [PATCH] Use armel instead of arm-softfp

Signed-off-by: chunseoklee <chunseok.lee@samsung.com>
---
 config.json                                 |  2 +-
 cross/arm-softfp/sources.list.jessie        |  6 ------
 cross/armel/sources.list.jessie             |  7 +++++++
 cross/{arm-softfp => armel}/toolchain.cmake |  0
 cross/{arm-softfp => armel}/tryrun.cmake    |  0
 cross/build-rootfs.sh                       | 16 +++++++++++-----
 src/Native/Unix/gen-buildsys-clang.sh       |  2 +-
 src/Native/build-native.sh                  |  4 ++--
 8 files changed, 22 insertions(+), 15 deletions(-)
 delete mode 100644 cross/arm-softfp/sources.list.jessie
 create mode 100644 cross/armel/sources.list.jessie
 rename cross/{arm-softfp => armel}/toolchain.cmake (100%)
 rename cross/{arm-softfp => armel}/tryrun.cmake (100%)

diff --git a/config.json b/config.json
index a3061dc596d5..e2aac398d167 100644
--- a/config.json
+++ b/config.json
@@ -165,7 +165,7 @@
     "BuildArchitecture": {
       "description": "Sets the value of the build architecture.",
       "valueType": "passThrough",
-      "values": ["x86", "arm", "arm-softfp", "x64", "arm64"],
+      "values": ["x86", "arm", "armel", "x64", "arm64"],
       "defaultValue": "${CPUArch}"
     },
     "CmakeBuildType": {
diff --git a/cross/arm-softfp/sources.list.jessie b/cross/arm-softfp/sources.list.jessie
deleted file mode 100644
index 5b8510e5e742..000000000000
--- a/cross/arm-softfp/sources.list.jessie
+++ /dev/null
@@ -1,6 +0,0 @@
-deb http://ftp.debian.org/debian/ jessie main contrib non-free
-deb-src http://ftp.debian.org/debian/ jessie main contrib non-free
-
-# lldb-3.6-dev is unavailable in jessie
-deb http://ftp.debian.org/debian/ stretch main contrib non-free
-deb-src http://ftp.debian.org/debian/ stretch main contrib non-free
diff --git a/cross/armel/sources.list.jessie b/cross/armel/sources.list.jessie
new file mode 100644
index 000000000000..d63875ae2a01
--- /dev/null
+++ b/cross/armel/sources.list.jessie
@@ -0,0 +1,7 @@
+deb http://ftp.debian.org/debian/ jessie main contrib non-free
+deb-src http://ftp.debian.org/debian/ jessie main contrib non-free
+
+# Stable repo is the only repo that has llvm for armel
+deb http://ftp.debian.org/debian/ stable main contrib non-free
+deb-src http://ftp.debian.org/debian/ stable main contrib non-free
+
diff --git a/cross/arm-softfp/toolchain.cmake b/cross/armel/toolchain.cmake
similarity index 100%
rename from cross/arm-softfp/toolchain.cmake
rename to cross/armel/toolchain.cmake
diff --git a/cross/arm-softfp/tryrun.cmake b/cross/armel/tryrun.cmake
similarity index 100%
rename from cross/arm-softfp/tryrun.cmake
rename to cross/armel/tryrun.cmake
diff --git a/cross/build-rootfs.sh b/cross/build-rootfs.sh
index e840a2bdc8d5..ae1980470113 100755
--- a/cross/build-rootfs.sh
+++ b/cross/build-rootfs.sh
@@ -3,8 +3,8 @@
 usage()
 {
     echo "Usage: $0 [BuildArch] [UbuntuCodeName]"
-    echo "BuildArch can be: arm, 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, armel, arm64, x86"
+    echo "UbuntuCodeName - optional, Code name for Ubuntu, can be: trusty(default), vivid, wily, xenial. If BuildArch is armel, UbuntuCodeName is ignored."
     exit 1
 }
 
@@ -30,6 +30,8 @@ __UbuntuPackages+=" zlib1g-dev"
 if [ -z "$LLVM_ARM_HOME" ]; then
     __LLDB_Package="lldb-3.6-dev"
 fi
+ 
+
 
 __BuildArch=arm
 __UbuntuArch=armhf
@@ -60,11 +62,10 @@ for i in "$@" ; do
             __UbuntuArch=i386
             __UbuntuRepo="http://archive.ubuntu.com/ubuntu"
             ;;
-        arm-softfp)
-            __BuildArch=arm-softfp
+        armel)
+            __BuildArch=armel
             __UbuntuArch=armel
             __UbuntuRepo="http://ftp.debian.org/debian/"
-            __UbuntuPackages+=" ${__LLDB_Package:-}"
             __MachineTriple=arm-linux-gnueabi
             __UbuntuCodeName=jessie
             ;;
@@ -93,6 +94,11 @@ if [[ "$__BuildArch" == "arm" ]]; then
     __UbuntuPackages+=" ${__LLDB_Package:-}"
 fi
 
+if [ "$__BuildArch" == "armel" ]; then  
+    __LLDB_Package="lldb-3.5-dev"
+    __UbuntuPackages+=" ${__LLDB_Package:-}"
+fi 
+
 __RootfsDir="$__CrossDir/rootfs/$__BuildArch"
 
 if [[ -n "$ROOTFS_DIR" ]]; then
diff --git a/src/Native/Unix/gen-buildsys-clang.sh b/src/Native/Unix/gen-buildsys-clang.sh
index de8127bae4e0..de220dc6d2a3 100755
--- a/src/Native/Unix/gen-buildsys-clang.sh
+++ b/src/Native/Unix/gen-buildsys-clang.sh
@@ -66,7 +66,7 @@ if [[ -n "$CROSSCOMPILE" ]]; then
     cmake_extra_defines="$cmake_extra_defines -C $CONFIG_DIR/tryrun.cmake"
     cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$CONFIG_DIR/toolchain.cmake"
 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/src/Native/build-native.sh b/src/Native/build-native.sh
index 860318d5141e..a58546a83898 100755
--- a/src/Native/build-native.sh
+++ b/src/Native/build-native.sh
@@ -146,8 +146,8 @@ while :; do
         arm)
             __BuildArch=arm
             ;;
-        arm-softfp)
-            __BuildArch=arm-softfp
+        armel)
+            __BuildArch=armel
             ;;
         arm64)
             __BuildArch=arm64