From 5cfd5fd9d7ece7e1eb3c4d2be8ec342b376acf38 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Tue, 20 Feb 2018 12:33:23 +0100
Subject: configure: introduce 'subarch' term to expression evaluator

... and make use of it.

it's a logical continuation of the 'arch' term, and will be used also in
qt3d's configure.

Started-by: Thiago Macieira <thiago.macieira@intel.com>
Change-Id: I940917d6763842499b18fffd1514c96889a0cc63
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 configure.json | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index a7b8149469..3f751203b8 100644
--- a/configure.json
+++ b/configure.json
@@ -213,8 +213,7 @@
         "compile": [ "verifyspec" ],
         "detectPkgConfig": [ "cross_compile", "machineTuple" ],
         "library": [ "pkg-config" ],
-        "getPkgConfigVariable": [ "pkg-config" ],
-        "subarch": [ "architecture" ]
+        "getPkgConfigVariable": [ "pkg-config" ]
     },
 
     "testTypeAliases": {
@@ -450,21 +449,6 @@
             "type": "x86SimdAlways",
             "test": "x86_simd"
         },
-        "mips_dsp": {
-            "label": "MIPS DSP instructions",
-            "type": "subarch",
-            "subarch": "dsp"
-        },
-        "mips_dspr2": {
-            "label": "MIPS DSPr2 instructions",
-            "type": "subarch",
-            "subarch": "dspr2"
-        },
-        "neon": {
-            "label": "NEON instructions",
-            "type": "subarch",
-            "subarch": "neon"
-        },
         "posix_fallocate": {
             "label": "POSIX fallocate()",
             "type": "compile",
@@ -1014,7 +998,7 @@
         },
         "mips_dsp": {
             "label": "DSP",
-            "condition": "arch.mips && tests.mips_dsp",
+            "condition": "arch.mips && subarch.dsp",
             "output": [
                 "privateConfig",
                 { "type": "define", "name": "QT_COMPILER_SUPPORTS_MIPS_DSP", "value": 1 }
@@ -1022,7 +1006,7 @@
         },
         "mips_dspr2": {
             "label": "DSPr2",
-            "condition": "arch.mips && tests.mips_dspr2",
+            "condition": "arch.mips && subarch.dspr2",
             "output": [
                 "privateConfig",
                 { "type": "define", "name": "QT_COMPILER_SUPPORTS_MIPS_DSPR2", "value": 1 }
@@ -1030,7 +1014,7 @@
         },
         "neon": {
             "label": "NEON",
-            "condition": "(arch.arm || arch.arm64) && tests.neon",
+            "condition": "(arch.arm || arch.arm64) && subarch.neon",
             "output": [
                 "privateConfig",
                 { "type": "define", "name": "QT_COMPILER_SUPPORTS_NEON", "value": 1 }
-- 
cgit v1.2.3