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

Fix cross-building on Linux/aarch64

Browse Source 
Add necessary bits to detect ELF format on Linux/aarch64; note that
Linux calls it aarch64 where we would typically call it arm64 (uname -m)

Reviewed by:	arichardson, emaste, imp
Sponsored by:	Ampere Computing LLC
Sponsored by:	Klara Inc.
Differential Revision:	https://reviews.freebsd.org/D32542
This commit is contained in:
Kyle Evans 2021-10-17 21:26:47 -05:00
parent 576b58108c
commit 8c22b9f3ba
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/elftoolchain/common/native-elf-format
View File

@ -39,6 +39,8 @@ $1 ~ "Machine:" {
elfarch = "EM_X86_64"; elfarch = "EM_X86_64";
} else if (match($0, "PowerPC64")) { } else if (match($0, "PowerPC64")) {
elfarch = "EM_PPC64"; elfarch = "EM_PPC64";
} else if (match($0, "AArch64")) {
elfarch = "EM_AARCH64";
} else { } else {
elfarch = "unknown"; elfarch = "unknown";
} }

3
tools/build/Makefile
View File

@ -125,6 +125,9 @@ _host_arch=${MACHINE}
.if ${_host_arch} == "x86_64" .if ${_host_arch} == "x86_64"
# bmake on Linux/mac often prints that instead of amd64 # bmake on Linux/mac often prints that instead of amd64
_host_arch=amd64 _host_arch=amd64
.elif ${_host_arch} == "aarch64"
# Linux calls arm64, aarch64, across the board
_host_arch=arm64
.elif ${_host_arch:Mppc*} .elif ${_host_arch:Mppc*}
_host_arch=powerpc _host_arch=powerpc
.endif .endif