diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-10 14:19:37 +0000 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-10 16:05:27 +0000 |
| commit | 7f6f1d7e300498ab7a0e7bb0c472305099cdf714 (patch) | |
| tree | 76c3e53d8cc59079c6978218a4ec2ca733d5bcff /src/corelib/global | |
| parent | f1033567aa4295d5e0122f01c7781a8b23d0d781 (diff) | |
Revert "Do not include qfloat16 tables in arm64 builds"
They are needed for older compilers that doesn't support
the __fp16 extension. Reverts under the assumptions other
compilers will optimize it away.
This reverts commit 6dc7e468dfd052dc4cf6187843bcb1a5b82ec6ff.
Task-number: QTBUG-63693
Change-Id: If780de001d8c12df0db12caaf62505f16e01b663
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/global.pri | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index b76d1ef43c..a3c1c4d65e 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -79,16 +79,13 @@ gcc:ltcg { SOURCES += $$VERSIONTAGGING_SOURCES } -# 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 -} +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 |