diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-30 16:54:17 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-04 11:22:38 +0100 |
| commit | 2f1c0875733d849a95c2cc5e40d2e6079ccbdec9 (patch) | |
| tree | 20f4de3caff0989dbb111821d37b6a243ccc0426 /util/cmake/configurejson2cmake.py | |
| parent | 88e9e88a264292ccecb5af4a0c3bdaf059b3c775 (diff) | |
CMake: Fix conditions for some subarch features
The AES and SHA features were checking for the wrong TEST_subarch_foo
variables.
Pick-to: 6.0
Task-number: QTBUG-87376
Change-Id: I46cd14d98832529aebac22cfcb01180330c5e091
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'util/cmake/configurejson2cmake.py')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 7d7984b574..15dc067f26 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -60,7 +60,7 @@ def map_tests(test: str) -> Optional[str]: "c99": "c_std_99 IN_LIST CMAKE_C_COMPILE_FEATURES", "c11": "c_std_11 IN_LIST CMAKE_C_COMPILE_FEATURES", "x86SimdAlways": "ON", # FIXME: Make this actually do a compile test. - "aesni": "TEST_subarch_aes", + "aesni": "TEST_subarch_aesni", "avx": "TEST_subarch_avx", "avx2": "TEST_subarch_avx2", "avx512f": "TEST_subarch_avx512f", @@ -99,9 +99,9 @@ def map_tests(test: str) -> Optional[str]: "pdpid": "TEST_subarch_rdpid", "rdpid": "TEST_subarch_rdpid", "rdseed": "TEST_subarch_rdseed", - "rdrnd": "TEST_subarch_rdseed", # FIXME: Is this the right thing? + "rdrnd": "TEST_subarch_rdrnd", "rtm": "TEST_subarch_rtm", - "shani": "TEST_subarch_sha", + "shani": "TEST_subarch_shani", "shstk": "TEST_subarch_shstk", "sse2": "TEST_subarch_sse2", "sse3": "TEST_subarch_sse3", |