git: a2061845faf0 - stable/13 - imgact_elf: Move GNU_ABI_VENDOR to a common header
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 19 Feb 2024 16:45:00 UTC
The branch stable/13 has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=a2061845faf0711fd2437b7123acaa27d338cb3e
commit a2061845faf0711fd2437b7123acaa27d338cb3e
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2023-11-01 15:05:58 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-02-19 12:43:42 +0000
imgact_elf: Move GNU_ABI_VENDOR to a common header
Move the definition of GNU_ABI_VENDOR to a common location so it can
be used in multiple files.
Reviewed by: emaste, kib, imp
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D42442
(cherry picked from commit 9d2612fc2a7e54719058c68b62ea035b029c954f)
---
sys/kern/imgact_elf.c | 1 -
sys/sys/imgact_elf.h | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index cae1889bc4c5..b27129a555c4 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -240,7 +240,6 @@ __elfN(freebsd_trans_osrel)(const Elf_Note *note, int32_t *osrel)
return (true);
}
-static const char GNU_ABI_VENDOR[] = "GNU";
static int GNU_KFREEBSD_ABI_DESC = 3;
Elf_Brandnote __elfN(kfreebsd_brandnote) = {
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 349161a66c48..b0cb6f9fcce7 100644
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -101,6 +101,7 @@ __ElfType(Brandinfo);
#define MAX_BRANDS 8
#define FREEBSD_ABI_VENDOR "FreeBSD"
+#define GNU_ABI_VENDOR "GNU"
typedef void (*outfunc_t)(void *, struct sbuf *, size_t *);