Skip to content

Fixes for building in 2026 #1

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

Open
GustawB wants to merge 1 commit into
base: ti-cc2650-rewritten
Choose a base branch
from
Open

Fixes for building in 2026 #1

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
2 changes: 1 addition & 1 deletion boards/ti-cc2650/cherry_mote/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Makefile for building the tock kernel for the CC2650-CherryMote

export NEWLIB_INC_PATH ?= /usr/arm-none-eabi/include
export NEWLIB_INC_PATH ?= /usr/lib/arm-none-eabi/include

# Decide on kernel/apps flash and RAM division
export KERNEL_FLASH_LEN ?= 0x13000
Expand Down
1 change: 0 additions & 1 deletion boards/ti-cc2650/cherry_mote/src/io.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ pub fn _print(args: fmt::Arguments) {
}

#[cfg(not(test))]
#[no_mangle]
#[inline(never)]
#[panic_handler]
/// Panic handler
Expand Down
63 changes: 9 additions & 54 deletions chips/cc2650/src/driverlib/bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,21 @@ pub const __bool_true_false_are_defined: u32 = 1;
pub const true_: u32 = 1;
pub const false_: u32 = 0;
pub const _NEWLIB_VERSION_H__: u32 = 1;
pub const _NEWLIB_VERSION: &[u8; 6] = b"4.5.0\0";
pub const _NEWLIB_VERSION: &[u8; 6] = b"4.4.0\0";
pub const __NEWLIB__: u32 = 4;
pub const __NEWLIB_MINOR__: u32 = 5;
pub const __NEWLIB_MINOR__: u32 = 4;
pub const __NEWLIB_PATCHLEVEL__: u32 = 0;
pub const _DEFAULT_SOURCE: u32 = 1;
pub const _POSIX_SOURCE: u32 = 1;
pub const _POSIX_C_SOURCE: u32 = 202405;
pub const _POSIX_C_SOURCE: u32 = 200809;
pub const _ATFILE_SOURCE: u32 = 1;
pub const __ATFILE_VISIBLE: u32 = 1;
pub const __BSD_VISIBLE: u32 = 1;
pub const __GNU_VISIBLE: u32 = 0;
pub const __ISO_C_VISIBLE: u32 = 2011;
pub const __LARGEFILE_VISIBLE: u32 = 0;
pub const __MISC_VISIBLE: u32 = 1;
pub const __POSIX_VISIBLE: u32 = 202405;
pub const __POSIX_VISIBLE: u32 = 200809;
pub const __SVID_VISIBLE: u32 = 1;
pub const __XSI_VISIBLE: u32 = 0;
pub const __SSP_FORTIFY_LEVEL: u32 = 0;
Expand Down Expand Up @@ -2411,9 +2411,7 @@ pub const _HAVE_LONG_DOUBLE: u32 = 1;
pub const _LDBL_EQ_DBL: u32 = 1;
pub const _MB_LEN_MAX: u32 = 1;
pub const _REENT_CHECK_VERIFY: u32 = 1;
pub const _RETARGETABLE_LOCKING: u32 = 1;
pub const _UNBUF_STREAM_OPT: u32 = 1;
pub const _WANT_IO_C99_FORMATS: u32 = 1;
pub const _WANT_IO_LONG_LONG: u32 = 1;
pub const _WANT_REGISTER_FINI: u32 = 1;
pub const _WANT_USE_GDTOA: u32 = 1;
Expand Down Expand Up @@ -18991,43 +18989,9 @@ pub type __suseconds_t = cty::c_long;
pub type __useconds_t = cty::c_ulong;
pub type __va_list = u32;
pub type __ULong = cty::c_ulong;
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct __lock {
_unused: [u8; 0],
}
pub type _LOCK_T = *mut __lock;
extern "C" {
pub fn __retarget_lock_init(lock: *mut _LOCK_T);
}
extern "C" {
pub fn __retarget_lock_init_recursive(lock: *mut _LOCK_T);
}
extern "C" {
pub fn __retarget_lock_close(lock: _LOCK_T);
}
extern "C" {
pub fn __retarget_lock_close_recursive(lock: _LOCK_T);
}
extern "C" {
pub fn __retarget_lock_acquire(lock: _LOCK_T);
}
extern "C" {
pub fn __retarget_lock_acquire_recursive(lock: _LOCK_T);
}
extern "C" {
pub fn __retarget_lock_try_acquire(lock: _LOCK_T) -> cty::c_int;
}
extern "C" {
pub fn __retarget_lock_try_acquire_recursive(lock: _LOCK_T) -> cty::c_int;
}
extern "C" {
pub fn __retarget_lock_release(lock: _LOCK_T);
}
extern "C" {
pub fn __retarget_lock_release_recursive(lock: _LOCK_T);
}
pub type _flock_t = _LOCK_T;
pub type _LOCK_T = cty::c_int;
pub type _LOCK_RECURSIVE_T = cty::c_int;
pub type _flock_t = _LOCK_RECURSIVE_T;
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct __locale_t {
Expand Down Expand Up @@ -19250,7 +19214,6 @@ pub struct _reent__bindgen_ty_1__bindgen_ty_1 {
pub _wcrtomb_state: _mbstate_t,
pub _wcsrtombs_state: _mbstate_t,
pub _h_errno: cty::c_int,
pub _getlocalename_l_buf: [cty::c_char; 32usize],
}
impl Default for _reent__bindgen_ty_1__bindgen_ty_1 {
fn default() -> Self {
Expand Down Expand Up @@ -19553,18 +19516,10 @@ extern "C" {
) -> *mut cty::c_char;
}
extern "C" {
pub fn strlcat(
arg1: *mut cty::c_char,
arg2: *const cty::c_char,
arg3: cty::c_uint,
) -> cty::c_uint;
pub fn strlcat(arg1: *mut cty::c_char, arg2: *const cty::c_char, arg3: usize) -> usize;
}
extern "C" {
pub fn strlcpy(
arg1: *mut cty::c_char,
arg2: *const cty::c_char,
arg3: cty::c_uint,
) -> cty::c_uint;
pub fn strlcpy(arg1: *mut cty::c_char, arg2: *const cty::c_char, arg3: usize) -> usize;
}
extern "C" {
pub fn strnlen(arg1: *const cty::c_char, arg2: usize) -> usize;
Expand Down
6 changes: 3 additions & 3 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# Copyright Tock Contributors 2023.

[toolchain]
channel = "nightly-2024-07-08"
components = ["miri", "llvm-tools", "rust-src", "rustfmt", "clippy"]
targets = ["thumbv6m-none-eabi", "thumbv7em-none-eabi", "thumbv7em-none-eabihf", "riscv32imc-unknown-none-elf", "riscv32imac-unknown-none-elf"]
channel = "nightly-2025-11-03"
components = ["miri", "llvm-tools", "rust-src", "rustfmt", "clippy", "rust-analyzer"]
targets = ["thumbv6m-none-eabi", "thumbv7em-none-eabi", "thumbv7em-none-eabihf", "thumbv8m.main-none-eabi", "riscv32imc-unknown-none-elf", "riscv32imac-unknown-none-elf"]
Loading