Merge pull request !1 from syyhao/init
This commit is contained in:
openeuler-ci-bot 2020-01-12 10:10:50 +08:00 committed by Gitee
commit 2f92411f39
2 changed files with 7 additions and 26 deletions

View File

@ -1,24 +0,0 @@
Fix recursion stack estimator
Due to inlining match() by recent GCC, the stack estimator reported 4-bytes
stack consumption.
Author: Sergei Golubchik <vuvova@gmail.com>
<https://bugs.exim.org/show_bug.cgi?id=2173>
diff --git a/pcre/pcre_exec.c b/pcre/pcre_exec.c
--- a/pcre_exec.c
+++ b/pcre_exec.c
@@ -509,6 +509,12 @@
(e.g. stopped by repeated call or recursion limit)
*/
+#ifdef __GNUC__
+static int
+match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
+ PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
+ unsigned int rdepth) __attribute__((noinline,noclone));
+#endif
static int
match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,

View File

@ -1,6 +1,6 @@
Name: pcre
Version: 8.43
Release: 4
Release: 5
Summary: Perl Compatible Regular Expressions
## Source package only:
# INSTALL: FSFAP
@ -26,7 +26,6 @@ Summary: Perl Compatible Regular Expressions
License: BSD
URL: http://www.pcre.org/
Source0: https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2
Patch0: pcre-8.41-fix_stack_estimator.patch
BuildRequires: readline-devel autoconf automake coreutils
BuildRequires: gcc git gcc-c++ glibc-common libtool make
BuildRequires: bash diffutils grep
@ -109,6 +108,12 @@ make check VERBOSE=yes
%{_mandir}/man3/*
%changelog
* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 8.43-5
- Type: enhancement
- ID: NA
- SUG: NA
- DESC: remove unnecessary files
* Mon Nov 11 2019 shenyangyang <shenyangyang4@huawei.com> - 8.43-4
- Type: enhancement
- ID: NA