Merge "fix: update definitions for sysregs on older toolchains"