Remove some remaining CHERI MIPS references #1761
Conversation
bsdjhb
commented
Jul 21, 2023
bsdjhb
commented
- cheribsdbox: Remove MIPS references and workarounds.
- README.md: Swap out reference to MIPS for ARMv8-A (Morello)
- pci_user.c: Replace a MIPS reference with AArch64.
- KDB_WHY_CHERI: Remove MIPS reference.
- WITH_CHERI: Update list of relevant architectures.
- makeman: Workaround bsd.compiler.mk pickiness in CheriBSD.
- make targets: Add the aarch64c and riscv64c architectures.
- Move the CHERI_CAPREVOKE / CHERI dependency to the right file.
- Broken CHERI should implicitly disable CHERI_CAPREVOKE.
- Map aarch64c to the aarch64 LLVM target.
- Use more active language in CHERI build options to match upstream.
- src.opts.mk: Remove stale MK_(BINUTILS|GCC)_BOOTSTRAP references.
- Add build option descriptions for LIB64 and LIB64C.
- Add a build options file for WITHOUT_CHERIBSDBOX.
- src.conf.5: Regen.
- .mergify_pause_paths: Add src.conf.5.
|
This started as a small PR to just trim some more MIPS references after I noticed some in cheribsdbox's Makefile. I ended up down a rabbit hole of fixing the MIPS reference in WITH_CHERI that led to some build system fixes to get |
Pass _NO_INCLUDE_COMPILERMK=t and _NO_INCLUDE_LINKERMK=t to make showconfig similar to the other hacks we use for cleandir, etc.
These are not present upstream.
This reverts commit db2c38e.
| CRUNCH_PROGS_usr.bin+= qtrace | ||
| .endif | ||
| .if ${MACHINE_ARCH:Mmips64*} || ${MACHINE_ARCH:Mriscv64*} | ||
| CRUNCH_PROGS_usr.bin+= minimal_count_stats |
There was a problem hiding this comment.
This is separate, probably should be another condition
There was a problem hiding this comment.
Right now they would be duplicate, and we can always split it in the future if another architecture grows support for one of the other of these.
There was a problem hiding this comment.
I guess though the comment needs to only apply to qtrace
There was a problem hiding this comment.
Yeah. Moving the comment would also work.
| @@ -295,15 +287,9 @@ CRUNCH_ALIAS_w= uptime | |||
| CRUNCH_PROGS_usr.bin+=su | |||
|
|
|||
| # Tracing currently only implemented for CHERI-QEMU architectures | |||
There was a problem hiding this comment.
Not quite true, CHERI-QEMU supports Morello but we don't have a magic tracing hint for it
