X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/bb5cfa8c9d55ae9ba0ea097426d1ae3a4d4174a0..8f19a179fefffd6d2c7011e7acfd817bf2a538eb:/build-package.sh

diff --git a/build-package.sh b/build-package.sh
index bacee8b1..a19b8bb1 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -102,19 +102,11 @@ export CFLAGS="$_SPECSFLAG"
 export LDFLAGS="$_SPECSFLAG -L${TERMUX_PREFIX}/lib"
 
 if [ "$TERMUX_ARCH" = "arm" ]; then
-        # For hard support: http://blog.alexrp.com/2014/02/18/android-hard-float-support/
-        # "First, to utilize the hard float ABI, you must either compile every last component of your application
-        # as hard float (the -mhard-float GCC/Clang switch), or mark individual functions with the appropriate
-        # __attribute__ to indicate the desired ABI. For example, to mark a function so that it’s called with the
-        # soft float ABI, stick __attribute__((pcs("aapcs"))) on it.
-        # Note that the NDK will link to a libm which uses the aforementioned attribute on all of its functions.
-        # This means that if you use libm functions a lot, you’re not likely to get much of a boost in those places.
-        # The way to fix this is to add -mhard-float -D_NDK_MATH_NO_SOFTFP=1 to your GCC/Clang command line. Then
-        # add -lm_hard to your linker command line (or -Wl,-lm_hard if you just invoke GCC/Clang to link). This will
-        # make your application link statically to a libm compiled for the hard float ABI. The only downside of this
-        # is that your application will increase somewhat in size."
-	CFLAGS+=" -march=armv7-a -mfpu=neon -mhard-float -Wl,--no-warn-mismatch"
-	LDFLAGS+=" -march=armv7-a -Wl,--no-warn-mismatch"
+	CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
+	# "first flag instructs the linker to pick libgcc.a, libgcov.a, and
+	# crt*.o, which are tailored for armv7-a"
+	# - https://developer.android.com/ndk/guides/standalone_toolchain.html
+	LDFLAGS+=" -march=armv7-a -Wl,--fix-cortex-a8"
 elif [ $TERMUX_ARCH = "i686" ]; then
 	# From $NDK/docs/CPU-ARCH-ABIS.html:
 	CFLAGS+=" -march=i686 -msse3 -mstackrealign -mfpmath=sse"