From: Richard Sandiford <richard.sandiford@arm.com>
To: Sergey Bugaev <bugaevc@gmail.com>
Cc: gcc-patches@gcc.gnu.org, bug-hurd@gnu.org, thomas@schwinge.name
Subject: Re: [PATCH gcc 1/3] Move GNU/Hurd startfile spec from config/i386/gnu.h to config/gnu.h
Date: Wed, 03 Jan 2024 09:49:06 +0000 [thread overview]
Message-ID: <mpta5pmd9wt.fsf@arm.com> (raw)
In-Reply-To: <20240101115356.614446-1-bugaevc@gmail.com> (Sergey Bugaev's message of "Mon, 1 Jan 2024 14:53:54 +0300")
Sergey Bugaev <bugaevc@gmail.com> writes:
> Since it's not i386-specific; this makes it possible to reuse it for other
> architectures.
>
> Also, add a warning for the case gnu.h is specified before gnu-user.h, which
> would cause gnu-user's version of the spec to override gnu's, and not the other
> way around as it's intended. The i?86-gnu target currently specifies them in
> the right order, but it's easy to accidentally put them in a wrong order.
>
> Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
The series looks good to me FWIW, but Thomas should have the final say.
Thanks,
Richard
> ---
> gcc/config/gnu.h | 16 ++++++++++++++++
> gcc/config/i386/gnu.h | 11 -----------
> 2 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/gcc/config/gnu.h b/gcc/config/gnu.h
> index 97baea939..89904cd9b 100644
> --- a/gcc/config/gnu.h
> +++ b/gcc/config/gnu.h
> @@ -31,3 +31,19 @@ along with GCC. If not, see <http://www.gnu.org/licenses/>.
> builtin_assert ("system=unix"); \
> builtin_assert ("system=posix"); \
> } while (0)
> +
> +
> +#ifndef GNU_USER_TARGET_STARTFILE_SPEC
> +# warning This file should be included after gnu-user.h, to override its STARTFILE_SPEC
> +#endif
> +
> +#undef STARTFILE_SPEC
> +#if defined HAVE_LD_PIE
> +#define STARTFILE_SPEC \
> + "%{!shared: %{pg|p|profile:%{static-pie:grcrt0.o%s;static:gcrt0.o%s;:gcrt1.o%s};static-pie:rcrt0.o%s;static:crt0.o%s;" PIE_SPEC ":Scrt1.o%s;:crt1.o%s}} \
> + crti.o%s %{static:crtbeginT.o%s;shared|static-pie|" PIE_SPEC ":crtbeginS.o%s;:crtbegin.o%s}"
> +#else
> +#define STARTFILE_SPEC \
> + "%{!shared: %{pg|p|profile:%{static:gcrt0.o%s;:gcrt1.o%s};static:crt0.o%s;:crt1.o%s}} \
> + crti.o%s %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
> +#endif
> diff --git a/gcc/config/i386/gnu.h b/gcc/config/i386/gnu.h
> index e776144f9..60244bfc8 100644
> --- a/gcc/config/i386/gnu.h
> +++ b/gcc/config/i386/gnu.h
> @@ -24,17 +24,6 @@ along with GCC. If not, see <http://www.gnu.org/licenses/>.
> #undef GNU_USER_DYNAMIC_LINKER
> #define GNU_USER_DYNAMIC_LINKER "/lib/ld.so"
>
> -#undef STARTFILE_SPEC
> -#if defined HAVE_LD_PIE
> -#define STARTFILE_SPEC \
> - "%{!shared: %{pg|p|profile:%{static-pie:grcrt0.o%s;static:gcrt0.o%s;:gcrt1.o%s};static-pie:rcrt0.o%s;static:crt0.o%s;" PIE_SPEC ":Scrt1.o%s;:crt1.o%s}} \
> - crti.o%s %{static:crtbeginT.o%s;shared|static-pie|" PIE_SPEC ":crtbeginS.o%s;:crtbegin.o%s}"
> -#else
> -#define STARTFILE_SPEC \
> - "%{!shared: %{pg|p|profile:%{static:gcrt0.o%s;:gcrt1.o%s};static:crt0.o%s;:crt1.o%s}} \
> - crti.o%s %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
> -#endif
> -
> #ifdef TARGET_LIBC_PROVIDES_SSP
>
> /* i386 glibc provides __stack_chk_guard in %gs:0x14. */
next prev parent reply other threads:[~2024-01-03 9:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-01 11:53 Sergey Bugaev
2024-01-01 11:53 ` [PATCH gcc 2/3] aarch64: Add support for aarch64-gnu (GNU/Hurd on AArch64) Sergey Bugaev
2024-01-01 11:53 ` [PATCH gcc 3/3] libgcc: Add basic " Sergey Bugaev
2024-01-03 9:49 ` Richard Sandiford [this message]
2024-03-20 19:20 ` [PATCH gcc 1/3] Move GNU/Hurd startfile spec from config/i386/gnu.h to config/gnu.h Thomas Schwinge
2024-03-23 14:38 ` Sergey Bugaev
2024-03-23 14:35 ` [PATCH v2 " Sergey Bugaev
2024-03-23 14:35 ` [PATCH v2 2/3] aarch64: Add support for aarch64-gnu (GNU/Hurd on AArch64) Sergey Bugaev
2024-04-02 17:26 ` Richard Sandiford
2024-04-05 12:13 ` Sergey Bugaev
2024-04-09 7:27 ` Thomas Schwinge
2024-04-09 8:04 ` Sergey Bugaev
2024-04-09 16:24 ` Palmer Dabbelt
2024-04-09 16:57 ` Sergey Bugaev
2024-04-10 0:04 ` Palmer Dabbelt
2024-04-10 7:12 ` Regeneration of 'gcc/config/riscv/riscv.opt.urls' (was: [PATCH v2 2/3] aarch64: Add support for aarch64-gnu (GNU/Hurd on AArch64)) Thomas Schwinge
2024-03-23 14:35 ` [PATCH v2 3/3] libgcc: Add basic support for aarch64-gnu (GNU/Hurd on AArch64) Sergey Bugaev
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=mpta5pmd9wt.fsf@arm.com \
--to=richard.sandiford@arm.com \
--cc=bug-hurd@gnu.org \
--cc=bugaevc@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=thomas@schwinge.name \
/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).