The branch main has been updated by arrowd (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=feac06569a381dd7fec92c7d490fc34ef0bbdda5
commit feac06569a381dd7fec92c7d490fc34ef0bbdda5 Author: Gleb Popov <arr...@freebsd.org> AuthorDate: 2021-07-22 15:28:21 +0000 Commit: Gleb Popov <arr...@freebsd.org> CommitDate: 2021-07-25 10:51:09 +0000 lib/csu: Get rid of unused fptr typedef on amd64. Make i386 and riscv parts not use it. Approved by: kib Differential Revision: https://reviews.freebsd.org/D31281 --- lib/csu/amd64/crt1_c.c | 2 -- lib/csu/i386/crt1_c.c | 6 ++---- lib/csu/riscv/crt1_c.c | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/csu/amd64/crt1_c.c b/lib/csu/amd64/crt1_c.c index 9dbd34492023..f1c99de9ffe0 100644 --- a/lib/csu/amd64/crt1_c.c +++ b/lib/csu/amd64/crt1_c.c @@ -34,8 +34,6 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" #include "ignore_init.c" -typedef void (*fptr)(void); - #ifdef GCRT extern void _mcleanup(void); extern void monstartup(void *, void *); diff --git a/lib/csu/i386/crt1_c.c b/lib/csu/i386/crt1_c.c index 0d82cda6fa1f..b39134824f7e 100644 --- a/lib/csu/i386/crt1_c.c +++ b/lib/csu/i386/crt1_c.c @@ -34,8 +34,6 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" #include "ignore_init.c" -typedef void (*fptr)(void); - extern void _start(char *, ...); #ifdef GCRT @@ -45,11 +43,11 @@ extern int eprol; extern int etext; #endif -void _start1(fptr, int, char *[]) __dead2; +void _start1(void (*)(void), int, char *[]) __dead2; /* The entry function, C part. */ void -_start1(fptr cleanup, int argc, char *argv[]) +_start1(void (*cleanup)(void), int argc, char *argv[]) { char **env; diff --git a/lib/csu/riscv/crt1_c.c b/lib/csu/riscv/crt1_c.c index 9291d6d200df..11519e46c7f3 100644 --- a/lib/csu/riscv/crt1_c.c +++ b/lib/csu/riscv/crt1_c.c @@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" #include "ignore_init.c" -typedef void (*fptr)(void); - #ifdef GCRT extern void _mcleanup(void); extern void monstartup(void *, void *); _______________________________________________ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"