From 131011493b7550b5ed4bdf241e8432aeae7694e8 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 14 May 2017 12:24:37 -0700 Subject: Split the patch from CrystaX to separate commits ... and edit the biggest chunk as in previous 950-bionic-android.patch. Also, drop arm_neon.h - it is a separate package, will be added separately. Signed-off-by: Alexey Neyman --- patches/gcc/6.3.0/971-crystax.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 patches/gcc/6.3.0/971-crystax.patch (limited to 'patches/gcc/6.3.0/971-crystax.patch') diff --git a/patches/gcc/6.3.0/971-crystax.patch b/patches/gcc/6.3.0/971-crystax.patch new file mode 100644 index 00000000..748a3812 --- /dev/null +++ b/patches/gcc/6.3.0/971-crystax.patch @@ -0,0 +1,25 @@ +commit 9f057b62caafe08c968103d39b5df82486a175c2 +Author: Dmitry Moskalchuk +Date: Thu Aug 13 16:11:54 2015 +0300 + + [android] Add additional multilib option: mfloat-abi=hard + + Signed-off-by: Dmitry Moskalchuk + +diff --git a/gcc/config/arm/t-linux-androideabi b/gcc/config/arm/t-linux-androideabi +index 8f1307c55..cbbec5bd2 100644 +--- a/gcc/config/arm/t-linux-androideabi ++++ b/gcc/config/arm/t-linux-androideabi +@@ -1,8 +1,9 @@ +-MULTILIB_OPTIONS = march=armv7-a mthumb +-MULTILIB_DIRNAMES = armv7-a thumb +-MULTILIB_EXCEPTIONS = ++MULTILIB_OPTIONS = march=armv7-a mthumb mfloat-abi=hard ++MULTILIB_DIRNAMES = armv7-a thumb hard ++MULTILIB_EXCEPTIONS = mfloat-abi=hard* mthumb/mfloat-abi=hard* + MULTILIB_MATCHES = + MULTILIB_OSDIRNAMES = ++MULTILIB_EXTRA_OPTS = Wl,--no-warn-mismatch + + # The "special" multilib can be used to build native applications for Android, + # as opposed to native shared libraries that are then called via JNI. -- cgit v1.2.3