6 files changed, 11 insertions, 10 deletions
diff --git a/mkspecs/devices/common/linux_arm_device_post.conf b/mkspecs/devices/common/linux_arm_device_post.conf
new file mode 100644
index 0000000000..7ce47592a9
--- /dev/null
+++ b/mkspecs/devices/common/linux_arm_device_post.conf
@@ -0,0 +1,7 @@
+contains(DISTRO_OPTS, hard-float) {
+    COMPILER_FLAGS += -mfloat-abi=hard
+} else {
+    COMPILER_FLAGS += -mfloat-abi=softfp
+}
+
+include(linux_device_post.conf)
diff --git a/mkspecs/devices/common/linux_device_post.conf b/mkspecs/devices/common/linux_device_post.conf
index f8dbf762d8..548e75affa 100644
--- a/mkspecs/devices/common/linux_device_post.conf
+++ b/mkspecs/devices/common/linux_device_post.conf
@@ -3,12 +3,6 @@ contains(DISTRO_OPTS, deb-multi-arch) {
                       -Wl,-rpath-link,$$[QT_SYSROOT]/lib/$${GCC_MACHINE_DUMP}
 }
 
-contains(DISTRO_OPTS, hard-float) {
-    COMPILER_FLAGS += -mfloat-abi=hard
-} else {
-    COMPILER_FLAGS += -mfloat-abi=softfp
-}
-
 QMAKE_CFLAGS       += $$COMPILER_FLAGS
 QMAKE_CXXFLAGS     += $$COMPILER_FLAGS
 
diff --git a/mkspecs/devices/linux-imx53qsb-g++/qmake.conf b/mkspecs/devices/linux-imx53qsb-g++/qmake.conf
index 0a5ed89feb..3a9766c4cb 100644
--- a/mkspecs/devices/linux-imx53qsb-g++/qmake.conf
+++ b/mkspecs/devices/linux-imx53qsb-g++/qmake.conf
@@ -32,6 +32,6 @@ QMAKE_CXXFLAGS_RELEASE += $$IMX5_CFLAGS_RELEASE
 QMAKE_CFLAGS_DEBUG     += $$IMX5_CFLAGS
 QMAKE_CXXFLAGS_DEBUG   += $$IMX5_CFLAGS
 
-include(../common/linux_device_post.conf)
+include(../common/linux_arm_device_post.conf)
 
 load(qt_config)
diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf
index 20f6d115bf..2b8dbf6b67 100644
--- a/mkspecs/devices/linux-imx6-g++/qmake.conf
+++ b/mkspecs/devices/linux-imx6-g++/qmake.conf
@@ -34,6 +34,6 @@ QMAKE_CXXFLAGS_RELEASE += $$IMX6_CFLAGS_RELEASE
 QMAKE_CFLAGS_DEBUG     += $$IMX6_CFLAGS
 QMAKE_CXXFLAGS_DEBUG   += $$IMX6_CFLAGS
 
-include(../common/linux_device_post.conf)
+include(../common/linux_arm_device_post.conf)
 
 load(qt_config)
diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
index d6fea474a6..5f923ad5c6 100644
--- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
+++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
@@ -42,6 +42,6 @@ QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
 EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_pi.cpp
 EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
 
-include(../common/linux_device_post.conf)
+include(../common/linux_arm_device_post.conf)
 
 load(qt_config)
diff --git a/mkspecs/devices/linux-tegra2-g++/qmake.conf b/mkspecs/devices/linux-tegra2-g++/qmake.conf
index 1c7a8cc52a..320e1b8a21 100644
--- a/mkspecs/devices/linux-tegra2-g++/qmake.conf
+++ b/mkspecs/devices/linux-tegra2-g++/qmake.conf
@@ -26,6 +26,6 @@ TEGRA2_CFLAGS           = -mtune=cortex-a9 -march=armv7-a -mhard-float -mfloat-a
 QMAKE_CFLAGS           += $$TEGRA2_CFLAGS
 QMAKE_CXXFLAGS         += $$TEGRA2_CFLAGS
 
-include(../common/linux_device_post.conf)
+include(../common/linux_arm_device_post.conf)
 
 load(qt_config)