diff options
author | Renato Golin <rengolin@systemcall.eu> | 2018-12-05 18:51:38 +0000 |
---|---|---|
committer | Renato Golin <rengolin@systemcall.eu> | 2018-12-05 18:51:38 +0000 |
commit | 31a490ea887dd078233aebffc5a57a093fe2d886 (patch) | |
tree | ce3b28992beedb914ecb95a935f1d80f3c0b9aeb | |
parent | 701ea88347461e4c5d896765438dc870281b3834 (diff) | |
download | openblas-31a490ea887dd078233aebffc5a57a093fe2d886.tar.gz openblas-31a490ea887dd078233aebffc5a57a093fe2d886.tar.bz2 openblas-31a490ea887dd078233aebffc5a57a093fe2d886.zip |
Fix two mistakes on Arm64 builds
* Falkor is an ARMv8.0 with ARMv8.1 features, and chosing armv8.1-a for
march generates instructions it cannot cope with. Reverting it back
to armv8-a.
* ThunderX2's build was left with a #define VULCAN, which made it miss
the right compiler flags in Makefile.arm64, although it did create
the right library in the end.
-rw-r--r-- | Makefile.arm64 | 4 | ||||
-rw-r--r-- | cpuid_arm64.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.arm64 b/Makefile.arm64 index a529fab80..cd16dbfae 100644 --- a/Makefile.arm64 +++ b/Makefile.arm64 @@ -30,8 +30,8 @@ FCOMMON_OPT += -march=armv8-a -mtune=thunderx endif ifeq ($(CORE), FALKOR) -CCOMMON_OPT += -march=armv8.1-a -mtune=falkor -FCOMMON_OPT += -march=armv8.1-a -mtune=falkor +CCOMMON_OPT += -march=armv8-a -mtune=falkor +FCOMMON_OPT += -march=armv8-a -mtune=falkor endif ifeq ($(CORE), THUNDERX2T99) diff --git a/cpuid_arm64.c b/cpuid_arm64.c index c914fbc2b..5077d7b11 100644 --- a/cpuid_arm64.c +++ b/cpuid_arm64.c @@ -270,7 +270,7 @@ void get_cpuconfig(void) break; case CPU_THUNDERX2T99: - printf("#define VULCAN \n"); + printf("#define THUNDERX2T99 \n"); printf("#define L1_CODE_SIZE 32768 \n"); printf("#define L1_CODE_LINESIZE 64 \n"); printf("#define L1_CODE_ASSOCIATIVE 8 \n"); |