From nobody Tue Dec 21 15:00:33 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6C9851908CE5; Tue, 21 Dec 2021 15:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJKQ96Cywz3llX; Tue, 21 Dec 2021 15:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A6448384D; Tue, 21 Dec 2021 15:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BLF0XQk042741; Tue, 21 Dec 2021 15:00:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BLF0X6k042740; Tue, 21 Dec 2021 15:00:33 GMT (envelope-from git) Date: Tue, 21 Dec 2021 15:00:33 GMT Message-Id: <202112211500.1BLF0X6k042740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 433ab94b30af - stable/12 - arm cpufunc: partially undo a9c91abd3bd4 for older gas List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 433ab94b30af2c2d3d8d5faec3d3c41d87ed028b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640098833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=41r4DG3tge54ko1ozY992LtnCMgg0FLi2vxswYpncKY=; b=xBmysOMTKhK2F/MDeHNWfq0DPVYqf/g645f2pwr617B+BRnO/2zymSlxsgxCswEjsd1bQi os7Q4KeGQko290pS861Oayh+8SjjrpASvcxagk2tmGt1vu46wwJ38jn3oMWCWu35eYyc/s 6sSlcjIv9qiIX0WGEiTjBXD0xisIGySIFeiU7ZTapjxwHKDDv9BSCpFwSIjWQX7Sg5OYjD kMFfnTN3Jr7naMyU3GwF4MxcwHqWmqkqhblehq1sdZny61EhxgzVoKHaRujelW7cmk7NOa CTDUHpKiBt46Cw3ud9fJ1n/ZpaX2IuedqlAZqjOm+B3uamCWYYRBcJLfp9GY+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640098833; a=rsa-sha256; cv=none; b=klROr58iBkE/34Lcm1JLrj/2ryQ13ZHkNofKgnot75ytTSCrMpxy70u8UbCqr/hX1HvdzM XIxpseGai+zh1fyyfoI9f4Pr47ueOnHXysHRJNigDkteyHWEllKA1/f/abMsTZqQElyOr8 VmgqtoIcsQ/YUi9QGH2SzUwglY89QRQ0I1xYUBEgeykXvdfPmMqVaFLerat/gRYkQjV1/+ to8alW0jZAySgMl1xnR38lw1Tea77ifaO38Wig6cWpv57T/ERQVBfMZlVS7xxPRxz1v+gr +y/LmX1qsDFeCFO/uMarteEl2RMia6FxUvnGY4oYedOFSq7MdaAlK62/stb+hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=433ab94b30af2c2d3d8d5faec3d3c41d87ed028b commit 433ab94b30af2c2d3d8d5faec3d3c41d87ed028b Author: Dimitry Andric AuthorDate: 2021-12-21 14:59:51 +0000 Commit: Dimitry Andric 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 */