Skip to content

Commit f47a917

Browse files
committed
[cheriot] Bump cheriot version macros.
1 parent 655d68f commit f47a917

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
@@ -246,9 +246,9 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
246246

247247
// Macros for CHERIoT in the default and bare-metal ABIs.
248248
if (ABI == "cheriot" || ABI == "cheriot-baremetal")
249-
Builder.defineMacro("__CHERIOT__", "20250113");
249+
Builder.defineMacro("__CHERIOT__", "20250215");
250250
if (ABI == "cheriot-baremetal")
251-
Builder.defineMacro("__CHERIOT_BAREMETAL__", "20250113");
251+
Builder.defineMacro("__CHERIOT_BAREMETAL__", "20250215");
252252

253253
Builder.defineMacro("__riscv_clen", Twine(getCHERICapabilityWidth()));
254254
// 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
@@ -320,8 +320,8 @@
320320
// Check for CHERIoT-specific defines
321321
// RUN: %clang_cc1 %s -o - "-triple" "riscv32-unknown-unknown" "-emit-llvm" "-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
322322
// RUN: %clang_cc1 %s -o - "-triple" "riscv32-unknown-unknown" "-emit-llvm" "-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
323-
// CHERIOT-BAREMETAL: #define __CHERIOT_BAREMETAL__ 20250113
324-
// CHERIOT: #define __CHERIOT__ 20250113
323+
// CHERIOT-BAREMETAL: #define __CHERIOT_BAREMETAL__ 20250215
324+
// CHERIOT: #define __CHERIOT__ 20250215
325325

326326

327327
// 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)