[PATCH] arm64: Support running gen_vdso_offsets.sh with BSD userland.

[PATCH] arm64: Support running gen_vdso_offsets.sh with BSD userland.

[John Millikin]

BSD sed ignores whitespace character escape sequences such as '\t' in
the replacement string, causing this script to produce the following
incorrect output:

  #define vdso_offset_sigtrampt0x089c

Changing the hard tab to ' ' causes both BSD and GNU dialects of sed
to produce equivalent output.

Signed-off-by: John Millikin <john@john-millikin.com>
---
Re-sending because I bungled the original email enough to get it rejected by the list software.

 arch/arm64/kernel/vdso/gen_vdso_offsets.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/vdso/gen_vdso_offsets.sh b/arch/arm64/kernel/vdso/gen_vdso_offsets.sh
index 8b806eacd0a6..0387209d65b1 100755
--- a/arch/arm64/kernel/vdso/gen_vdso_offsets.sh
+++ b/arch/arm64/kernel/vdso/gen_vdso_offsets.sh
@@ -13,4 +13,4 @@
 
 LC_ALL=C
 sed -n -e 's/^00*/0/' -e \
-'s/^\([0-9a-fA-F]*\) . VDSO_\([a-zA-Z0-9_]*\)$/\#define vdso_offset_\2\t0x\1/p'
+'s/^\([0-9a-fA-F]*\) . VDSO_\([a-zA-Z0-9_]*\)$/\#define vdso_offset_\2 0x\1/p'
-- 


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] arm64: Support running gen_vdso_offsets.sh with BSD userland.

[Will Deacon]

On Wed, 23 Dec 2020 14:10:56 +0900, John Millikin wrote:
> BSD sed ignores whitespace character escape sequences such as '\t' in
> the replacement string, causing this script to produce the following
> incorrect output:
> 
>   #define vdso_offset_sigtrampt0x089c
> 
> Changing the hard tab to ' ' causes both BSD and GNU dialects of sed
> to produce equivalent output.

Unfortunately, the patch you sent was still reported as 'corrupt' by git,
so I ended up having to fix it by hand. Please check that the result is
correct.

Applied to arm64 (for-next/vdso), thanks!

[1/1] arm64: Support running gen_vdso_offsets.sh with BSD userland.
      https://git.kernel.org/arm64/c/f3cb097ad888

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] arm64: Support running gen_vdso_offsets.sh with BSD userland.

[Catalin Marinas]

On Mon, Dec 14, 2020 at 05:03:52PM +0900, John Millikin wrote:
> BSD sed ignores whitespace character escape sequences such as '\t' in
> the replacement string, causing this script to produce the following
> incorrect output:
> 
>   #define vdso_offset_sigtrampt0x089c
> 
> Changing the hard tab to ' ' causes both BSD and GNU dialects of sed
> to produce equivalent output.
> 
> Signed-off-by: John Millikin <john@john-millikin.com>
> ---
>  arch/arm64/kernel/vdso/gen_vdso_offsets.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/vdso/gen_vdso_offsets.sh b/arch/arm64/kernel/
> vdso/gen_vdso_offsets.sh
> index 8b806eacd0a6..0387209d65b1 100755
> --- a/arch/arm64/kernel/vdso/gen_vdso_offsets.sh
> +++ b/arch/arm64/kernel/vdso/gen_vdso_offsets.sh
> @@ -13,4 +13,4 @@
>  
>  LC_ALL=C
>  sed -n -e 's/^00*/0/' -e \
> -'s/^\([0-9a-fA-F]*\) . VDSO_\([a-zA-Z0-9_]*\)$/\#define vdso_offset_\2\t0x\1/
> p'
> +'s/^\([0-9a-fA-F]*\) . VDSO_\([a-zA-Z0-9_]*\)$/\#define vdso_offset_\2 0x\1/p'
> --
> 2.24.3 (Apple Git-128)

I'm ok with the patch but could you please send it with git send-email?
More importantly, as text/plain as it arrived as html in my inbox and
the mailing list blocked it.

Thanks.

-- 
Catalin

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel