diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:44:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:44:24 +0200 |
| commit | b5c2535eb0da4ad2b65e79df288a3674f3118717 (patch) | |
| tree | 964bd1dfaa9c769878f8195db6d2bce03ef4e5c7 /src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h | |
| parent | 3f25bcd5b7ec0d8a17a3a236099b9049b32b7755 (diff) | |
| parent | 6c0ced4b7a77b089b434ab5eb9f430717f26d687 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty/pcre2/qt_attribution.json
Change-Id: Ibae941cb12662f27bd6962ee02bc235971c59a15
Diffstat (limited to 'src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h')
| -rw-r--r-- | src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h b/src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h index f5703e8e7f..ba60311e45 100644 --- a/src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h +++ b/src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h @@ -530,7 +530,7 @@ typedef double sljit_f64; #endif /* !SLJIT_FUNC */ #ifndef SLJIT_INDIRECT_CALL -#if ((defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) && (defined SLJIT_BIG_ENDIAN && SLJIT_BIG_ENDIAN)) \ +#if ((defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) && (!defined _CALL_ELF || _CALL_ELF == 1)) \ || ((defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) && defined _AIX) /* It seems certain ppc compilers use an indirect addressing for functions which makes things complicated. */ |