diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-12-04 16:45:55 +0100 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-12-07 15:22:43 +0100 |
| commit | 509c25752112583e6bc997e8c9442f6b69136816 (patch) | |
| tree | ba89fdcf7f57f348c8ce4deee403f7cdacb3c466 /src/3rdparty/pcre2/patches | |
| parent | 4be6663cf2d3fc3d4df295f909bae722b2673c05 (diff) | |
PCRE: update to 10.36
Dropped the RTEMS patch (upstream now uses posix_madvise).
Drop support for the TILE architecture (dropped by upstream).
[ChangeLog][Third-Party Code] PCRE2 has been updated to version
10.36.
Pick-to: 6.0 5.15
Change-Id: Idb4467bef0ff520605b8b5d9188b9d67d8e4d0f2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty/pcre2/patches')
| -rw-r--r-- | src/3rdparty/pcre2/patches/0001-fix-rtems-build-undefine-madvise.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/3rdparty/pcre2/patches/0001-fix-rtems-build-undefine-madvise.patch b/src/3rdparty/pcre2/patches/0001-fix-rtems-build-undefine-madvise.patch deleted file mode 100644 index 074b39df85..0000000000 --- a/src/3rdparty/pcre2/patches/0001-fix-rtems-build-undefine-madvise.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ac10063196685fe6124055feb1275e13a78f562e Mon Sep 17 00:00:00 2001 -From: Mikhail Svetkin <mikhail.svetkin@qt.io> -Date: Tue, 20 Mar 2018 14:03:54 +0100 -Subject: [PATCH] rtems: Fix pcre2 build (madvise undefined) - -RTEMS does not have madvise. We can use only posix_madvise - -Change-Id: Ia18b7cd2d7f9db84331f7e2350d060b9e85b30c8 ---- - src/3rdparty/pcre2/src/sljit/sljitUtils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/pcre2/src/sljit/sljitUtils.c b/src/3rdparty/pcre2/src/sljit/sljitUtils.c -index 5c2a838932..2ead044b1b 100644 ---- a/src/3rdparty/pcre2/src/sljit/sljitUtils.c -+++ b/src/3rdparty/pcre2/src/sljit/sljitUtils.c -@@ -315,7 +315,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_u8 *SLJIT_FUNC sljit_stack_resize(struct sljit_st - aligned_new_start = (sljit_uw)new_start & ~sljit_page_align; - aligned_old_start = ((sljit_uw)stack->start) & ~sljit_page_align; - /* If madvise is available, we release the unnecessary space. */ --#if defined(MADV_DONTNEED) -+#if defined(MADV_DONTNEED) && !defined(__rtems__) - if (aligned_new_start > aligned_old_start) - madvise((void*)aligned_old_start, aligned_new_start - aligned_old_start, MADV_DONTNEED); - #elif defined(POSIX_MADV_DONTNEED) --- -2.21.0 - |