Skip to content

Commit 31a490e

Browse files
committed
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.
1 parent 701ea88 commit 31a490e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Makefile.arm64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ FCOMMON_OPT += -march=armv8-a -mtune=thunderx
3030
endif
3131

3232
ifeq ($(CORE), FALKOR)
33-
CCOMMON_OPT += -march=armv8.1-a -mtune=falkor
34-
FCOMMON_OPT += -march=armv8.1-a -mtune=falkor
33+
CCOMMON_OPT += -march=armv8-a -mtune=falkor
34+
FCOMMON_OPT += -march=armv8-a -mtune=falkor
3535
endif
3636

3737
ifeq ($(CORE), THUNDERX2T99)

cpuid_arm64.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ void get_cpuconfig(void)
270270
break;
271271

272272
case CPU_THUNDERX2T99:
273-
printf("#define VULCAN \n");
273+
printf("#define THUNDERX2T99 \n");
274274
printf("#define L1_CODE_SIZE 32768 \n");
275275
printf("#define L1_CODE_LINESIZE 64 \n");
276276
printf("#define L1_CODE_ASSOCIATIVE 8 \n");

0 commit comments

Comments
 (0)