From: "H.J. Lu" <hjl.tools@gmail.com>
To: Florian Weimer <fweimer@redhat.com>
Cc: GNU C Library <libc-alpha@sourceware.org>
Subject: Re: [PATCH 1/5] Linux: Implement a useful version of _startup_fatal
Date: Mon, 2 May 2022 12:45:28 -0700 [thread overview]
Message-ID: <CAMe9rOpdARCeL7RoDXqYYBYA2dHS3HEHr0Lu_RN7ioO2wyYOwQ@mail.gmail.com> (raw)
In-Reply-To: <7a6a51b346a81484046ba392a9854a88568a92aa.1651518694.git.fweimer@redhat.com>
On Mon, May 2, 2022 at 12:16 PM Florian Weimer via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> ---
> sysdeps/unix/sysv/linux/i386/startup.h | 17 ++----------
> sysdeps/unix/sysv/linux/startup.h | 38 ++++++++++++++++++++++++++
> 2 files changed, 40 insertions(+), 15 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/startup.h
>
> diff --git a/sysdeps/unix/sysv/linux/i386/startup.h b/sysdeps/unix/sysv/linux/i386/startup.h
> index 67c9310f3a..694d6cf4e7 100644
> --- a/sysdeps/unix/sysv/linux/i386/startup.h
> +++ b/sysdeps/unix/sysv/linux/i386/startup.h
> @@ -19,19 +19,6 @@
> #if BUILD_PIE_DEFAULT
> /* Can't use "call *%gs:SYSINFO_OFFSET" during statup in static PIE. */
> # define I386_USE_SYSENTER 0
> -
> -# include <sysdep.h>
> -# include <abort-instr.h>
> -
> -__attribute__ ((__noreturn__))
> -static inline void
> -_startup_fatal (const char *message __attribute__ ((unused)))
> -{
> - /* This is only called very early during startup in static PIE.
> - FIXME: How can it be improved? */
> - ABORT_INSTRUCTION;
> - __builtin_unreachable ();
> -}
> -#else
> -# include_next <startup.h>
> #endif
> +
> +#include_next <startup.h>
> diff --git a/sysdeps/unix/sysv/linux/startup.h b/sysdeps/unix/sysv/linux/startup.h
> new file mode 100644
> index 0000000000..a5de941759
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/startup.h
> @@ -0,0 +1,38 @@
> +/* Linux definitions of functions used by static libc main startup.
> + Copyright (C) 2017-2022 Free Software Foundation, Inc.
Shouldn't it just be 2022?
> + 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
> + <https://www.gnu.org/licenses/>. */
> +
> +#ifdef SHARED
> +# include_next <startup.h>
> +#else
> +# include <sysdep.h>
> +
> +/* Avoid a run-time invocation of strlen. */
> +#define _startup_fatal(message) \
Is this needed only for static PIE?
> + do \
> + { \
> + size_t message_length = __builtin_strlen (message); \
> + if (! __builtin_constant_p (message_length)) \
> + { \
> + extern void _startup_fatal_not_constant (void); \
> + _startup_fatal_not_constant (); \
> + } \
> + INTERNAL_SYSCALL_CALL (write, STDERR_FILENO, message, message_length); \
> + INTERNAL_SYSCALL_CALL (exit_group, 127); \
> + } \
> + while (0)
> +#endif /* !SHARED */
> --
> 2.35.1
>
>
--
H.J.
next prev parent reply other threads:[~2022-05-02 19:46 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-02 19:15 [PATCH 0/5] Linux: Fall back to mmap if early sbrk fails Florian Weimer
2022-05-02 19:15 ` [PATCH 1/5] Linux: Implement a useful version of _startup_fatal Florian Weimer
2022-05-02 19:45 ` H.J. Lu [this message]
2022-05-02 19:52 ` Florian Weimer
2022-05-02 20:06 ` H.J. Lu
2022-05-02 20:37 ` Florian Weimer
2022-05-03 5:18 ` Florian Weimer
2022-05-03 15:54 ` H.J. Lu
2022-05-03 16:00 ` Florian Weimer
2022-05-03 16:36 ` H.J. Lu
2022-05-03 16:43 ` Florian Weimer
2022-05-03 16:46 ` H.J. Lu
2022-05-03 16:57 ` Florian Weimer
2022-05-03 17:01 ` Adhemerval Zanella
2022-05-03 20:16 ` Florian Weimer
2022-05-02 19:15 ` [PATCH 2/5] Linux: Define MMAP_CALL_INTERNAL Florian Weimer
2022-05-03 18:30 ` Florian Weimer
2022-05-04 13:10 ` Stefan Liebler
2022-05-02 19:15 ` [PATCH 3/5] i386: Remove OPTIMIZE_FOR_GCC_5 from Linux libc-do-syscall.S Florian Weimer
2022-05-02 19:20 ` H.J. Lu
2022-05-02 19:15 ` [PATCH 4/5] i386: Honor I386_USE_SYSENTER for 6-argument Linux system calls Florian Weimer
2022-05-02 19:24 ` H.J. Lu
2022-05-02 19:15 ` [PATCH 5/5] csu: Implement and use _dl_early_allocate during static startup Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMe9rOpdARCeL7RoDXqYYBYA2dHS3HEHr0Lu_RN7ioO2wyYOwQ@mail.gmail.com \
--to=hjl.tools@gmail.com \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).