Skip to content

Commit ccb7bcf

Browse files
committed
Upgrade PCRE2 to 10.48
New upstream release. [ChangeLog][Third-Party Code] PCRE2 was updated to version 10.48. Change-Id: I0e0613d2efe937be7a9dddad45d2689c97109abf Pick-to: 6.12 6.11 6.8 6.5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
1 parent a17e2ae commit ccb7bcf

36 files changed

Lines changed: 5113 additions & 4554 deletions

src/3rdparty/pcre2/AUTHORS.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,11 @@ All names listed alphabetically.
7777

7878
### Contributors to PCRE2
7979

80-
This list includes names up until the PCRE2 10.47 release. New names will be
80+
This list includes names up until the PCRE2 10.48 release. New names will be
8181
added from the Git history on each release.
8282

83+
Ilia Alshanetsky
84+
Bernard Assan
8385
Scott Bell
8486
Carlo Marcelo Arenas Belón
8587
Edward Betts
@@ -91,36 +93,46 @@ added from the Git history on each release.
9193
Alejandro Colomar
9294
Jeremie Courreges-Anglas
9395
Addison Crump
96+
Weixie Cui
9497
Alex Dowad
9598
Daniel Engberg
9699
Marco Feuerstein
97100
Daniel Richard G
98101
Isaac Oscar Gariano
99102
David Gaussmann
100103
Andrey Gorbachev
104+
Nikolay Govorov
101105
Jordan Griege
106+
Rudi Heitbaum
102107
Jason Hood
103108
Bumsu Hyeon
104109
Roy Ivy
105110
Nobuhiro Iwamatsu
106111
Martin Joerg
107112
Guillem Jover
108113
Ralf Junker
114+
Anton Karpov
109115
Ayesh Karunaratne
110116
Michael Kaufmann
117+
Srijan Keshri
111118
Yunho Kim
112119
Joshua Kinard
113120
David Korczynski
114121
Uwe Korn
115122
Jonas Kvinge
116123
Kristian Larsson
124+
Lin Runze
117125
Kai Lu
118126
Behzod Mansurov
127+
Brian McKenna
119128
B. Scott Michel
120129
Greg Minshall
121130
Nathan Moinvaziri
131+
Alexandre Moyer
122132
Mike Munday
123133
Marc Mutz
134+
Kartik Naik
135+
NaN
124136
Fabio Pagani
125137
Christian Persch
126138
Alex Reinking
@@ -138,6 +150,7 @@ added from the Git history on each release.
138150
Greg Thain
139151
Lucas Trzesniewski
140152
Theodore Tsirpanis
153+
Matt Turner
141154
Aaron M. Ucko
142155
Matthew Vernon
143156
Rémi Verschelde

src/3rdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitWXExecAllocatorPosix.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_malloc_exec(sljit_uw size)
9090
#ifdef PROT_MAX
9191
prot |= PROT_MAX(PROT_READ | PROT_WRITE | PROT_EXEC);
9292
#endif
93+
#ifdef PROT_MPROTECT
94+
prot |= PROT_MPROTECT(PROT_EXEC);
95+
#endif
9396

9497
size += sizeof(sljit_uw);
9598
ptr = (sljit_uw*)mmap(NULL, size, prot, MAP_PRIVATE | MAP_ANON, -1, 0);

src/3rdparty/pcre2/deps/sljit/sljit_src/sljitConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ extern "C" {
133133
nonzero value - FPU is present.
134134
*/
135135

136-
/* For further configurations, see the beginning of sljitConfigInternal.h */
136+
/* For further configurations, see sljitConfigCPU.h and sljitConfigInternal.h */
137137

138138
#ifdef __cplusplus
139139
} /* extern "C" */

src/3rdparty/pcre2/deps/sljit/sljit_src/sljitConfigCPU.h

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
/* #define SLJIT_CONFIG_RISCV_64 1 */
4747
/* #define SLJIT_CONFIG_S390X 1 */
4848
/* #define SLJIT_CONFIG_LOONGARCH_64 */
49+
/* #define SLJIT_CONFIG_ALPHA_64 1 */
4950

