Skip to content

bootstrap.py: Improve CPU detection on NetBSD #145794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 25, 2025
Merged

bootstrap.py: Improve CPU detection on NetBSD #145794

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45bcbd9
bootstrap.py: Improve CPU detection on NetBSD,
he32 Aug 23, 2025
3a2392b
bootstrap.py: follow up tidy output from CI.
he32 Aug 23, 2025
2f1b6d1
bootstrap.py: follow up more 'tidy' insistence (string quotes).
he32 Aug 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/bootstrap/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,12 @@ def default_build_triple(verbose):

kernel, cputype, processor = uname.decode(default_encoding).split(maxsplit=2)

# ON NetBSD, use `uname -p` to set the CPU type
if kernel == "NetBSD":
cputype = (
subprocess.check_output(["uname", "-p"]).strip().decode(default_encoding)
)

# The goal here is to come up with the same triple as LLVM would,
# at least for the subset of platforms we're willing to target.
kerneltype_mapper = {
Expand Down Expand Up @@ -433,10 +439,16 @@ def default_build_triple(verbose):
kernel = "linux-androideabi"
else:
kernel += "eabihf"
elif cputype in {"armv7l", "armv8l"}:
elif cputype in {"armv6hf", "earmv6hf"}:
cputype = "armv6"
if kernel == "unknown-netbsd":
kernel += "-eabihf"
elif cputype in {"armv7l", "earmv7hf", "armv8l"}:
cputype = "armv7"
if kernel == "linux-android":
kernel = "linux-androideabi"
elif kernel == "unknown-netbsd":
kernel += "-eabihf"
else:
kernel += "eabihf"
elif cputype == "mips":
Expand Down
Loading