summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-02-24 16:26:30 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-02-28 12:01:18 +0000
commit6dc7e468dfd052dc4cf6187843bcb1a5b82ec6ff (patch)
tree224de7696bb046bc3de5efd9b57c4fa5c2aa1807 /src/corelib/global
parent49c558eb0db3ec544fface24939a16f92d794987 (diff)
Do not include qfloat16 tables in arm64 builds
The FP16 extension in IEEE mode is mandatory for Aarch64, so there is no aarch64 configuration where the tables will be needed for conversion. Change-Id: I9804e55c193cc9b5adcaedb720d8b980624139cc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Glen Mabey <Glen.Mabey@swri.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/global.pri23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index 9ae1e3a4ae..f162dd95dd 100644
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -80,13 +80,16 @@ gcc:ltcg {
SOURCES += $$VERSIONTAGGING_SOURCES
}
-QMAKE_QFLOAT16_TABLES_GENERATE = global/qfloat16.h
-
-qtPrepareTool(QMAKE_QFLOAT16_TABLES, qfloat16-tables)
-
-qfloat16_tables.commands = $$QMAKE_QFLOAT16_TABLES ${QMAKE_FILE_OUT}
-qfloat16_tables.output = global/qfloat16tables.cpp
-qfloat16_tables.depends = $$QMAKE_QFLOAT16_TABLES
-qfloat16_tables.input = QMAKE_QFLOAT16_TABLES_GENERATE
-qfloat16_tables.variable_out = SOURCES
-QMAKE_EXTRA_COMPILERS += qfloat16_tables
+# On AARCH64 the fp16 extension is mandatory, so we don't need the conversion tables.
+!contains(QT_ARCH, "arm64") {
+ QMAKE_QFLOAT16_TABLES_GENERATE = global/qfloat16.h
+
+ qtPrepareTool(QMAKE_QFLOAT16_TABLES, qfloat16-tables)
+
+ qfloat16_tables.commands = $$QMAKE_QFLOAT16_TABLES ${QMAKE_FILE_OUT}
+ qfloat16_tables.output = global/qfloat16tables.cpp
+ qfloat16_tables.depends = $$QMAKE_QFLOAT16_TABLES
+ qfloat16_tables.input = QMAKE_QFLOAT16_TABLES_GENERATE
+ qfloat16_tables.variable_out = SOURCES
+ QMAKE_EXTRA_COMPILERS += qfloat16_tables
+}