git: 5fdbd21d08e8 - main - freebsd32: rename freebsd4_freebsd32_sigreturn arg

[Brooks Davis]

The branch main has been updated by brooks:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=5fdbd21d08e80c028e50319370a8b08e4be5bf4d

commit 5fdbd21d08e80c028e50319370a8b08e4be5bf4d
Author:     Brooks Davis <bro...@freebsd.org>
AuthorDate: 2021-11-17 20:12:22 +0000
Commit:     Brooks Davis <bro...@freebsd.org>
CommitDate: 2021-11-17 20:12:22 +0000

    freebsd32: rename freebsd4_freebsd32_sigreturn arg
    
    Rename struct freebsd4_freebsd32_ucontext to struct freebsd4_ucontext32
    allowing conversion from the default ABI's struct freebsd4_ucontext
    by appending "32".  This has no practical effect as this type does not
    actually exist.
    
    Give freebsd4_freebsd32_sigreturn an ANSI C prototype.
    
    Reviewed by:    kevans
---
 sys/compat/freebsd32/freebsd32_proto.h | 2 +-
 sys/compat/freebsd32/syscalls.master   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/compat/freebsd32/freebsd32_proto.h 
b/sys/compat/freebsd32/freebsd32_proto.h
index 29bde63f4cec..9b67675e3e05 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -1044,7 +1044,7 @@ struct freebsd4_freebsd32_sigaction_args {
        char oact_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * oact; 
char oact_r_[PADR_(struct sigaction32 *)];
 };
 struct freebsd4_freebsd32_sigreturn_args {
-       char sigcntxp_l_[PADL_(const struct freebsd4_freebsd32_ucontext *)]; 
const struct freebsd4_freebsd32_ucontext * sigcntxp; char 
sigcntxp_r_[PADR_(const struct freebsd4_freebsd32_ucontext *)];
+       char sigcntxp_l_[PADL_(const struct freebsd4_ucontext32 *)]; const 
struct freebsd4_ucontext32 * sigcntxp; char sigcntxp_r_[PADR_(const struct 
freebsd4_ucontext32 *)];
 };
 #ifdef PAD64_REQUIRED
 #else
diff --git a/sys/compat/freebsd32/syscalls.master 
b/sys/compat/freebsd32/syscalls.master
index 1cf37d777c25..2d3be2e971ce 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -625,7 +625,7 @@
                                    struct sigaction32 *oact); }
 343    AUE_SIGPENDING  NOPROTO { int sigpending(sigset_t *set); }
 344    AUE_SIGRETURN   COMPAT4 { int freebsd32_sigreturn( \
-                   const struct freebsd4_freebsd32_ucontext *sigcntxp); }
+                   const struct freebsd4_ucontext32 *sigcntxp); }
 345    AUE_SIGWAIT     STD     { int freebsd32_sigtimedwait(const sigset_t 
*set, \
                                    struct siginfo32 *info, \
                                    const struct timespec *timeout); }