Re: [PATCH] x86/alternatives: fix build issue with binutils before 2.28
From: Jingbo Xu
Date: Tue Apr 18 2023 - 04:09:08 EST
On 4/18/23 2:42 PM, Willy Tarreau wrote:
> The usage of the BIT() macro in asm code was introduced in 6.3 in by
> commit 5d1dd961e743 ("x86/alternatives: Add alt_instr.flags") but this
> macro uses "1UL" in the shift operations, while gas before 2.28 do not
> support the "L" suffix after a number, and those before 2.27 do not
> support the "U" suffix, resulting in build errors such as the following
> with such versions:
>
> ./arch/x86/include/asm/uaccess_64.h:124: Error: found 'L', expected: ')'
> ./arch/x86/include/asm/uaccess_64.h:124: Error: junk at end of line,
> first unrecognized character is `L'
>
> There's a single use of this macro here, let's revert to (1 << 0) that
> works with such older binutils.
>
> Cc: Jingbo Xu <jefflexu@xxxxxxxxxxxxxxxxx>
> Cc: Borislav Petkov <bp@xxxxxxxxx>
> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
> Link: https://lore.kernel.org/lkml/a9aae568-3046-306c-bd71-92c1fc8eeddc@xxxxxxxxxxxxxxxxx/
> Signed-off-by: Willy Tarreau <w@xxxxxx>
> ---
>
> Boris, I understood from your message that 2.28 was the first working version,
> so that's what I mentioned here. My tests showed that 2.27 wasn't sufficient
> and that 2.29 was OK. If I was wrong and it's 2.29 instead, feel free to edit
> the subject line, description and the comment, I'm totally fine with this!
>
>
> arch/x86/include/asm/alternative.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
> index e2975a32d443..b119685c0b31 100644
> --- a/arch/x86/include/asm/alternative.h
> +++ b/arch/x86/include/asm/alternative.h
> @@ -8,7 +8,7 @@
>
> #define ALT_FLAGS_SHIFT 16
>
> -#define ALT_FLAG_NOT BIT(0)
> +#define ALT_FLAG_NOT (1 << 0) /* note: gas < 2.28 can't use BIT(0) */
> #define ALT_NOT(feature) ((ALT_FLAG_NOT << ALT_FLAGS_SHIFT) | (feature))
>
> #ifndef __ASSEMBLY__
It works for me.
Tested-by: Jingbo Xu <jefflexu@xxxxxxxxxxxxxxxxx>
--
Thanks,
Jingbo