Re: [Buildroot] [PATCH 2/2 v2] linux: fix build with host-gcc 10+

From: Peter Seiderer <ps.report@gmx.net>
To: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 2/2 v2] linux: fix build with host-gcc 10+
Date: Mon, 31 Jan 2022 23:10:43 +0100	[thread overview]
Message-ID: <20220131231043.615b992b@gmx.net> (raw)
In-Reply-To: <c9dcef5830fdb5a83a625962702dccc093bb9a6c.1643665029.git.yann.morin.1998@free.fr>

Hello Yann,

one nitpick...

On Mon, 31 Jan 2022 22:38:09 +0100, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Some older versions of linux, or custom versions (like forks for some
> boards), fail to build with host-gcc 10+, because of redefined symbols:
>
>       HOSTLD  scripts/dtc/dtc
>     /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition
>     of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
>     collect2: error: ld returned 1 exit status
>
> Since this has been fixed in recent-ish versions, we can't use an
> unconditionaly patch, so we must have a conditional patch. However, a
> patch may not always apply to arbitrary U-Boot versions or forks.

s/U-Boot/Linux kernel/

Regards,
Peter

>
> Upstream just dropped that line altogether:
>     https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e33a814e772cdc36436c8c188d8c42d019fda639
>
> So, we use a little sed-grep combo to do the exact same change.
>
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> ---
> Changes v1 -> v2:
>   - don't fail if no file to fix: use 'grep -Z |xargs -0 -r' (Arnout)
> ---
>  linux/linux.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/linux/linux.mk b/linux/linux.mk
> index dd2eebd446..410b714360 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -268,6 +268,13 @@ endef
>
>  LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES
>
> +# Older versions break on gcc 10+ because of redefined symbols
> +define LINUX_DROP_YYLLOC
> +	$(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \
> +	|xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d'
> +endef
> +LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC
> +
>  # Older linux kernels use deprecated perl constructs in timeconst.pl
>  # that were removed for perl 5.22+ so it breaks on newer distributions
>  # Try a dry-run patch to see if this applies, if it does go ahead

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot