commit d088a9813892ec60736a8a5887a2be6ac57805ea
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Thu Feb 09 14:38:36 2017 -0500
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Fri Feb 10 14:57:55 2017 -0500
tree ace13aa4bb0512a1587bc788261e40f291c3d47f
parent db6c081bc08f3f5a4e17473f663d362d68512c39

build: add arm64 support

Change-Id: I81e58c8fa88a871bcaa378f454884973bee0aff6
Tuleap: #1509

build-daemon.sh

diff --git a/build-daemon.sh b/build-daemon.sh
index d10582f..373cf2c 100755
--- a/build-daemon.sh
+++ b/build-daemon.sh
@@ -49,7 +49,7 @@
     PLATFORM_SHORT_ARCH="mips"
 elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then
     TARGET_TUPLE="aarch64-linux-android"
-    PJ_TARGET_TUPLE="arm64-unknown-linux-androideabi"
+    PJ_TARGET_TUPLE="aarch64-unknown-linux-android"
     PATH_HOST=$TARGET_TUPLE
     HAVE_ARM=1
     HAVE_64=1
@@ -122,9 +122,11 @@
     EXTRA_LDFLAGS="-march=armv7-a -mfpu=vfpv3-d16 -mcpu=cortex-a8 -lm_hard -D_NDK_MATH_NO_SOFTFP=1"
 elif [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then
     EXTRA_CFLAGS="${EXTRA_CFLAGS} -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16"
-    EXTRA_LDFLAGS="-march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16 -lm -Wl,--fix-cortex-a8"
+    EXTRA_LDFLAGS="-march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16"
+elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then
+    EXTRA_LDFLAGS="${EXTRA_LDFLAGS} -L${ANDROID_TOOLCHAIN}/sysroot/usr/lib -L${ANDROID_TOOLCHAIN}/${TARGET_TUPLE}/lib"
 fi
-EXTRA_LDFLAGS="${EXTRA_LDFLAGS} -L${ANDROID_TOOLCHAIN}/${TARGET_TUPLE}/${LIBDIR}/${ANDROID_ABI} -L${ANDROID_TOOLCHAIN}/${TARGET_TUPLE}/${LIBDIR} -lm -landroid_support"
+EXTRA_LDFLAGS="${EXTRA_LDFLAGS} -L${ANDROID_TOOLCHAIN}/${TARGET_TUPLE}/${LIBDIR}/${ANDROID_ABI} -L${ANDROID_TOOLCHAIN}/${TARGET_TUPLE}/${LIBDIR} -lm -latomic -landroid_support"
 
 EXTRA_CXXFLAGS="${EXTRA_CFLAGS}"
 EXTRA_CFLAGS="-std=c11 ${EXTRA_CFLAGS}"

compile.sh

diff --git a/compile.sh b/compile.sh
index 8962a24..f9acce4 100755
--- a/compile.sh
+++ b/compile.sh
@@ -2,7 +2,7 @@
 # Build Ring daemon and client APK for Android
 
 if [ -z "$ANDROID_ABI" ]; then
-    ANDROID_ABI="armeabi-v7a x86 x86_64"
+    ANDROID_ABI="armeabi-v7a arm64-v8a x86 x86_64"
     echo "ANDROID_ABI not provided, building for ${ANDROID_ABI}"
 fi
 

configure.sh

diff --git a/configure.sh b/configure.sh
index de7faaf..bcc6779 100755
--- a/configure.sh
+++ b/configure.sh
@@ -43,8 +43,8 @@
 CFLAGS="$CFLAGS ${RING_EXTRA_CFLAGS}" \
 CXXFLAGS="$CXXFLAGS ${RING_EXTRA_CXXFLAGS}" \
 LDFLAGS="$LDFLAGS ${RING_EXTRA_LDFLAGS}" \
-CC="clang" \
-CXX="clang++" \
+CC="${CROSS_COMPILE}clang" \
+CXX="${CROSS_COMPILE}clang++" \
 NM="${CROSS_COMPILE}nm" \
 STRIP="${CROSS_COMPILE}strip" \
 RANLIB="${CROSS_COMPILE}ranlib" \