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

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
Disable execstack for riscv64
2018-09-22 11:11:31 +03:00 · 2018-06-04 17:16:40 +02:00 · 2018-06-04 08:30:21 +02:00 · 2018-06-03 23:19:56 +02:00 · 2018-06-03 20:11:09 +02:00 · 2018-06-03 20:01:17 +02:00
3 changed files with 4630 additions and 1 deletions
--- a/openblas-0.3.0-disable-tests.patch
+++ b/openblas-0.3.0-disable-tests.patch
@ -0,0 +1,13 @@
+diff --git a/OpenBLAS-0.3.0/Makefile b/OpenBLAS-0.3.0/Makefile
+index 679bc8d..a8e26b3 100644
+--- a/OpenBLAS-0.3.0/Makefile
+++ b/OpenBLAS-0.3.0/Makefile
+@@ -28,7 +28,7 @@ SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench
+ .PHONY : all libs netlib $(RELA) test ctest shared install
+ .NOTPARALLEL : all libs $(RELA) prof lapack-test install blas-test
+ 
+-all :: libs netlib $(RELA) tests shared
+all :: libs netlib $(RELA) shared
+ 	@echo
+ 	@echo " OpenBLAS build complete. ($(LIB_COMPONENTS))"
+ 	@echo
--- a/openblas-0.3.0-riscv64.patch
+++ b/openblas-0.3.0-riscv64.patch
--- a/openblas.spec
+++ b/openblas.spec
@ -15,7 +15,7 @@

 Name:           openblas
 Version:        0.3.3
-Release:        1%{?dist}
+Release:        1.0.riscv64%{?dist}
 Summary:        An optimized BLAS library based on GotoBLAS2
 Group:          Development/Libraries
 License:        BSD
@ -29,6 +29,12 @@ Patch1:         openblas-0.2.5-libname.patch
 Patch2:         openblas-0.2.15-constructor.patch
 # Supply the proper flags to the test makefile
 Patch3:         openblas-0.3.2-tests.patch
+# Add support for RISC-V (riscv64)
+# Taken from https://github.com/xianyi/OpenBLAS/pull/1526
+# No additional modifications done
+Patch5:         openblas-0.3.0-riscv64.patch
+# Disable running of tests
+Patch6:         openblas-0.3.0-disable-tests.patch

 BuildRequires:  gcc
 BuildRequires:  gcc-gfortran
@ -42,8 +48,12 @@ BuildRequires:  perl-devel
 %global execstack 1
 %endif
 %else
+%ifarch riscv64
+%global execstack 0
+%else
 %global execstack 1
 %endif
+%endif
 %if %{execstack}
 BuildRequires:  /usr/bin/execstack
 %endif
@ -250,6 +260,10 @@ cd OpenBLAS-%{version}
 %patch2 -p1 -b .constructor
 %endif
 %patch3 -p1 -b .tests
+%patch5 -p2 -b .riscv64
+%ifarch riscv64
+%patch6 -p2 -b .disable-tests
+%endif

 # Fix source permissions
 find -name \*.f -exec chmod 644 {} \;
@ -387,6 +401,9 @@ TARGET="TARGET=POWER8 DYNAMIC_ARCH=0"
 %ifarch aarch64
 TARGET="TARGET=ARMV8 DYNAMIC_ARCH=0"
 %endif
+%ifarch riscv64
+TARGET="TARGET=RISCV64 DYNAMIC_ARCH=0"
+%endif
 %ifarch s390x
 TARGET="TARGET=ZARCH_GENERIC DYNAMIC_ARCH=0"
 %endif
@ -464,6 +481,9 @@ suffix="_armv8"
 %ifarch s390x
 suffix="_zarch_generic"
 %endif
+%ifarch riscv64
+suffix="_riscv64"
+%endif
 slibname=`basename %{buildroot}%{_libdir}/libopenblas${suffix}-*.so .so`
 mv %{buildroot}%{_libdir}/${slibname}.a %{buildroot}%{_libdir}/lib%{name}.a
 if [[ "$suffix" != "" ]]; then
@ -689,6 +709,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
 %endif

 %changelog
+* Sat Sep 22 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 0.3.3-1.0.riscv64
+- Add support for RISC-V (riscv64)
+
 * Sun Sep 09 2018 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.3-1
 - Update to 0.3.3.
Author	SHA1	Message	Date
David Abdurachmanov	0cd9fe5678	Merge remote-tracking branch 'up/f29' into f29-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-09-22 11:11:31 +03:00
David Abdurachmanov	d6da2377d6	Disable execstack for riscv64 BUILDSTDERR: execstack: "/builddir/build/BUILDROOT/openblas-0.3.0-1.1.riscv64.fc29.riscv64/usr/lib64/libopenblas-r0.3.0.dev.so"'s architecture is not supported Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-04 17:16:40 +02:00
David Abdurachmanov	79be0c377b	Disable running of all tests on RISC-V Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-04 08:30:21 +02:00
David Abdurachmanov	0c4b2cc81f	Remove ARCH=riscv64 Remove as we end up with: riscv64 -ru ../../libRblas_riscv64-r0.3.0.dev.a sbdsvdx.o spotrf2.o .. BUILDSTDERR: make[2]: riscv64: Command not found This happens in lapack-netlib/SRC/Makefile:556 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-03 23:19:56 +02:00
David Abdurachmanov	7a6b8e0347	Add ARCH=riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-03 20:11:09 +02:00
David Abdurachmanov	2757a8b851	Add TARGET=RISCV64 for riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-03 20:01:17 +02:00
David Abdurachmanov	7af5bb9a21	Add support for RISC-V (riscv64) Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-03 15:45:23 +02:00