Date: Tue, 21 Dec 2021 15:00:33 GMT From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 433ab94b30af - stable/12 - arm cpufunc: partially undo a9c91abd3bd4 for older gas Message-ID: <202112211500.1BLF0X6k042740@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=433ab94b30af2c2d3d8d5faec3d3c41d87ed028b commit 433ab94b30af2c2d3d8d5faec3d3c41d87ed028b Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2021-12-21 14:59:51 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2021-12-21 14:59:51 +0000 arm cpufunc: partially undo a9c91abd3bd4 for older gas Instead of the "udf" mnemonic, which is not supported by gas 2.17.50, use a .word directive encoding the instruction directly. Direct commit to stable/12, since that still has gas 2.17.50. --- sys/arm/include/cpufunc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h index 00fc1ba5bba1..cc002bf7fcd6 100644 --- a/sys/arm/include/cpufunc.h +++ b/sys/arm/include/cpufunc.h @@ -54,7 +54,7 @@ static __inline void breakpoint(void) { - __asm("udf 0xffff"); + __asm(".word 0xe7ffffff"); /* udf 0xffff */ } struct cpu_functions { @@ -369,7 +369,7 @@ breakpoint(void) * This matches the instruction used by GDB for software * breakpoints. */ - __asm("udf 0xfdee"); + __asm(".word 0xe7ffdefe"); /* udf 0xfdee */ } #endif /* _KERNEL */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112211500.1BLF0X6k042740>