summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-06-08 16:00:54 -0700
committerThiago Macieira <thiago.macieira@intel.com>2016-06-19 18:46:36 +0000
commit683c30074e4b7c9048e9970de1851e5d9a6deeb4 (patch)
tree2bf3e8aa2048a678cdc01e56a9fce69cf1e5a2ad /src/corelib/global
parent7497cfcfcba20e1afbfcae5c5d9f946ca852a0a9 (diff)
Add "-softfloat" to archdetect.cpp and clarify what to use when
Change-Id: I1cc7601489634e96833cfffd14563e033c85ff6d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/archdetect.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/global/archdetect.cpp b/src/corelib/global/archdetect.cpp
index 8a88c2f5c8..6c1a026fa8 100644
--- a/src/corelib/global/archdetect.cpp
+++ b/src/corelib/global/archdetect.cpp
@@ -121,7 +121,12 @@
# define ARCH_ABI1 ""
#endif
#if defined(__ARM_PCS_VFP) || defined(__mips_hard_float)
+// Use "-hardfloat" for platforms that usually have no FPUs
+// (and for the platforms which had "-hardfloat" before we established the rule)
# define ARCH_ABI2 "-hardfloat"
+#elif defined(_SOFT_FLOAT)
+// Use "-softfloat" for architectures that usually have FPUs
+# define ARCH_ABI2 "-softfloat"
#else
# define ARCH_ABI2 ""
#endif