15 files changed, 11 insertions, 219 deletions

diff --git a/math/openblas/files/patch-Makefile b/math/openblas/files/patch-Makefile
deleted file mode 100644
index 40d2c20099ea..000000000000
--- a/math/openblas/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2015-10-27 20:44:50 UTC
-+++ Makefile
-@@ -238,7 +238,7 @@ ifndef NOFORTRAN
- 	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "override CFLAGS      = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
--	-@echo "ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
-+	-@echo "ARCH_       = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
diff --git a/math/openblas/files/patch-Makefile.rule b/math/openblas/files/patch-Makefile.rule
deleted file mode 100644
index f85e73064fa8..000000000000
--- a/math/openblas/files/patch-Makefile.rule
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.rule.orig	2015-10-27 20:44:50 UTC
-+++ Makefile.rule
-@@ -19,10 +19,10 @@ VERSION = 0.2.15
- 
- # C compiler including binary type(32bit / 64bit). Default is gcc.
- # Don't use Intel Compiler or PGI, it won't generate right codes as I expect.
--# CC = gcc
-+CC = %%CC%%
- 
- # Fortran compiler. Default is g77.
--# FC = gfortran
-+FC = %%FC%%
- 
- # Even you can specify cross compiler. Meanwhile, please set HOSTCC.
- 
diff --git a/math/openblas/files/patch-Makefile.system b/math/openblas/files/patch-Makefile.system
deleted file mode 100644
index aed8055a68c7..000000000000
--- a/math/openblas/files/patch-Makefile.system
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.system.orig	2015-10-27 20:44:50 UTC
-+++ Makefile.system
-@@ -218,6 +218,7 @@ MD5SUM = md5 -r
- endif
- 
- ifeq ($(OSNAME), FreeBSD)
-+EXTRALIB	+= -lm %%LDFLAGS%%
- MD5SUM = md5 -r
- endif
- 
-@@ -889,9 +890,17 @@ SYMBOLSUFFIX =
- endif
- 
- ifndef LIBNAMESUFFIX
-+ifndef SMP
- LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
- else
-+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)
-+endif
-+else
-+ifndef SMP
- LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
-+else
-+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
-+endif
- endif
- 
- KERNELDIR	= $(TOPDIR)/kernel/$(ARCH)
-@@ -1020,24 +1029,8 @@ ifndef LIBSUFFIX
- LIBSUFFIX = a
- endif
- 
--ifneq ($(DYNAMIC_ARCH), 1)
--ifndef SMP
--LIBNAME		= $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX)
--LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX)
--else
--LIBNAME		= $(LIBPREFIX)_$(LIBCORE)p$(REVISION).$(LIBSUFFIX)
--LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX)
--endif
--else
--ifndef SMP
- LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
- LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
--else
--LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
--LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
--endif
--endif
--
- 
- LIBDLLNAME   = $(LIBPREFIX).dll
- LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so)
-@@ -1067,7 +1060,7 @@ LIB_COMPONENTS = CBLAS
- endif
- 
- export OSNAME
--export ARCH
-+export ARCH_
- export CORE
- export LIBCORE
- export PGCPATH
diff --git a/math/openblas/files/patch-c_check b/math/openblas/files/patch-c_check
index e2254a3081e2..817371d8f62f 100644
--- a/math/openblas/files/patch-c_check
+++ b/math/openblas/files/patch-c_check
@@ -1,6 +1,6 @@
---- c_check.orig	2015-10-27 20:44:50 UTC
+--- c_check.orig	2019-04-29 17:22:19 UTC
 +++ c_check
-@@ -235,7 +235,7 @@ open(CONFFILE, "> $config"  ) || die "Ca
+@@ -320,7 +320,7 @@ open(CONFFILE, "> $config"  ) || die "Can't create $co
  # print $data, "\n";
  
  print MAKEFILE "OSNAME=$os\n";
diff --git a/math/openblas/files/patch-common__arm.h b/math/openblas/files/patch-common__arm.h
index f42591543dc0..7c6e402278e2 100644
--- a/math/openblas/files/patch-common__arm.h
+++ b/math/openblas/files/patch-common__arm.h
@@ -1,6 +1,6 @@
---- common_arm.h.orig	2016-09-01 03:58:42 UTC
+--- common_arm.h.orig	2018-08-30 22:07:48 UTC
 +++ common_arm.h
