Skip to content

s/__CHERI__/__has_feature(capabilities)/ #2348

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
brooksdavis merged 1 commit into from
Mar 4, 2025
Merged

s/__CHERI__/__has_feature(capabilities)/ #2348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions libexec/rtld-elf/tests/cheri/abi-mismatch/basic_hybrid_lib/basic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#if !__has_feature(capabilities)
#error "This should support capabilities"
#endif

#ifndef __CHERI__
#error Must be a hybrid library
#if !__has_feature(capabilities)
#error The compiler must support capabilities
#endif
#ifdef __CHERI_PURE_CAPABILITY__
#error Must be a hybrid library
Expand Down
5 changes: 3 additions & 2 deletions libexec/rtld-elf/tests/cheri/abi-mismatch/basic_purecap_lib/basic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef __CHERI__
#error Must be a purecap library

#if !__has_feature(capabilities)
#error The compiler must support capabilities
#endif
#ifndef __CHERI_PURE_CAPABILITY__
#error Must be a purecap library
Expand Down
2 changes: 1 addition & 1 deletion tools/tools/syscall_timing/syscall_timing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
#include <sys/time.h>
#include <sys/wait.h>

#ifdef __CHERI__
#if __has_feature(capabilities)
#include <cheri/cheri.h>
#endif

Check warning on line 43 in tools/tools/syscall_timing/syscall_timing.c

View workflow job for this annotation

GitHub Actions / Style Checker 

Missing Signed-off-by: line
#include <assert.h>
#include <err.h>
#include <errno.h>
Expand Down