Skip to content

Commit 3788b6d

Browse files
authored
Merge pull request #3005 from martin-frbg/ssefix
Add -msse for x86 and silence build warning in getarch
2 parents bc5b1dd + 11ebe5f commit 3788b6d

File tree

2 files changed

+7
-33
lines changed

2 files changed

+7
-33
lines changed

Makefile.x86

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# COMPILER_PREFIX = mingw32-
22

3+
ifdef HAVE_SSE
4+
CCOMMON_OPT += -msse
5+
FCOMMON_OPT += -msse
6+
endif
7+
38

49
ifeq ($(OSNAME), Interix)
510
ARFLAGS = -m x86

getarch.c

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9797
#if defined(__x86_64__) || defined(_M_X64)
9898
#if (( defined(__GNUC__) && __GNUC__ > 6 && defined(__AVX2__)) || (defined(__clang__) && __clang_major__ >= 6))
9999
#else
100+
#ifndef NO_AVX512
100101
#define NO_AVX512
101102
#endif
102103
#endif
104+
#endif
103105
/* #define FORCE_P2 */
104106
/* #define FORCE_KATMAI */
105107
/* #define FORCE_COPPERMINE */
@@ -981,20 +983,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
981983
#else
982984
#endif
983985

984-
#ifdef FORCE_RISCV64_GENERIC
985-
#define FORCE
986-
#define ARCHITECTURE "RISCV64"
987-
#define SUBARCHITECTURE "RISCV64_GENERIC"
988-
#define SUBDIRNAME "riscv64"
989-
#define ARCHCONFIG "-DRISCV64_GENERIC " \
990-
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=32 " \
991-
"-DL2_SIZE=1048576 -DL2_LINESIZE=32 " \
992-
"-DDTB_DEFAULT_ENTRIES=128 -DDTB_SIZE=4096 -DL2_ASSOCIATIVE=4 "
993-
#define LIBNAME "riscv64_generic"
994-
#define CORENAME "RISCV64_GENERIC"
995-
#else
996-
#endif
997-
998986
#ifdef FORCE_CORTEXA15
999987
#define FORCE
1000988
#define ARCHITECTURE "ARM"
@@ -1280,21 +1268,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12801268
#define CORENAME "Z14"
12811269
#endif
12821270

1283-
#ifdef FORCE_C910V
1284-
#define FORCE
1285-
#define ARCHITECTURE "RISCV64"
1286-
#define SUBARCHITECTURE "C910V"
1287-
#define SUBDIRNAME "riscv64"
1288-
#define ARCHCONFIG "-DC910V " \
1289-
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=32 " \
1290-
"-DL2_SIZE=1048576 -DL2_LINESIZE=32 " \
1291-
"-DDTB_DEFAULT_ENTRIES=128 -DDTB_SIZE=4096 -DL2_ASSOCIATIVE=4 "
1292-
#define LIBNAME "c910v"
1293-
#define CORENAME "C910V"
1294-
#else
1295-
#endif
1296-
1297-
12981271
#ifndef FORCE
12991272

13001273
#ifdef USER_TARGET
@@ -1349,10 +1322,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13491322
#define OPENBLAS_SUPPORTED
13501323
#endif
13511324

1352-
#ifdef __riscv
1353-
#include "cpuid_riscv64.c"
1354-
#endif
1355-
13561325
#ifdef __arm__
13571326
#include "cpuid_arm.c"
13581327
#define OPENBLAS_SUPPORTED

0 commit comments

Comments
 (0)