diff --git a/.gitignore b/.gitignore
index c451065..7c3d7f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
/valgrind-3.14.0.tar.bz2
/valgrind-3.15.0.RC1.tar.bz2
/valgrind-3.15.0.RC2.tar.bz2
+/valgrind-3.15.0.tar.bz2
diff --git a/sources b/sources
index a3eb9d4..48e97e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (valgrind-3.15.0.RC2.tar.bz2) = 8c8d6fc82e26b3c02a042279f1b135b65299772ebd7103e8159f26d83482ea8e8f8917a6be7fd5bcdce84e5193fa163d39e631db6fb8cb11fe750c3d60813756
+SHA512 (valgrind-3.15.0.tar.bz2) = 5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f
diff --git a/valgrind-3.15.0-arm64-Ity_F16.patch b/valgrind-3.15.0-arm64-Ity_F16.patch
deleted file mode 100644
index 2c34fe2..0000000
--- a/valgrind-3.15.0-arm64-Ity_F16.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 270037da8b508954f0f7d703a0bebf5364eec548
-Author: Julian Seward <jseward@acm.org>
-Date: Sat Apr 13 12:34:06 2019 +0200
-
- Bug 406465 - arm64 instruction selector fails on "t0 = <expr>" where <expr> has type Ity_F16.
-
-diff --git a/VEX/priv/host_arm64_isel.c b/VEX/priv/host_arm64_isel.c
-index 49d0f0b..b2ab742 100644
---- a/VEX/priv/host_arm64_isel.c
-+++ b/VEX/priv/host_arm64_isel.c
-@@ -3391,6 +3391,10 @@ static HReg iselF16Expr_wrk ( ISelEnv* env, IRExpr* e )
- vassert(e);
- vassert(ty == Ity_F16);
-
-+ if (e->tag == Iex_RdTmp) {
-+ return lookupIRTemp(env, e->Iex.RdTmp.tmp);
-+ }
-+
- if (e->tag == Iex_Get) {
- Int offs = e->Iex.Get.offset;
- if (offs >= 0 && offs < 8192 && 0 == (offs & 1)) {
-@@ -3706,6 +3710,12 @@ static void iselStmt ( ISelEnv* env, IRStmt* stmt )
- addInstr(env, ARM64Instr_VMov(8/*yes, really*/, dst, src));
- return;
- }
-+ if (ty == Ity_F16) {
-+ HReg src = iselF16Expr(env, stmt->Ist.WrTmp.data);
-+ HReg dst = lookupIRTemp(env, tmp);
-+ addInstr(env, ARM64Instr_VMov(8/*yes, really*/, dst, src));
-+ return;
-+ }
- if (ty == Ity_V128) {
- HReg src = iselV128Expr(env, stmt->Ist.WrTmp.data);
- HReg dst = lookupIRTemp(env, tmp);
diff --git a/valgrind-3.15.0-filter-libc-futex.patch b/valgrind-3.15.0-filter-libc-futex.patch
deleted file mode 100644
index f4fad64..0000000
--- a/valgrind-3.15.0-filter-libc-futex.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/filter_libc b/tests/filter_libc
-index 9607db5..8eb9911 100755
---- a/tests/filter_libc
-+++ b/tests/filter_libc
-@@ -37,6 +37,8 @@ while (<>)
- s/(at.*)operator delete\[\]\(void\*\)/$1...operator delete[].../;
-
- # Some glibc versions complain about unexpected futex syscall errors.
-+ # With or without newline (see sourceware PR20271).
-+ next if /^The futex facility returned an unexpected error code.$/;
- s/The futex facility returned an unexpected error code.//;
-
- print;
diff --git a/valgrind-3.15.0-mmap-32bit.patch b/valgrind-3.15.0-mmap-32bit.patch
deleted file mode 100644
index 1956246..0000000
--- a/valgrind-3.15.0-mmap-32bit.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 535d2ff4f2f755faa8b1a9e467833eca455bd2d7
-Author: Mark Wielaard <mark@klomp.org>
-Date: Thu Apr 11 18:06:34 2019 +0200
-
- none/tests/amd64-linux/map_32bits.vgtest fails too easily
-
- On various systems none/tests/amd64-linux/map_32bits.vgtest fails with:
- first mmap: Cannot allocate memory.
-
- The problem is that the --aspace-minaddr is too tight. Newer glibc seem
- to mmap some memory and so even our first mmap with MMAP_32BIT will fail.
-
- The solution is to make a bit more memory < 2GB available.
- If there is 16MB available the test always seems to succeed without
- needing too many tries. The original 256K is too low.
-
- https://bugs.kde.org/show_bug.cgi?id=406422
-
-diff --git a/none/tests/amd64-linux/map_32bits.vgtest b/none/tests/amd64-linux/map_32bits.vgtest
-index 2b7f3a0..43011e3 100644
---- a/none/tests/amd64-linux/map_32bits.vgtest
-+++ b/none/tests/amd64-linux/map_32bits.vgtest
-@@ -1,5 +1,5 @@
- prog: map_32bits
- # take a big aspacemgr minaddr, to quickly reach the 2GB limit
--vgopts: -q --aspace-minaddr=0x7ff60000
-+vgopts: -q --aspace-minaddr=0x7f000000
- stderr_filter: filter_stderr
-
diff --git a/valgrind.spec b/valgrind.spec
index 0c03dc4..aae28d7 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
Summary: Tool for finding memory management bugs in programs
Name: %{?scl_prefix}valgrind
Version: 3.15.0
-Release: 0.8.RC2%{?dist}
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+
URL: http://www.valgrind.org/
@@ -72,7 +72,7 @@ URL: http://www.valgrind.org/
# So those will already have their full symbol table.
%undefine _include_minidebuginfo
-Source0: ftp://sourceware.org/pub/valgrind/valgrind-%{version}.RC2.tar.bz2
+Source0: ftp://sourceware.org/pub/valgrind/valgrind-%{version}.tar.bz2
# Needs investigation and pushing upstream
Patch1: valgrind-3.9.0-cachegrind-improvements.patch
@@ -88,21 +88,12 @@ Patch3: valgrind-3.9.0-ldso-supp.patch
# same directory is used independent of arch.
Patch4: valgrind-3.15.0-pkglibexecdir.patch
-# KDE#405205 filter_libc: remove the futex syscall error line entirely
-Patch5: valgrind-3.15.0-filter-libc-futex.patch
-
-# KDE#406422 none/tests/amd64-linux/map_32bits.vgtest fails too easily
-Patch6: valgrind-3.15.0-mmap-32bit.patch
-
# KDE#398649 s390x z13 support doesn't build with older gcc/binutils
# Disable z13 support (on rhel6)
-Patch7: valgrind-3.15.0-disable-s390x-z13.patch
+Patch5: valgrind-3.15.0-disable-s390x-z13.patch
# Add some stack-protector
-Patch8: valgrind-3.15.0-some-stack-protector.patch
-
-# KDE#406465 arm64 selector fails on "t0 = <expr>" where <expr> type Ity_F16.
-Patch9: valgrind-3.15.0-arm64-Ity_F16.patch
+Patch6: valgrind-3.15.0-some-stack-protector.patch
BuildRequires: glibc-devel
@@ -219,27 +210,23 @@ Valgrind User Manual for details.
%endif
%prep
-%setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}.RC2
+%setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
# Disable s390x z13 support on old rhel, binutils is just too old.
%if 0%{?rhel} == 6
-%patch7 -p1
+%patch5 -p1
%endif
# Old rhel gcc doesn't have -fstack-protector-strong.
%if 0%{?fedora} || 0%{?rhel} >= 7
-%patch8 -p1
+%patch6 -p1
%endif
-%patch9 -p1
-
%build
@@ -460,8 +447,13 @@ fi
%endif
%changelog
-* Tue Apr 16 2019 Mark Wielaard <mjw@fedoraproject.org>
+* Tue Apr 16 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-1
- On ppc64[be] -fexceptions is troublesome.
+- valgrind-3.15.0 final
+ Remove upstreamed patches
+ - valgrind-3.15.0-arm64-Ity_F16.patch
+ - valgrind-3.15.0-filter-libc-futex.patch
+ - valgrind-3.15.0-mmap-32bit.patch
* Sun Apr 14 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-0.8.RC2
- Adding of stack-protector flag should only be done with newer gcc.