summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-04-01 18:41:59 -0700
committerThiago Macieira <thiago.macieira@intel.com>2017-04-02 17:40:48 +0000
commitb8c61c6bb35c49fc8a6aed4925e59ba1694eab19 (patch)
tree29826332609033fcce5de569db57907faab1c20f /configure.json
parentd2388f15e7fa420415d119b0e422ea03da050a60 (diff)
x86: Report the AES and SHA New Instruction detection
Commit 0f1b6acab7713b05223f029bf9201daf42096d3b added the detection, but not the reporting in configure's output. This change makes them be reported alongside F16C. Change-Id: I27b55fdf514247549455fffd14b1711ca47b1d9a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json12
1 files changed, 9 insertions, 3 deletions
diff --git a/configure.json b/configure.json
index 69019afa80..0150657416 100644
--- a/configure.json
+++ b/configure.json
@@ -880,7 +880,7 @@
]
},
"aesni": {
- "label": "aesni",
+ "label": "AES",
"condition": "features.sse2 && tests.aesni",
"output": [
"privateConfig",
@@ -888,7 +888,7 @@
]
},
"shani": {
- "label": "shani",
+ "label": "SHA",
"condition": "features.sse2 && tests.shani",
"output": [
"privateConfig",
@@ -1152,7 +1152,7 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
{
"message": "AVX",
"type": "featureList",
- "args": "avx avx2 f16c",
+ "args": "avx avx2",
"condition": "(arch.i386 || arch.x86_64)"
},
{
@@ -1162,6 +1162,12 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
"condition": "(arch.i386 || arch.x86_64)"
},
{
+ "message": "Other x86",
+ "type": "featureList",
+ "args": "aesni f16c shani",
+ "condition": "(arch.i386 || arch.x86_64)"
+ },
+ {
"type": "feature",
"args": "neon",
"condition": "arch.arm || arch.arm64"