From 5faeda903753d20a7a857167a68713d1659474e1 Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Thu, 21 Jan 2021 01:54:12 +0000 Subject: [PATCH] Rename i386's Linux ELF to Linux ELF32 This is what amd64 calls the i386 Linux ABI in order to distinguish it from the amd64 Linux ABI, and matches the nomenclature used for the FreeBSD ABIs where they always have the size suffix in the name. Reviewed by: trasz Differential Revision: https://reviews.freebsd.org/D27647 --- sys/i386/linux/linux_sysvec.c | 2 +- usr.bin/truss/setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 7bd1102e48a0..10229d8af57e 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -882,7 +882,7 @@ struct sysentvec elf_linux_sysvec = { .sv_sendsig = linux_sendsig, .sv_sigcode = &_binary_linux_locore_o_start, .sv_szsigcode = &linux_szsigcode, - .sv_name = "Linux ELF", + .sv_name = "Linux ELF32", .sv_coredump = elf32_coredump, .sv_imgact_try = linux_exec_imgact_try, .sv_minsigstksz = LINUX_MINSIGSTKSZ, diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c index 172d7d5d366c..d21ec133f483 100644 --- a/usr.bin/truss/setup.c +++ b/usr.bin/truss/setup.c @@ -141,7 +141,7 @@ static struct procabi_table abis[] = { { "Linux ELF64", &linux }, { "Linux ELF32", &linux32 }, #else - { "Linux ELF", &linux }, + { "Linux ELF32", &linux }, #endif };