From 2f8df4d1a87df9dd67913b016171dac20839d16e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 10 Jul 2020 18:37:29 +0200 Subject: Disable PCRE2 JIT on macOS ARM64 It's already disabled for many other ARM platforms, and upstream support for Apple Silicon is still pending, so we disable it for now. See: https://bugs.exim.org/show_bug.cgi?id=2618 Fixes: QTBUG-85528 Pick-to: 5.15 Pick-to: 5.12 Change-Id: I42b6e5efaa07c9b832cd05a47436eb86a214e9bf Reviewed-by: Thiago Macieira --- src/3rdparty/pcre2/.prev_CMakeLists.txt | 7 ++++++- src/3rdparty/pcre2/CMakeLists.txt | 7 ++++++- src/3rdparty/pcre2/pcre2.pro | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty/pcre2/.prev_CMakeLists.txt b/src/3rdparty/pcre2/.prev_CMakeLists.txt index 1a63de4d54..5efac810c7 100644 --- a/src/3rdparty/pcre2/.prev_CMakeLists.txt +++ b/src/3rdparty/pcre2/.prev_CMakeLists.txt @@ -67,10 +67,15 @@ qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64" PCRE2_DISABLE_JIT ) +qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64") + DEFINES + PCRE2_DISABLE_JIT +) + qt_extend_target(BundledPcre2 CONDITION WIN32 PUBLIC_DEFINES PCRE2_STATIC ) -#### Keys ignored in scope 7:.:.:pcre2.pri:QT_FEATURE_intelcet: +#### Keys ignored in scope 8:.:.:pcre2.pri:QT_FEATURE_intelcet: # QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK" diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt index 22291cabed..575424c887 100644 --- a/src/3rdparty/pcre2/CMakeLists.txt +++ b/src/3rdparty/pcre2/CMakeLists.txt @@ -67,12 +67,17 @@ qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64" PCRE2_DISABLE_JIT ) +qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64") + DEFINES + PCRE2_DISABLE_JIT +) + qt_extend_target(BundledPcre2 CONDITION WIN32 PUBLIC_DEFINES PCRE2_STATIC ) -#### Keys ignored in scope 7:.:.:pcre2.pri:QT_FEATURE_intelcet: +#### Keys ignored in scope 8:.:.:pcre2.pri:QT_FEATURE_intelcet: # QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK" # special case begin diff --git a/src/3rdparty/pcre2/pcre2.pro b/src/3rdparty/pcre2/pcre2.pro index 7b2b430f63..95f11f6f23 100644 --- a/src/3rdparty/pcre2/pcre2.pro +++ b/src/3rdparty/pcre2/pcre2.pro @@ -11,5 +11,6 @@ include(pcre2.pri) uikit|qnx: DEFINES += PCRE2_DISABLE_JIT win32:contains(QT_ARCH, "arm"): DEFINES += PCRE2_DISABLE_JIT win32:contains(QT_ARCH, "arm64"): DEFINES += PCRE2_DISABLE_JIT +macos:contains(QT_ARCH, "arm64"): DEFINES += PCRE2_DISABLE_JIT load(qt_helper_lib) -- cgit v1.2.3