5051
/* #define SLJIT_CONFIG_AUTO 1 */
5152
/* #define SLJIT_CONFIG_UNSUPPORTED 1 */
@@ -68,6 +69,7 @@
6869
+ (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64) \
6970
+ (defined SLJIT_CONFIG_S390X && SLJIT_CONFIG_S390X) \
7071
+ (defined SLJIT_CONFIG_LOONGARCH_64 && SLJIT_CONFIG_LOONGARCH_64) \
72+
+ (defined SLJIT_CONFIG_ALPHA_64 && SLJIT_CONFIG_ALPHA_64) \
7173
+ (defined SLJIT_CONFIG_AUTO && SLJIT_CONFIG_AUTO) \
7274
+ (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) >= 2
7375
#error "Multiple architectures are selected"
@@ -87,6 +89,7 @@
8789
&& !(defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64) \
8890
&& !(defined SLJIT_CONFIG_S390X && SLJIT_CONFIG_S390X) \
8991
&& !(defined SLJIT_CONFIG_LOONGARCH_64 && SLJIT_CONFIG_LOONGARCH_64) \
92+
&& !(defined SLJIT_CONFIG_ALPHA_64 && SLJIT_CONFIG_ALPHA_64) \
9093
&& !(defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) \
9194
&& !(defined SLJIT_CONFIG_AUTO && SLJIT_CONFIG_AUTO)
9295
#if defined SLJIT_CONFIG_AUTO && !SLJIT_CONFIG_AUTO
@@ -134,6 +137,8 @@
134137
#define SLJIT_CONFIG_LOONGARCH_64 1
135138
#elif defined(__s390x__)
136139
#define SLJIT_CONFIG_S390X 1
140+
#elif defined(__alpha__)
141+
#define SLJIT_CONFIG_ALPHA_64 1
137142
#else
138143
/* Unsupported architecture */
139144
#define SLJIT_CONFIG_UNSUPPORTED 1
@@ -183,6 +188,78 @@
183188
#define SLJIT_CONFIG_RISCV 1
184189
#elif (defined SLJIT_CONFIG_LOONGARCH_64 && SLJIT_CONFIG_LOONGARCH_64)
185190
#define SLJIT_CONFIG_LOONGARCH 1
191+
#elif (defined SLJIT_CONFIG_ALPHA_64 && SLJIT_CONFIG_ALPHA_64)
192+
#define SLJIT_CONFIG_ALPHA 1
193+
#endif
194+
195+
/*************************/
196+
/* Endianness detection. */
197+
/*************************/
198+
199+
#if !defined(SLJIT_BIG_ENDIAN) && !defined(SLJIT_LITTLE_ENDIAN)
200+
201+
#if defined(SLJIT_CONFIG_ARM) && SLJIT_CONFIG_ARM
202+
203+
#ifdef __ARM_BIG_ENDIAN
204+
#define SLJIT_BIG_ENDIAN 1
205+
#else
206+
#define SLJIT_LITTLE_ENDIAN 1
207+
#endif
208+
209+
#elif (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC)
210+
211+
#ifdef __LITTLE_ENDIAN__
212+
#define SLJIT_LITTLE_ENDIAN 1
213+
#else
214+
#define SLJIT_BIG_ENDIAN 1
215+
#endif
216+
217+
#elif (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
218+
219+
#ifdef __MIPSEL__
220+
#define SLJIT_LITTLE_ENDIAN 1
221+
#else
222+
#define SLJIT_BIG_ENDIAN 1
223+
#endif
224+
225+
#ifndef SLJIT_MIPS_REV
226+
227+
/* Auto detecting mips revision. */
228+
#if (defined __mips_isa_rev) && (__mips_isa_rev >= 6)
229+
#define SLJIT_MIPS_REV 6
230+
#elif defined(__mips_isa_rev) && __mips_isa_rev >= 1
231+
#define SLJIT_MIPS_REV __mips_isa_rev
232+
#elif defined(__clang__) \
233+
&& (defined(_MIPS_ARCH_OCTEON) || defined(_MIPS_ARCH_P5600))
234+
/* clang either forgets to define (clang-7) __mips_isa_rev at all
235+
* or sets it to zero (clang-8,-9) for -march=octeon (MIPS64 R2+)
236+
* and -march=p5600 (MIPS32 R5).
237+
* It also sets the __mips macro to 64 or 32 for -mipsN when N <= 5
238+
* (should be set to N exactly) so we cannot rely on this too.
239+
*/
240+
#define SLJIT_MIPS_REV 1
241+
#endif
242+
243+
#endif /* !SLJIT_MIPS_REV */
244+
245+
#elif (defined SLJIT_CONFIG_S390X && SLJIT_CONFIG_S390X)
246+
247+
#define SLJIT_BIG_ENDIAN 1
248+
249+
#else
250+
251+
#define SLJIT_LITTLE_ENDIAN 1
252+
253+
#endif
254+
255+
#endif /* !defined(SLJIT_BIG_ENDIAN) && !defined(SLJIT_LITTLE_ENDIAN) */
256+
257+
#if (defined(SLJIT_CONFIG_ARM_64) && SLJIT_CONFIG_ARM_64) \
258+
&& (defined(SLJIT_BIG_ENDIAN) && SLJIT_BIG_ENDIAN)
259+
260+
#undef SLJIT_CONFIG_ARM_64
261+
#define SLJIT_CONFIG_UNSUPPORTED 1
262+
186263
#endif
187264

188265
#endif /* SLJIT_CONFIG_CPU_H_ */

0 commit comments

Comments
 (0)