From 2a5d2944dd0d77247764fd9b2a656d86f1a89e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 24 Jul 2017 09:46:09 +0200 Subject: [PATCH] Fix a compiler warning in JIT code for ppc32 --- pcre2-10.30-RC1-JIT-compiler-update.patch | 66 +++++++++++++++++++++++ pcre2.spec | 8 ++- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 pcre2-10.30-RC1-JIT-compiler-update.patch diff --git a/pcre2-10.30-RC1-JIT-compiler-update.patch b/pcre2-10.30-RC1-JIT-compiler-update.patch new file mode 100644 index 0000000..97945e6 --- /dev/null +++ b/pcre2-10.30-RC1-JIT-compiler-update.patch @@ -0,0 +1,66 @@ +From 811cdcf78d9bab7d8309accc68b70f315e1193b2 Mon Sep 17 00:00:00 2001 +From: zherczeg +Date: Mon, 24 Jul 2017 04:05:38 +0000 +Subject: [PATCH] JIT compiler update. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@847 6239d852-aaf2-0410-a92c-79f79f948069 +Signed-off-by: Petr Písař +--- + src/sljit/sljitLir.c | 7 +++---- + src/sljit/sljitNativePPC_common.c | 3 +-- + 2 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/src/sljit/sljitLir.c b/src/sljit/sljitLir.c +index d64b62e..66cdda3 100644 +--- a/src/sljit/sljitLir.c ++++ b/src/sljit/sljitLir.c +@@ -124,10 +124,10 @@ + /* SLJIT_REWRITABLE_JUMP is 0x1000. */ + + #if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) +-# define PATCH_MB 0x4 +-# define PATCH_MW 0x8 ++# define PATCH_MB 0x4 ++# define PATCH_MW 0x8 + #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) +-# define PATCH_MD 0x10 ++# define PATCH_MD 0x10 + #endif + #endif + +@@ -1555,7 +1555,6 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_cmov(struct sljit_compile + sljit_s32 dst_reg, + sljit_s32 src, sljit_sw srcw) + { +-(void)srcw; /* To stop compiler warning */ + #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) + CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_I32_OP))); + CHECK_ARGUMENT((type & 0xff) >= SLJIT_EQUAL && (type & 0xff) <= SLJIT_ORDERED_F64); +diff --git a/src/sljit/sljitNativePPC_common.c b/src/sljit/sljitNativePPC_common.c +index 775c708..e76deb7 100644 +--- a/src/sljit/sljitNativePPC_common.c ++++ b/src/sljit/sljitNativePPC_common.c +@@ -2282,16 +2282,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_flags(struct sljit_compiler *co + FAIL_IF(emit_op_mem2(compiler, input_flags | LOAD_DATA, TMP_REG1, dst, dstw, dst, dstw)); + + invert = 0; ++ cr_bit = 0; + + switch (type & 0xff) { + case SLJIT_LESS: + case SLJIT_SIG_LESS: +- cr_bit = 0; + break; + + case SLJIT_GREATER_EQUAL: + case SLJIT_SIG_GREATER_EQUAL: +- cr_bit = 0; + invert = 1; + break; + +-- +2.9.4 + diff --git a/pcre2.spec b/pcre2.spec index a5698dd..a55d930 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -2,7 +2,7 @@ %global rcversion RC1 Name: pcre2 Version: 10.30 -Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist} +Release: %{?rcversion:0.}2%{?rcversion:.%rcversion}%{?dist} %global myversion %{version}%{?rcversion:-%rcversion} Summary: Perl-compatible regular expression library # the library: BSD with exceptions @@ -47,6 +47,8 @@ Patch2: pcre2-10.30-RC1-Put-back-pcre2_set_recursion_limit-as-a-real-functio # Correct formatting a size_t variable, in upstream after 10.23-RC1, # Patch3: pcre2-10.30-RC1-Fix-formatting-converted_length.patch +# Fix a compiler warning in JIT code for ppc32, in upstream after 10.30-RC1 +Patch4: pcre2-10.30-RC1-JIT-compiler-update.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: coreutils @@ -125,6 +127,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Because of multilib patch libtoolize --copy --force autoreconf -vif @@ -224,6 +227,9 @@ make %{?_smp_mflags} check VERBOSE=yes %{_mandir}/man1/pcre2test.* %changelog +* Mon Jul 24 2017 Petr Pisar - 10.30-0.2.RC1 +- Fix a compiler warning in JIT code for ppc32 + * Thu Jul 20 2017 Petr Pisar - 10.30-0.1.RC1 - 10.30-RC1 bump - Heap-based matching implementation replaced stack-based one