From nobody Thu Dec 21 21:37:39 2023 X-Original-To: dev-commits-src-all@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 4Sx3gR75Kpz54JKv; Thu, 21 Dec 2023 21:37:39 +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 4Sx3gR6ZG1z4Pkc; Thu, 21 Dec 2023 21:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703194659; 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=T/0H456BQz2vpLJL47nD2JGSoFBOoF/qKfF5QzQl/OM=; b=eWW2DQzaABAdx+PoQPaxOKVP4bJEInIEs9ZzNzCXGckQ9sYNdr4RykDlcloE+Mp+vk6OOT XPvC4KBwFBBMk6B9z5abb36HHpRwHgUbcCVcH1kIsJ8tbb7fpD3gc2DDJ/MYy5/1AQ5Mfb Y8NqlrifyVF/JsyxvAYGJgjj2wBhwnfTSlZxrB3VNEGHLFJfOIoviPGL7Yu1/+peldS7Hl QSckVB2SgHOHycmRyL0BQrT7OObRv/vWPNjjK+ZLSNmthF2IG+37JreBp68BaWA+AVv8Hy DtUW3BlCAvgFrjz1ea7IbZDSBafUjKHeVIrjMEhJENARIBY1Gtsxox3FKtdCVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703194659; a=rsa-sha256; cv=none; b=u63As03L0jkk6HZ2NVyrCMBx5sm+HMr+RTVSdN4j3bkSeF3vxZDUOENzlX01h5p+uzsvsQ W9qBctSSjh28OWli46Xvm+biaOywbdt2Bfu/vmxLByRvIKg+1+pkXVXW7sPLp8DoRxbQSF ZW8qixyamzFQ3058oJv6CoHtgErtvde4MC0MJuielaZzxHYxs87HbXVyOuh0jUm+24XAZE s43I7/uNgyzm9Bn2NpO1462KGP03VIcP1J/qo46eB+htWHTZCL2qoQy1XsW99Wedh+tqP8 A+HkBMt/3YSF0Da2VP2Vof6I1OAZOb6wldkIhEERNbmh8ernj7nPXjuSoA4itA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703194659; 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=T/0H456BQz2vpLJL47nD2JGSoFBOoF/qKfF5QzQl/OM=; b=r4sunh5CevNOjIq/PIYhgG2cJl+Bm9T5wtadpI5yOZciMXz+PSLgJ12QXkiE1rdJfrObqW vBmNBVPRU8Er8AfZCt0mHi8nKVCCH8u+s6eiPO1lCJpTjE84rE4fJjBRuXXv2hY6yO+vlq PW6XmUzHJggnk2e1GUBYiiEE5yX/zpOa93YmZqpJJNBptRLm2GAbg8gORb9nWX6sMQU/+2 NFwOmmKsMcKPz74qG/659FbEG+b/05Zsgkj9MbDYR6VR2EqDgZ0jFHn0mqPGHJL/k3XqlU HgtD7ZJH64G87kA/E1gsR+/dycyrxxEf1BlNeLPiR+tbGAmxR567KO6tMsaLcQ== 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 4Sx3gR5cv5zppk; Thu, 21 Dec 2023 21:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BLLbdrk068360; Thu, 21 Dec 2023 21:37:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BLLbdbR068357; Thu, 21 Dec 2023 21:37:39 GMT (envelope-from git) Date: Thu, 21 Dec 2023 21:37:39 GMT Message-Id: <202312212137.3BLLbdbR068357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 5d21ac643bb2 - main - Revert "power*/SYS.h: implement _SYSCALL_BODY() macro" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d21ac643bb2a8d265470bf69043e50f060169d9 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=5d21ac643bb2a8d265470bf69043e50f060169d9 commit 5d21ac643bb2a8d265470bf69043e50f060169d9 Author: Brooks Davis AuthorDate: 2023-12-21 21:36:12 +0000 Commit: Brooks Davis CommitDate: 2023-12-21 21:37:09 +0000 Revert "power*/SYS.h: implement _SYSCALL_BODY() macro" bapt reports build errors on powerpc/powerpc so this is the most likely culprit. This reverts commit e88e1272792e41cbf0a5af1f5f0a858afece0475. --- lib/libc/powerpc/SYS.h | 13 ++++++------- lib/libc/powerpc64/SYS.h | 28 ++++++++++++++++++---------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/lib/libc/powerpc/SYS.h b/lib/libc/powerpc/SYS.h index 24315f369531..8c47a65735f5 100644 --- a/lib/libc/powerpc/SYS.h +++ b/lib/libc/powerpc/SYS.h @@ -40,17 +40,14 @@ li 0,(SYS_##name); \ sc -#define _SYSCALL_BODY(name) \ - _SYSCALL(name) \ - bnslr; \ - b CNAME(HIDENAME(cerror)) - #define PSEUDO(name) \ .text; \ .align 2; \ ENTRY(__sys_##name); \ WEAK_REFERENCE(__sys_##name, _##name); \ - _SYSCALL_BODY(name); \ + _SYSCALL(name); \ + bnslr; \ + b CNAME(HIDENAME(cerror)); \ END(__sys_##name) #define RSYSCALL(name) \ @@ -59,5 +56,7 @@ END(__sys_##name) ENTRY(__sys_##name); \ WEAK_REFERENCE(__sys_##name, name); \ WEAK_REFERENCE(__sys_##name, _##name); \ - _SYSCALL_BODY(name); \ + _SYSCALL(name); \ + bnslr; \ + b CNAME(HIDENAME(cerror)); \ END(__sys_##name) diff --git a/lib/libc/powerpc64/SYS.h b/lib/libc/powerpc64/SYS.h index bf8bc6cc0e27..dccd08b63541 100644 --- a/lib/libc/powerpc64/SYS.h +++ b/lib/libc/powerpc64/SYS.h @@ -40,7 +40,11 @@ li 0,(SYS_##name); \ sc -#define _SYSCALL_BODY(name) \ +#define PSEUDO(name) \ + .text; \ + .align 2; \ +ENTRY(__sys_##name); \ + WEAK_REFERENCE(__sys_##name, _##name); \ _SYSCALL(name); \ bnslr; \ mflr %r0; \ @@ -51,14 +55,7 @@ addi %r1,%r1,48; \ ld %r0,16(%r1); \ mtlr %r0; \ - blr - -#define PSEUDO(name) \ - .text; \ - .align 2; \ -ENTRY(__sys_##name); \ - WEAK_REFERENCE(__sys_##name, _##name); \ - _SYSCALL_BODY(name); \ + blr; \ END(__sys_##name) #define RSYSCALL(name) \ @@ -67,5 +64,16 @@ END(__sys_##name) ENTRY(__sys_##name); \ WEAK_REFERENCE(__sys_##name, name); \ WEAK_REFERENCE(__sys_##name, _##name); \ - _SYSCALL_BODY(name); \ + _SYSCALL(name); \ + bnslr; \ + \ + mflr %r0; \ + std %r0,16(%r1); \ + stdu %r1,-48(%r1); \ + bl CNAME(HIDENAME(cerror)); \ + nop; \ + addi %r1,%r1,48; \ + ld %r0,16(%r1); \ + mtlr %r0; \ + blr; \ END(__sys_##name)