From 5be615df32ce970fcccda93cf577e9ce35b1d397 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Wed, 18 Dec 2013 14:51:12 +0800 Subject: [4.6, 4.8] Add additional multilib option: mfloat-abi=hard Only available with "-march=armv7-a", this CL add two set of libraries 1. "armv7-a/hard": -march=armv7-a -mfloat-abi=hard 2. "armv7-a/thumb/hard": -march=armv7-a -mthumb -mfloat-abi=hard Note that -mhard-float implies -mfloat-abi=hard, which in turns select one of the above /hard libraries dependeing on the presence of -mthumb or not. (ie. no need to explicitly specifly -mfloat-abi=hard after -mhard-float) Change-Id: Ib803ecaa911082d6bc4f98b542d7d28e98be6726 --- gcc-4.8/gcc/config/arm/linux-elf.h | 2 +- gcc-4.8/gcc/config/arm/t-linux-androideabi | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'gcc-4.8/gcc') diff --git a/gcc-4.8/gcc/config/arm/linux-elf.h b/gcc-4.8/gcc/config/arm/linux-elf.h index 488efa4ba..bb55a742e 100644 --- a/gcc-4.8/gcc/config/arm/linux-elf.h +++ b/gcc-4.8/gcc/config/arm/linux-elf.h @@ -46,7 +46,7 @@ #undef MULTILIB_DEFAULTS #define MULTILIB_DEFAULTS \ - { "marm", "mlittle-endian", "mfloat-abi=hard", "mno-thumb-interwork" } + { "marm", "mlittle-endian", "mfloat-abi=softfp", "mno-thumb-interwork" } /* Now we define the strings used to build the spec file. */ #undef LIB_SPEC diff --git a/gcc-4.8/gcc/config/arm/t-linux-androideabi b/gcc-4.8/gcc/config/arm/t-linux-androideabi index 8f1307c55..cbbec5bd2 100644 --- a/gcc-4.8/gcc/config/arm/t-linux-androideabi +++ b/gcc-4.8/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