-@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasint x, blasint
+@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasint x, blasint 
  
  #endif
  
diff --git a/math/openblas/files/patch-common__power.h b/math/openblas/files/patch-common__power.h
deleted file mode 100644
index cf1ac03278e5..000000000000
--- a/math/openblas/files/patch-common__power.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- common_power.h.orig	2017-07-24 04:03:35 UTC
-+++ common_power.h
-@@ -241,7 +241,7 @@ static inline int blas_quickdivide(blasint x, blasint 
- #define HAVE_PREFETCH
- #endif
- 
--#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8)
-+#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8) || defined(PPC970)
- #define DCBT_ARG	0
- #else
- #define DCBT_ARG	8
-@@ -499,7 +499,7 @@ static inline int blas_quickdivide(blasint x, blasint 
- 
- #if defined(ASSEMBLER) && !defined(NEEDPARAM)
- 
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- #ifndef __64BIT__
- #define PROLOGUE \
- 	.section .text;\
-@@ -774,7 +774,7 @@ Lmcount$lazy_ptr:
- 
- #define HALT		mfspr	r0, 1023
- 
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- #if defined(PPC440) || defined(PPC440FP2)
- #undef  MAX_CPU_NUMBER
- #define MAX_CPU_NUMBER 1
-@@ -819,7 +819,7 @@ Lmcount$lazy_ptr:
- #define MAP_ANONYMOUS MAP_ANON
- #endif
- 
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- #ifndef __64BIT__
- #define FRAMESLOT(X) (((X) * 4) + 8)
- #else
diff --git a/math/openblas/files/patch-cpuid__arm64.c b/math/openblas/files/patch-cpuid__arm64.c
index a0d2451ebe22..592272acf705 100644
--- a/math/openblas/files/patch-cpuid__arm64.c
+++ b/math/openblas/files/patch-cpuid__arm64.c
@@ -1,6 +1,6 @@
---- cpuid_arm64.c.orig	2016-09-01 03:58:42 UTC
+--- cpuid_arm64.c.orig	2019-04-29 17:22:19 UTC
 +++ cpuid_arm64.c
-@@ -132,6 +132,8 @@ int detect(void)
+@@ -180,6 +180,8 @@ int detect(void)
  
  
  	}
diff --git a/math/openblas/files/patch-cpuid_ia64.c b/math/openblas/files/patch-cpuid_ia64.c
deleted file mode 100644
index c7092465ec12..000000000000
--- a/math/openblas/files/patch-cpuid_ia64.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- cpuid_ia64.c.orig	2015-10-27 20:44:50 UTC
-+++ cpuid_ia64.c
-@@ -38,7 +38,9 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#ifdef linux
- #include <sys/sysinfo.h>
-+#endif
- #include "cpuid.h"
- 
- #ifdef __ECC
diff --git a/math/openblas/files/patch-cpuid_sparc.c b/math/openblas/files/patch-cpuid_sparc.c
deleted file mode 100644
index f9d8239fc0e5..000000000000
--- a/math/openblas/files/patch-cpuid_sparc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- cpuid_sparc.c.orig	2015-10-27 20:44:50 UTC
-+++ cpuid_sparc.c
-@@ -49,6 +49,7 @@ void get_subdirname(void){
- }
- 
- void get_cpuconfig(void){
-+  printf("#define SPARC\n");
-   printf("#define V9\n");
-   printf("#define DTB_DEFAULT_ENTRIES 32\n");
- }
diff --git a/math/openblas/files/patch-cpuid_x86.c b/math/openblas/files/patch-cpuid_x86.c
deleted file mode 100644
index 38f6a1b7da3c..000000000000
--- a/math/openblas/files/patch-cpuid_x86.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- cpuid_x86.c.orig	2017-07-24 04:03:35 UTC
-+++ cpuid_x86.c
-@@ -1329,6 +1329,7 @@ int get_cpuname(void){
-       case 8:
- 	switch (model) {
- 	case 1:
-+	case 8:
- 	  // AMD Ryzen
- 	  if(support_avx())
- #ifndef NO_AVX2
-@@ -1865,6 +1866,7 @@ int get_coretype(void){
-       } else if (exfamily == 8) {
- 	switch (model) {
- 	case 1:
-+	case 8:
- 	  // AMD Ryzen
- 	  if(support_avx())
- #ifndef NO_AVX2
diff --git a/math/openblas/files/patch-driver_others_memory.c b/math/openblas/files/patch-driver_others_memory.c
deleted file mode 100644
index 4dbbb1d80c0a..000000000000
--- a/math/openblas/files/patch-driver_others_memory.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Passing a priority level to constructor/destructor only works on GCC >= 4.3.0;
-improve the upstream check so that the build works with base GCC.
---- driver/others/memory.c.orig	2016-04-12 19:29:19 UTC
-+++ driver/others/memory.c
-@@ -144,7 +144,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- #if defined(_MSC_VER) && !defined(__clang__)
- #define CONSTRUCTOR __cdecl
- #define DESTRUCTOR __cdecl
--#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) && defined(C_GCC)
-+#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) || (defined(C_GCC) && ((__GNUC__ == 4) && (__GNUC_MINOR__ < 3)))
- #define CONSTRUCTOR	__attribute__ ((constructor))
- #define DESTRUCTOR	__attribute__ ((destructor))
- #else
diff --git a/math/openblas/files/patch-exports+Makefile b/math/openblas/files/patch-exports+Makefile
deleted file mode 100644
index fa147ae47437..000000000000
--- a/math/openblas/files/patch-exports+Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- exports/Makefile.orig	2015-10-27 20:44:50 UTC
-+++ exports/Makefile
-@@ -140,6 +140,7 @@ endif
- #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
- ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
- 
-+EXTRALIB += -lgfortran
- so : ../$(LIBSONAME)
- 
- ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
-@@ -151,6 +152,7 @@ else
- endif
- 	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
- 	-Wl,--whole-archive $< -Wl,--no-whole-archive \
-+	-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \
- 	$(FEXTRALIB) $(EXTRALIB)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
- 	rm -f linktest
diff --git a/math/openblas/files/patch-f_check b/math/openblas/files/patch-f_check
index 72113d19766b..9a193257937d 100644
--- a/math/openblas/files/patch-f_check
+++ b/math/openblas/files/patch-f_check
@@ -1,6 +1,6 @@
---- f_check.orig	2015-10-27 20:44:50 UTC
+--- f_check.orig	2018-12-02 22:41:17 UTC
 +++ f_check
-@@ -261,7 +261,7 @@ if ($link ne "") {
+@@ -288,7 +288,7 @@ if ($link ne "") {
  
      foreach $flags (@flags) {
  	if (
@@ -9,7 +9,7 @@
  	    && ($flags !~ /^-LIST:/)
  	    && ($flags !~ /^-LANG:/)
  	    ) {
-@@ -292,7 +292,7 @@ if ($link ne "") {
+@@ -317,7 +317,7 @@ if ($link ne "") {
  	}
  
  	if (
diff --git a/math/openblas/files/patch-interface__ztrmv.c b/math/openblas/files/patch-interface__ztrmv.c
index f11da94c6e1c..854a83bf42ea 100644
--- a/math/openblas/files/patch-interface__ztrmv.c
+++ b/math/openblas/files/patch-interface__ztrmv.c
@@ -1,6 +1,6 @@
---- interface/ztrmv.c.orig	2016-09-01 03:58:42 UTC
+--- interface/ztrmv.c.orig	2019-04-29 17:22:19 UTC
 +++ interface/ztrmv.c
-@@ -242,7 +242,7 @@ void CNAME(enum CBLAS_ORDER order, enum 
+@@ -245,7 +245,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Upl
    else
  #endif
    {
diff --git a/math/openblas/files/patch-param.h b/math/openblas/files/patch-param.h
deleted file mode 100644
index d5ccfefc9a5c..000000000000
--- a/math/openblas/files/patch-param.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- param.h.orig	2019-06-28 14:19:50 UTC
-+++ param.h
-@@ -1877,7 +1877,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILI
- #define ZGEMM_DEFAULT_UNROLL_M 2
- #define ZGEMM_DEFAULT_UNROLL_N 2
- 
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- #if L2_SIZE == 1024976
- #define SGEMM_DEFAULT_P 320
- #define DGEMM_DEFAULT_P 256