Avoid redefinition warning
@@ -97,9 +97,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if defined(__x86_64__) || defined(_M_X64)
#if (( defined(__GNUC__) && __GNUC__ > 6 && defined(__AVX2__)) || (defined(__clang__) && __clang_major__ >= 6))
#else
+#ifndef NO_AVX512
#define NO_AVX512
#endif
#endif
+#endif
/* #define FORCE_P2 */
/* #define FORCE_KATMAI */
/* #define FORCE_COPPERMINE */
@@ -981,20 +983,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#else
#endif
-#ifdef FORCE_RISCV64_GENERIC
-#define FORCE
-#define ARCHITECTURE "RISCV64"
-#define SUBARCHITECTURE "RISCV64_GENERIC"
-#define SUBDIRNAME "riscv64"
-#define ARCHCONFIG "-DRISCV64_GENERIC " \
- "-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=32 " \
- "-DL2_SIZE=1048576 -DL2_LINESIZE=32 " \
- "-DDTB_DEFAULT_ENTRIES=128 -DDTB_SIZE=4096 -DL2_ASSOCIATIVE=4 "
-#define LIBNAME "riscv64_generic"
-#define CORENAME "RISCV64_GENERIC"
-#else
-#endif
-
#ifdef FORCE_CORTEXA15
#define FORCE
#define ARCHITECTURE "ARM"
@@ -1280,21 +1268,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define CORENAME "Z14"
#endif
-#ifdef FORCE_C910V
-#define FORCE
-#define ARCHITECTURE "RISCV64"
-#define SUBARCHITECTURE "C910V"
-#define SUBDIRNAME "riscv64"
-#define ARCHCONFIG "-DC910V " \
- "-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=32 " \
- "-DL2_SIZE=1048576 -DL2_LINESIZE=32 " \
- "-DDTB_DEFAULT_ENTRIES=128 -DDTB_SIZE=4096 -DL2_ASSOCIATIVE=4 "
-#define LIBNAME "c910v"
-#define CORENAME "C910V"
-#else
-#endif
-
-
#ifndef FORCE
#ifdef USER_TARGET
@@ -1349,10 +1322,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define OPENBLAS_SUPPORTED
#endif
-#ifdef __riscv
-#include "cpuid_riscv64.c"
-#endif
-
#ifdef __arm__
#include "cpuid_arm.c"
#define OPENBLAS_SUPPORTED
