git: 24c558ca3c04 - stable/13 - imgact_elf: Avoid redefining suword()

[Mark Johnston]

The branch stable/13 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=24c558ca3c04e23681ddefe13d0cd5f98bba9fac

commit 24c558ca3c04e23681ddefe13d0cd5f98bba9fac
Author:     Mark Johnston <markj at FreeBSD.org>
AuthorDate: 2021-07-23 19:40:54 +0000
Commit:     Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-07-30 00:32:58 +0000

    imgact_elf: Avoid redefining suword()
    
    Otherwise this interferes with the definition for sanitizer
    interceptors.
    
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit ebf9886654f42718229011524a81e2b36e51f9b1)
---
 sys/kern/imgact_elf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 563629b747b5..9d039b914fb5 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -1345,7 +1345,7 @@ ret:
 	return (error);
 }
 
-#define	suword __CONCAT(suword, __ELF_WORD_SIZE)
+#define	elf_suword __CONCAT(suword, __ELF_WORD_SIZE)
 
 int
 __elfN(freebsd_copyout_auxargs)(struct image_params *imgp, uintptr_t base)
@@ -1418,7 +1418,7 @@ __elfN(freebsd_fixup)(uintptr_t *stack_base, struct image_params *imgp)
 
 	base = (Elf_Addr *)*stack_base;
 	base--;
-	if (suword(base, imgp->args->argc) == -1)
+	if (elf_suword(base, imgp->args->argc) == -1)
 		return (EFAULT);
 	*stack_base = (uintptr_t)base;
 	return (0);