diff --git a/.gitignore b/.gitignore index e3a819a..ee875bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pcre2-10.10.tar.bz2 +/pcre2-10.20-RC1.tar.bz2 diff --git a/0001-Fix-ARM64-SP-alignment-issue-in-JIT.patch b/0001-Fix-ARM64-SP-alignment-issue-in-JIT.patch deleted file mode 100644 index 5cc1e05..0000000 --- a/0001-Fix-ARM64-SP-alignment-issue-in-JIT.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 004bc565415a656a8fc8a61971af7f5493cf8786 Mon Sep 17 00:00:00 2001 -From: zherczeg -Date: Thu, 23 Apr 2015 13:53:29 +0000 -Subject: [PATCH] Fix ARM64 SP alignment issue in JIT. - -git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@254 6239d852-aaf2-0410-a92c-79f79f948069 ---- - src/sljit/sljitNativeARM_64.c | 37 +++++++++++++++++++++++-------------- - 1 file changed, 23 insertions(+), 14 deletions(-) - -diff --git a/src/sljit/sljitNativeARM_64.c b/src/sljit/sljitNativeARM_64.c -index c5251be..b66455f 100644 ---- a/src/sljit/sljitNativeARM_64.c -+++ b/src/sljit/sljitNativeARM_64.c -@@ -1081,12 +1081,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_enter(struct sljit_compiler *compil - FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(TMP_SP) | (0 << 10))); - offs = (local_size - saved_regs_size) << (15 - 3); - } else { -- compiler->local_size += 2 * sizeof(sljit_sw); -- local_size -= saved_regs_size; -- saved_regs_size += 2 * sizeof(sljit_sw); -- FAIL_IF(push_inst(compiler, STP_PRE | 29 | RT2(TMP_LR) -- | RN(TMP_SP) | ((-(saved_regs_size >> 3) & 0x7f) << 15))); -- offs = 2 << 15; -+ offs = 0 << 15; -+ if (saved_regs_size & 0x8) { -+ offs = 1 << 15; -+ saved_regs_size += sizeof(sljit_sw); -+ } -+ local_size -= saved_regs_size + SLJIT_LOCALS_OFFSET; -+ FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10))); - } - - tmp = saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - saveds) : SLJIT_FIRST_SAVED_REG; -@@ -1122,6 +1123,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_enter(struct sljit_compiler *compil - } - if (local_size) - FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | (local_size << 10))); -+ FAIL_IF(push_inst(compiler, STP_PRE | 29 | RT2(TMP_LR) -+ | RN(TMP_SP) | ((-(16 >> 3) & 0x7f) << 15))); - FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(TMP_SP) | (0 << 10))); - } - -@@ -1145,8 +1148,6 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_set_context(struct sljit_compiler *compi - - local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds, 0) + SLJIT_LOCALS_OFFSET; - local_size = (local_size + 15) & ~0xf; -- if (local_size > (63 * sizeof(sljit_sw))) -- local_size += 2 * sizeof(sljit_sw); - compiler->local_size = local_size; - return SLJIT_SUCCESS; - } -@@ -1167,16 +1168,20 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_return(struct sljit_compiler *compi - if (local_size <= (63 * sizeof(sljit_sw))) - offs = (local_size - saved_regs_size) << (15 - 3); - else { -- saved_regs_size += 2 * sizeof(sljit_sw); -- local_size -= saved_regs_size; -+ FAIL_IF(push_inst(compiler, LDP_PST | 29 | RT2(TMP_LR) -+ | RN(TMP_SP) | (((16 >> 3) & 0x7f) << 15))); -+ offs = 0 << 15; -+ if (saved_regs_size & 0x8) { -+ offs = 1 << 15; -+ saved_regs_size += sizeof(sljit_sw); -+ } -+ local_size -= saved_regs_size + SLJIT_LOCALS_OFFSET; - if (local_size > 0xfff) { - FAIL_IF(push_inst(compiler, ADDI | RD(TMP_SP) | RN(TMP_SP) | ((local_size >> 12) << 10) | (1 << 22))); - local_size &= 0xfff; - } - if (local_size) - FAIL_IF(push_inst(compiler, ADDI | RD(TMP_SP) | RN(TMP_SP) | (local_size << 10))); -- local_size = saved_regs_size; -- offs = 2 << 15; - } - - tmp = compiler->saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - compiler->saveds) : SLJIT_FIRST_SAVED_REG; -@@ -1204,8 +1209,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_return(struct sljit_compiler *compi - if (prev != -1) - FAIL_IF(push_inst(compiler, LDRI | RT(prev) | RN(TMP_SP) | (offs >> 5))); - -- FAIL_IF(push_inst(compiler, LDP_PST | 29 | RT2(TMP_LR) -- | RN(TMP_SP) | (((local_size >> 3) & 0x7f) << 15))); -+ if (compiler->local_size <= (63 * sizeof(sljit_sw))) { -+ FAIL_IF(push_inst(compiler, LDP_PST | 29 | RT2(TMP_LR) -+ | RN(TMP_SP) | (((local_size >> 3) & 0x7f) << 15))); -+ } else { -+ FAIL_IF(push_inst(compiler, ADDI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10))); -+ } - - FAIL_IF(push_inst(compiler, RET | RN(TMP_LR))); - return SLJIT_SUCCESS; --- -2.4.0 - diff --git a/pcre2.spec b/pcre2.spec index 1399c68..8545263 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -1,26 +1,29 @@ # This is stable release: -#%%global rcversion RC1 +%global rcversion RC1 Name: pcre2 -Version: 10.10 -Release: %{?rcversion:0.}3%{?rcversion:.%rcversion}%{?dist}.1 +Version: 10.20 +Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist} %global myversion %{version}%{?rcversion:-%rcversion} Summary: Perl-compatible regular expression library Group: System Environment/Libraries -# The library: BSD +# the library: BSD # pcre2test (linked to GNU readline): BSD (linked to GPLv3+) +#Not distributed in binary package # autotools: GPLv3+ with exception +# install-sh: MIT License: BSD URL: http://www.pcre.org/ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{?rcversion:Testing/}%{name}-%{myversion}.tar.bz2 # Do no set RPATH if libdir is not /usr/lib Patch0: pcre2-10.10-Fix-multilib.patch -Patch1: 0001-Fix-ARM64-SP-alignment-issue-in-JIT.patch # New libtool to get rid of RPATH and to use distribution autotools BuildRequires: autoconf BuildRequires: automake +BuildRequires: coreutils BuildRequires: glibc-headers BuildRequires: libtool +BuildRequires: make BuildRequires: readline-devel %description @@ -73,7 +76,6 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test. %prep %setup -q -n %{name}-%{myversion} %patch0 -p1 -%patch1 -p1 # Because of multilib patch libtoolize --copy --force && autoreconf -vif @@ -151,6 +153,9 @@ make %{?_smp_mflags} check VERBOSE=yes %{_mandir}/man1/pcre2test.* %changelog +* Fri Jun 19 2015 Petr Pisar - 10.20-0.1.RC1 +- 10.20-RC1 bump + * Thu Jun 18 2015 Fedora Release Engineering - 10.10-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 89e4bc5..3d3c245 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87fd7899e3eaae3dd0b4df4b502ecf68 pcre2-10.10.tar.bz2 +7999e2d0ea0f57ec4506f033d5f62ae5 pcre2-10.20-RC1.tar.bz2