Skip to content

Commit

Permalink
clang is supported everywhere now
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Heider <axelheider@gmx.de>
  • Loading branch information
axel-h authored and lsf37 committed Jan 9, 2024
1 parent 88aebb3 commit 739bd6d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
11 changes: 0 additions & 11 deletions seL4-platforms/builds.py
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
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

0 comments on commit 739bd6d

Please sign in to comment.