Skip to content
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

clang is supported everywhere now #299

Merged
merged 2 commits into from
Jan 9, 2024
Merged

clang is supported everywhere now #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef7138b
clang is supported everywhere now
axel-h Jan 9, 2024
0538a64
Merge branch 'master' into patch-axel-5
lsf37 Jan 9, 2024
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
11 changes: 0 additions & 11 deletions seL4-platforms/builds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,7 @@ def is_hyp(self) -> bool:
return self.settings.get("ARM_HYP") is not None or \
self.settings.get("KernelVTX") is not None

def can_clang(self) -> bool:
# clang 8 does not support riscv, and Bamboo has no clang for TX1 64:
return not (
self.get_platform().arch == 'riscv' or
self.get_platform().name == 'TX1' and self.get_mode() == 64
)

def set_clang(self):
if not self.can_clang():
raise ValidationException("not Build.can_clang()")
self.settings["TRIPLE"] = self.get_platform().get_triple(self.get_mode())

def is_clang(self) -> bool:
Expand Down Expand Up @@ -203,8 +194,6 @@ def validate(self):
raise ValidationException("Build: no unique mode")
if not self.get_platform():
raise ValidationException("Build: no platform")
if self.is_clang() and not self.can_clang():
raise ValidationException("not Build.can_clang()")
if self.is_mcs() and not self.can_mcs():
raise ValidationException("not Build.can_mcs()")
if self.is_smp() and not self.can_smp():
Expand Down
4 changes: 2 additions & 2 deletions seL4-platforms/platforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ def get_triple(self, mode: int) -> str:
64: "x86_64-linux-gnu"},
"arm": {32: "arm-linux-gnueabi",
64: "aarch64-linux-gnu"},
"riscv": {32: "riscv32-linux-gnu",
64: "riscv64-linux-gnu"}}[self.arch][mode]
"riscv": {32: "riscv64-unknown-elf",
64: "riscv64-unknown-elf"}}[self.arch][mode]

def image_names(self, mode: int, root_task: str) -> list:
"""Return generated image name"""
Expand Down