d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use MACHINE_CPUARCH when checking for arm64

Browse Source 
Use MACHINE_CPUARCH with arm64 (aarch64) when we build code that could run
on any 64-bit Arm instruction set. This will simplify checks in downstream
consumers targeting prototype instruction sets.

The only place we check for MACHINE_ARCH == aarch64 is when building the
device tree blobs. As these are targeting current generation ISAs.

Sponsored by:	Innovate UK
Differential Revision:	https://reviews.freebsd.org/D26370
This commit is contained in:
Andrew Turner 2020-09-14 16:12:28 +00:00
parent 5fb8eca870
commit 2a6803de1c
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cddl/lib/libzfs/Makefile
View File

@ -82,7 +82,7 @@ CFLAGS += -DHAVE_SSE2
ARCH_C += zfs_fletcher_avx512.c ARCH_C += zfs_fletcher_avx512.c
CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F
.endif .endif
.if ${MACHINE_ARCH} == "aarch64" .if ${MACHINE_CPUARCH} == "aarch64"
ARCH_C += zfs_fletcher_aarch64_neon.c ARCH_C += zfs_fletcher_aarch64_neon.c
.endif .endif

2
cddl/lib/libzpool/Makefile
View File

@ -187,7 +187,7 @@ ARCH_C += zfs_fletcher_avx512.c
CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \
-DHAVE_AVX512BW -DHAVE_AVX512BW
.endif .endif
.if ${MACHINE_ARCH} == "aarch64" .if ${MACHINE_CPUARCH} == "aarch64"
ARCH_C += zfs_fletcher_aarch64_neon.c ARCH_C += zfs_fletcher_aarch64_neon.c
.endif .endif

4
lib/libpmc/Makefile
View File

@ -7,10 +7,10 @@ INCS= pmc.h pmclog.h pmcformat.h
CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "i386" ${MACHINE_ARCH} == "i386"
.if ${MACHINE_ARCH} == "aarch64" .if ${MACHINE_CPUARCH} == "aarch64"
EVENT_ARCH="arm64" EVENT_ARCH="arm64"
.elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" .elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
EVENT_ARCH="x86" EVENT_ARCH="x86"

2
share/mk/bsd.endian.mk
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
.if ${MACHINE_ARCH} == "aarch64" || \ .if ${MACHINE_CPUARCH} == "aarch64" || \
${MACHINE_ARCH} == "amd64" || \ ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "i386" || \
(${MACHINE} == "arm" && ${MACHINE_ARCH:Marm*eb*} == "") || \ (${MACHINE} == "arm" && ${MACHINE_ARCH:Marm*eb*} == "") || \

2
share/mk/bsd.sys.mk
View File

@ -187,7 +187,7 @@ CWARNFLAGS+= -Wno-error=aggressive-loop-optimizations \
.endif .endif
# GCC's own arm_neon.h triggers various warnings # GCC's own arm_neon.h triggers various warnings
.if ${MACHINE_ARCH} == "aarch64" .if ${MACHINE_CPUARCH} == "aarch64"
CWARNFLAGS+= -Wno-system-headers CWARNFLAGS+= -Wno-system-headers
.endif .endif
.endif # gcc .endif # gcc

2
sys/conf/dtb.build.mk
View File

@ -22,7 +22,7 @@ SYSDIR= ${S}
.for _dts in ${DTS} .for _dts in ${DTS}
# DTB for aarch64 needs to preserve the immediate parent of the .dts, because # DTB for aarch64 needs to preserve the immediate parent of the .dts, because
# these DTS are vendored and should be installed into their vendored directory. # these DTS are vendored and should be installed into their vendored directory.
.if ${MACHINE_ARCH} == "aarch64" .if ${MACHINE_CPUARCH} == "aarch64"
DTB+= ${_dts:R:S/$/.dtb/} DTB+= ${_dts:R:S/$/.dtb/}
.else .else
DTB+= ${_dts:T:R:S/$/.dtb/} DTB+= ${_dts:T:R:S/$/.dtb/}

2
tests/sys/kern/Makefile
View File

@ -57,7 +57,7 @@ LIBADD.mqueue_test+= rt
.if ${MACHINE_ARCH} == "amd64" || \ .if ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "aarch64" ${MACHINE_CPUARCH} == "aarch64"
ATF_TESTS_C+= libkern_crc32 ATF_TESTS_C+= libkern_crc32
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
LDADD.libkern_crc32+= ${SRCTOP}/sys/libkern/x86/crc32_sse42.c LDADD.libkern_crc32+= ${SRCTOP}/sys/libkern/x86/crc32_sse42.c

2
usr.bin/gcore/Makefile
View File

@ -5,7 +5,7 @@ PROG= gcore
SRCS= elfcore.c gcore.c SRCS= elfcore.c gcore.c
LIBADD= sbuf util LIBADD= sbuf util
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "powerpc64" ${MACHINE_ARCH} == "powerpc64"
SRCS+= elf32core.c SRCS+= elf32core.c
.endif .endif