Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>

jemalloc.spec

@@ -1,7 +1,7 @@
 Name:           jemalloc
 Version:        5.2.0
 
-Release:        1%{?dist}
+Release:        1.0.riscv64%{?dist}
 Summary:        General-purpose scalable concurrent malloc implementation
 
 License:        BSD
@@ -11,9 +11,12 @@ Source0:        https://github.com/jemalloc/%{name}/releases/download/%{version}
 BuildRequires:  gcc
 BuildRequires:  /usr/bin/xsltproc
 BuildRequires:  perl-generators
-%ifnarch s390 %{mips}
+%ifarch %{valgrind_arches}
 BuildRequires:  valgrind-devel
 %endif
+%ifarch riscv64
+BuildRequires: libatomic
+%endif
 
 %description
 General-purpose scalable concurrent malloc(3) implementation.
@@ -31,7 +34,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
 
@@ -40,7 +43,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
 
@@ -56,6 +59,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
@@ -104,6 +111,12 @@ find %{buildroot}%{_libdir}/ -name '*.a' -exec rm -vf {} ';'
 %ldconfig_scriptlets
 
 %changelog
+* Thu Jun 20 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 5.2.0-1.0.riscv64
+- Switch to %{valgrind_arches}
+- Link to libatomic
+- Set lg_page to 12 (4K page)
+- Disable THP
+
 * Wed Apr 03 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 5.2.0-1
 - New upstream release