|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
From 5a6bba3061f19923eb9972378021e6498bf8e5ed Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
From: Susi Lehtola <susi.lehtola@alumni.helsinki.fi>
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
Date: Tue, 11 Feb 2020 15:07:33 +1300
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
Subject: [PATCH] Patch out instances of Z15 in dynamic_zarch.c
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
There does not appear to be a Z15 kernel yet, causing link errors from the code. This patch fixes the issue.
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
---
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
driver/others/dynamic_zarch.c | 10 +++++-----
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
diff --git a/driver/others/dynamic_zarch.c b/driver/others/dynamic_zarch.c
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
index 1206bf870..c7b82e4df 100644
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
--- a/driver/others/dynamic_zarch.c
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
+++ b/driver/others/dynamic_zarch.c
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
@@ -3,12 +3,12 @@
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
extern gotoblas_t gotoblas_Z13;
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
extern gotoblas_t gotoblas_Z14;
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
-extern gotoblas_t gotoblas_Z15;
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
+//extern gotoblas_t gotoblas_Z15;
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
//#if (!defined C_GCC) || (GCC_VERSION >= 60000)
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
//extern gotoblas_t gotoblas_Z14;
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
//#endif
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
-#define NUM_CORETYPES 5
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
+#define NUM_CORETYPES 4
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
extern void openblas_warning(int verbose, const char* msg);
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
@@ -16,14 +16,14 @@ static char* corename[] = {
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
"unknown",
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
"Z13",
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
"Z14",
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
- "Z15",
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
+// "Z15",
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
"ZARCH_GENERIC",
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
};
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
char* gotoblas_corename(void) {
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
if (gotoblas == &gotoblas_Z13) return corename[1];
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
if (gotoblas == &gotoblas_Z14) return corename[2];
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
- if (gotoblas == &gotoblas_Z15) return corename[3];
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
+// if (gotoblas == &gotoblas_Z15) return corename[3];
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
//#if (!defined C_GCC) || (GCC_VERSION >= 60000)
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
// if (gotoblas == &gotoblas_POWER9) return corename[3];
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
//#endif
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
@@ -78,7 +78,7 @@ static gotoblas_t* force_coretype(char* coretype) {
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
case 1: return (&gotoblas_Z13);
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
case 2: return (&gotoblas_Z14);
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
- case 3: return (&gotoblas_Z15);
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
+// case 3: return (&gotoblas_Z15);
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
//#if (!defined C_GCC) || (GCC_VERSION >= 60000)
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
// case 3: return (&gotoblas_POWER9);
|
|
![](https://seccdn.libravatar.org/avatar/c3146cfaedb3bd46599061ec3ad03f0d0c9bf214ff170d5f0fa43a33b2de8476?s=16&d=retro) |
4d572b6 |
//#endif
|