Skip to content

Commit 27ad2e8

Browse files
committed
[CHERIoT] Bump version macros after sub-object bounds fixes.
1 parent c3d9c21 commit 27ad2e8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

clang/lib/Basic/Targets/RISCV.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,9 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
306306

307307
// Macros for CHERIoT in the default and bare-metal ABIs.
308308
if (ABI == "cheriot" || ABI == "cheriot-baremetal")
309-
Builder.defineMacro("__CHERIOT__", "20250718");
309+
Builder.defineMacro("__CHERIOT__", "20250812");
310310
if (ABI == "cheriot-baremetal")
311-
Builder.defineMacro("__CHERIOT_BAREMETAL__", "20250718");
311+
Builder.defineMacro("__CHERIOT_BAREMETAL__", "20250812");
312312

313313
Builder.defineMacro("__riscv_clen", Twine(getCHERICapabilityWidth()));
314314
// TODO: _MIPS_CAP_ALIGN_MASK equivalent?

clang/test/Preprocessor/init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@
391391
// Check for CHERIoT-specific defines
392392
// RUN: %clang_cc1 %s -o - "-triple" "riscv32-unknown-unknown" "-mframe-pointer=none" "-mcmodel=small" "-target-cpu" "cheriot" "-target-feature" "+xcheri" "-target-feature" "-64bit" "-target-feature" "-relax" "-target-feature" "-xcheri-rvc" "-target-feature" "-save-restore" "-target-abi" "cheriot" -E -dM < /dev/null | FileCheck -check-prefix CHERIOT %s
393393
// RUN: %clang_cc1 %s -o - "-triple" "riscv32-unknown-unknown" "-mframe-pointer=none" "-mcmodel=small" "-target-cpu" "cheriot" "-target-feature" "+xcheri" "-target-feature" "-64bit" "-target-feature" "-relax" "-target-feature" "-xcheri-rvc" "-target-feature" "-save-restore" "-target-abi" "cheriot-baremetal" -E -dM < /dev/null | FileCheck -check-prefixes CHERIOT,CHERIOT-BAREMETAL %s
394-
// CHERIOT-BAREMETAL: #define __CHERIOT_BAREMETAL__ 20250718
395-
// CHERIOT: #define __CHERIOT__ 20250718
394+
// CHERIOT-BAREMETAL: #define __CHERIOT_BAREMETAL__ 20250812
395+
// CHERIOT: #define __CHERIOT__ 20250812
396396

397397

398398
// RUN: %cheri128_cc1 -fgnuc-version=4.2.1 -E -dM -ffreestanding < /dev/null | FileCheck -check-prefixes CHERI-COMMON,CHERI-MIPS,CHERI128 %s

0 commit comments

Comments
 (0)