From a903328a1bb8cdbde817b94cbeb5cbe1067a0fb3 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <david.abdurachmanov@gmail.com>
Date: Sun, 10 Jun 2018 18:15:02 +0200
Subject: [PATCH] Improve riscv64 (libatomic, lg_page, THP)

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
---
 jemalloc.spec | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/jemalloc.spec b/jemalloc.spec
index 73ca9e7..e5b30c7 100644
--- a/jemalloc.spec
+++ b/jemalloc.spec
@@ -1,7 +1,7 @@
 Name:           jemalloc
 Version:        5.1.0
 
-Release:        1.0.riscv64%{?dist}
+Release:        1.1.riscv64%{?dist}
 Summary:        General-purpose scalable concurrent malloc implementation
 
 Group:          System Environment/Libraries
@@ -11,9 +11,12 @@ Source0:        https://github.com/jemalloc/%{name}/releases/download/%{version}
 
 BuildRequires:  /usr/bin/xsltproc
 BuildRequires:  perl-generators
-%ifnarch s390 %{mips} riscv64
+%ifarch %{valgrind_arches}
 BuildRequires:  valgrind-devel
 %endif
+%ifarch riscv64
+BuildRequires: libatomic
+%endif
 
 %description
 General-purpose scalable concurrent malloc(3) implementation.
@@ -32,7 +35,7 @@ developing applications that use %{name}.
 %setup -q
 
 # Override PAGESIZE, bz #1545539
-%ifarch %ix86 %arm x86_64 s390x
+%ifarch %ix86 %arm x86_64 s390x riscv64
 %define lg_page --with-lg-page=12
 %endif
 
@@ -41,7 +44,7 @@ developing applications that use %{name}.
 %endif
 
 # Disable thp on systems not supporting this for now
-%ifarch %ix86 %arm aarch64 s390x
+%ifarch %ix86 %arm aarch64 s390x riscv64
 %define disable_thp --disable-thp
 %endif
 
@@ -57,6 +60,10 @@ CFLAGS="%{optflags} -msse2"
 export LDFLAGS="%{?__global_ldflags} -lrt"
 %endif
 
+%ifarch riscv64
+export LDFLAGS="$LDFLAGS -latomic"
+%endif
+
 echo "For debugging package builders"
 echo "What is the pagesize?"
 getconf PAGESIZE
@@ -107,6 +114,12 @@ find %{buildroot}%{_libdir}/ -name '*.a' -exec rm -vf {} ';'
 %ldconfig_scriptlets
 
 %changelog
+* Sun Jun 10 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 5.1.0-1.1.riscv64
+- Switch to %{valgrind_arches}
+- Link to libatomic
+- Set lg_page to 12 (4K page)
+- Disable THP
+
 * Wed May 09 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 5.1.0-1.0.riscv64
 - Disable valgrind for riscv64