aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.8/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc-4.8/gcc')
-rw-r--r--gcc-4.8/gcc/config/arm/linux-elf.h2
-rw-r--r--gcc-4.8/gcc/config/arm/t-linux-androideabi7
2 files changed, 5 insertions, 4 deletions
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.