Use armel instead of arm-softfp

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

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
+

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

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
 

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