[Buildroot] [PATCH] package/pdbg: Fix alignment error on autobuilder

[Arnout Vandecappelle]

On 03/08/2021 10:16, Joel Stanley wrote:
> The autobuilder fails when building for sh because of an alignment issue
> in assembly that includes an external data file.
> 
>  http://autobuild.buildroot.net/results/457b88c4ba85edb42b3a36cce48bf90712f590bf/
> 
> This fix has been submitted upstream.

 Has it? I'm looking at the PRs and issues on github and can't find anything. Is
there some other upstream that I can't find?


 Applied to master regardless, thanks.

 Regards,
 Arnout

> 
> Signed-off-by: Joel Stanley <joel at jms.id.au>
> ---
>  .../pdbg/0001-template-Fix-alignment.patch    | 39 +++++++++++++++++++
>  1 file changed, 39 insertions(+)
>  create mode 100644 package/pdbg/0001-template-Fix-alignment.patch
> 
> diff --git a/package/pdbg/0001-template-Fix-alignment.patch b/package/pdbg/0001-template-Fix-alignment.patch
> new file mode 100644
> index 000000000000..e95d8344e2d6
> --- /dev/null
> +++ b/package/pdbg/0001-template-Fix-alignment.patch
> @@ -0,0 +1,39 @@
> +From 0080d0a64da274207bc341491f87863952bb6e3b Mon Sep 17 00:00:00 2001
> +From: Joel Stanley <joel at jms.id.au>
> +Date: Tue, 3 Aug 2021 17:28:17 +0930
> +Subject: [PATCH] template: Fix alignment
> +
> +The assembler complains about unaliged data:
> +
> + ./template.S: Assembler messages:
> + ./template.S:21: Error: misaligned data
> +
> +If the included data is not an aligned size, the the symbols following
> +will be unaligned.
> +
> +We lost the alignment directive in commit 5f3deee1289e ("template: new
> +libfdt requires 8-byte aligned fdt"), so add it back as it was before
> +that commit.
> +
> +Reported by the buildroot autobuilder.
> +
> +Signed-off-by: Joel Stanley <joel at jms.id.au>
> +---
> + template.S | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/template.S b/template.S
> +index ecf9bba0656d..df8c064d6bc0 100644
> +--- a/template.S
> ++++ b/template.S
> +@@ -17,6 +17,7 @@
> + SYM_START(SYMBOL_PREFIX):
> + .incbin FILENAME
> + SYM_END(SYMBOL_PREFIX):
> ++.align 4
> + SYM_SIZE(SYMBOL_PREFIX):
> + 	.long	SYM_END(SYMBOL_PREFIX) - SYM_START(SYMBOL_PREFIX)
> + .globl SYM_START(SYMBOL_PREFIX)
> +-- 
> +2.32.0
> +
>