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.

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

Remove MK_CHERI #1762

Merged
merged 6 commits into from
Jul 22, 2023
Merged

Remove MK_CHERI #1762

merged 6 commits into from
Jul 22, 2023

Conversation

brooksdavis
Copy link
Member

MK_CHERI used to be the all-purpose way to say you're building with CHERI. We now have a more mature model using MACHINE_CPU and MACHINE_ABI and MK_CHERI is supposed to enable odd bits of CHERI-specific software. This PR removes the last uses that do otherwise.

Inspired by #1761

The software still has these bugs, but upstream compilers now error on
them by default so we're supressing these warnings without the need for
local changes.
Copy link
Collaborator

@bsdjhb bsdjhb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to lose the local diffs in sendmail makefiles. Had a conflict when merging the upstream changes recently.

tests/sys/Makefile Outdated Show resolved Hide resolved
@jrtc27
Copy link
Member

jrtc27 commented Jul 21, 2023

Does MK_CHERI even serve a real purpose at this point? It's just gating libsyscalls and various things in bin. The only thing I could imagine is if libsyscalls is broken for non-CHERI architectures, but libsyscalls itself has nothing really to do with CHERI beyond being a thing that libcheri wanted to use.

Tests are now believed to run reliably enough to just enable them.
@brooksdavis
Copy link
Member Author

Does MK_CHERI even serve a real purpose at this point? It's just gating libsyscalls and various things in bin. The only thing I could imagine is if libsyscalls is broken for non-CHERI architectures, but libsyscalls itself has nothing really to do with CHERI beyond being a thing that libcheri wanted to use.

Prodded by this comment I've removed the WITH(OUT)_CHERI option entirely.

@brooksdavis brooksdavis changed the title Cleanup MK_CHERI use Remove MK_CHERI Jul 21, 2023
@brooksdavis
Copy link
Member Author

This will conflict with #1761 and completing the change (with src.conf.5 updates) depends on that PR.

lib/Makefile Outdated Show resolved Hide resolved
It should work on all platforms, but is currently broken on amd64 so
just enable on CHERI platforms where it is currently required.
Don't use MK_CHERI to gate the build of small(ish) programs and instead
use the target CPU and ABI.
The CHERI option mostly did things orthoginal to CHERI_REVOKE support
and now does nothing so remove the dependency.
It only gates code already gated by appropriate CPU and ABI flags
and these small programs aren't things we're going to want to turn
off any time soon.
Copy link
Collaborator

@bsdjhb bsdjhb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll rebase #1761 after merging this.

@bsdjhb bsdjhb merged commit d482ef7 into dev Jul 22, 2023
20 checks passed
@bsdjhb bsdjhb deleted the cleanup-MK_CHERI branch July 22, 2023 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants