From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 1AD9E3850416; Wed, 12 Oct 2022 14:16:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1AD9E3850416 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665584216; bh=LKQRqtHRB8Kb80qYOS0dfaKFAmkvol94wiXDfWwwL78=; h=From:To:Subject:Date:From; b=HZA4pXC/Ozwk0nuyq1xjS+m1hRfZRIpXL/Dkw3x0Inr6H/vopd2feksuLPpOZxRt8 Y7YfsMWMdzQCgOwEbIwMD8FnM+XCiKZerdMFwgIG8KUMv3hxKl04waMpenl9RnHUF5 0BQsSecqQ17K4PrL+UOPips68vwBSyNQdYFqYipM= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: change __libc_start_main prototype X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: d5f9769d535b795f051cb5d73625f6f4d087d25a X-Git-Newrev: 8d2bab6e1795b5a2a6656a81e7419d6820a5d9cf Message-Id: <20221012141656.1AD9E3850416@sourceware.org> Date: Wed, 12 Oct 2022 14:16:56 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8d2bab6e1795b5a2a6656a81e7419d6820a5d9cf commit 8d2bab6e1795b5a2a6656a81e7419d6820a5d9cf Author: Szabolcs Nagy Date: Tue Aug 30 10:01:44 2022 +0100 cheri: change __libc_start_main prototype The prototype of __libc_start_main is changed to void __libc_start_main (int main (int, char **, char **, void *), int argc, char **argv, char **envp, void *auxv, void rtld_fini (void), void *sp); so envp is passed down separately and the unused init, fini args are dropped. Diff: --- csu/libc-start.c | 16 +++++++++++ sysdeps/aarch64/morello/start.c | 13 +++++---- .../unix/sysv/linux/aarch64/morello/libc-start.c | 32 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/csu/libc-start.c b/csu/libc-start.c index 2726fbdbec..2acefceb1a 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -210,11 +210,16 @@ STATIC int LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), int argc, char **argv, +#ifdef LIBC_START_MAIN_ENVP_ARG + char **envp, +#endif #ifdef LIBC_START_MAIN_AUXVEC_ARG ElfW(auxv_t) *auxvec, #endif +#ifndef LIBC_START_MAIN_NO_INITFINI_ARG __typeof (main) init, void (*fini) (void), +#endif void (*rtld_fini) (void), void *stack_end) __attribute__ ((noreturn)); @@ -233,15 +238,24 @@ STATIC int LIBC_START_MAIN (int (*main) (int, char **, char ** STATIC int LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), int argc, char **argv, +#ifdef LIBC_START_MAIN_ENVP_ARG + char **envp, +#endif #ifdef LIBC_START_MAIN_AUXVEC_ARG ElfW(auxv_t) *auxvec, #endif +#ifndef LIBC_START_MAIN_NO_INITFINI_ARG __typeof (main) init, void (*fini) (void), +#endif void (*rtld_fini) (void), void *stack_end) { #ifndef SHARED +#ifdef LIBC_START_MAIN_ENVP_ARG + char **ev = envp; +#else char **ev = &argv[argc + 1]; +#endif __environ = ev; @@ -358,11 +372,13 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS, 0)) GLRO(dl_debug_printf) ("\ninitialize program: %s\n\n", argv[0]); +#ifndef LIBC_START_MAIN_NO_INITFINI_ARG if (init != NULL) /* This is a legacy program which supplied its own init routine. */ (*init) (argc, argv, __environ MAIN_AUXVEC_PARAM); else +#endif /* This is a current program. Use the dynamic segment to find constructors. */ call_init (argc, argv, __environ); diff --git a/sysdeps/aarch64/morello/start.c b/sysdeps/aarch64/morello/start.c index 5af010f8c3..dda9adb30e 100644 --- a/sysdeps/aarch64/morello/start.c +++ b/sysdeps/aarch64/morello/start.c @@ -136,11 +136,10 @@ apply_rel (uintptr_t base, uintptr_t start, uintptr_t end) } #endif /* !SHARED */ -int main (int argc, char **argv); +int main (int argc, char **argv, char **envp, void *auxv); -void __libc_start_main (int main (int, char **), - int argc, char **argv, - void *init, void *fini, +void __libc_start_main (int main (int, char **, char **, void *), + int argc, char **argv, char **envp, void *auxv, void rtld_fini (void), void *sp); void @@ -161,7 +160,11 @@ __real_start (void rtld_fini (void), uintptr_t *sp) int argc = *sp; char **argv = (char **) (sp + 1); - __libc_start_main (main, argc, argv, 0, 0, rtld_fini, sp); + char **envp = argv + argc + 1; + char **p = envp; + while (*p) p++; + void *auxv = p + 1; + __libc_start_main (main, argc, argv, envp, auxv, rtld_fini, sp); __builtin_trap (); } diff --git a/sysdeps/unix/sysv/linux/aarch64/morello/libc-start.c b/sysdeps/unix/sysv/linux/aarch64/morello/libc-start.c new file mode 100644 index 0000000000..4b04648054 --- /dev/null +++ b/sysdeps/unix/sysv/linux/aarch64/morello/libc-start.c @@ -0,0 +1,32 @@ +/* Override csu/libc-start.c on Morello. + Copyright (C) 2017-2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef SHARED +# include +# include + +extern struct cpu_features _dl_aarch64_cpu_features; + +# define ARCH_INIT_CPU_FEATURES() init_cpu_features (&_dl_aarch64_cpu_features) +#endif + +#define LIBC_START_MAIN_ENVP_ARG +#define LIBC_START_MAIN_AUXVEC_ARG +#define LIBC_START_MAIN_NO_INITFINI_ARG +#define MAIN_AUXVEC_ARG +#include