[xz-devel] Re: [xz-devel] [PATCH] [xz-embedded] Fix condition that automatically define XZ_DEC_BCJ

2023-09-08 Thread Jules Maselbas



On September 8, 2023 3:05:59 PM GMT+02:00, Lasse Collin 
 wrote:
> On 2023-09-07 Jules Maselbas wrote:
> > The XZ_DEC_BCJ macro was not defined when only selecting the ARM64 BCJ
> > decoder, leading to no BCJ decoder being compiled.
> > 
> > The macro that select XZ_DEC_BCJ if any of the BCJ decoder is
> > selected was missing a case for the recently added ARM64 BCJ decoder.
> > 
> > Also the macro `defined(XZ_DEC_ARM)` was used twice in the condition
> > for selecting XZ_DEC_BCJ, so this patch replaces one with
> > XZ_DEC_ARM64.
> 
> Thanks! I kept the ordering of the filter names the same as elsewhere
> in the file and in xz_dec_bcj.c.
OK great

> The ARM64 filter still hasn't been submitted to Linux but it's on the
> to-do list.
cool, i've just pushed the ARM64 filter to the barebox bootloader, see:
https://lore.barebox.org/barebox/b4b0c086-ee4a-4cbb-85fb-3499f8de4...@zdiv.net/T/#t




Re: [xz-devel] [PATCH] [xz-embedded] Fix condition that automatically define XZ_DEC_BCJ

2023-09-08 Thread Lasse Collin
On 2023-09-07 Jules Maselbas wrote:
> The XZ_DEC_BCJ macro was not defined when only selecting the ARM64 BCJ
> decoder, leading to no BCJ decoder being compiled.
> 
> The macro that select XZ_DEC_BCJ if any of the BCJ decoder is
> selected was missing a case for the recently added ARM64 BCJ decoder.
> 
> Also the macro `defined(XZ_DEC_ARM)` was used twice in the condition
> for selecting XZ_DEC_BCJ, so this patch replaces one with
> XZ_DEC_ARM64.

Thanks! I kept the ordering of the filter names the same as elsewhere
in the file and in xz_dec_bcj.c.

The ARM64 filter still hasn't been submitted to Linux but it's on the
to-do list.

-- 
Lasse Collin



[xz-devel] [PATCH] [xz-embedded] Fix condition that automatically define XZ_DEC_BCJ

2023-09-07 Thread Jules Maselbas
The XZ_DEC_BCJ macro was not defined when only selecting the ARM64 BCJ
decoder, leading to no BCJ decoder being compiled.

The macro that select XZ_DEC_BCJ if any of the BCJ decoder is selected was
missing a case for the recently added ARM64 BCJ decoder.

Also the macro `defined(XZ_DEC_ARM)` was used twice in the condition for
selecting XZ_DEC_BCJ, so this patch replaces one with XZ_DEC_ARM64.

Signed-off-by: Jules Maselbas 
---
 linux/lib/xz/xz_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/lib/xz/xz_private.h b/linux/lib/xz/xz_private.h
index e3bba7b..94b0350 100644
--- a/linux/lib/xz/xz_private.h
+++ b/linux/lib/xz/xz_private.h
@@ -102,7 +102,7 @@
 #ifndef XZ_DEC_BCJ
 #  if defined(XZ_DEC_X86) || defined(XZ_DEC_POWERPC) \
|| defined(XZ_DEC_IA64) || defined(XZ_DEC_ARM) \
-   || defined(XZ_DEC_ARM) || defined(XZ_DEC_ARMTHUMB) \
+   || defined(XZ_DEC_ARM64) || defined(XZ_DEC_ARMTHUMB) \
|| defined(XZ_DEC_SPARC)
 #  define XZ_DEC_BCJ
 #  endif
-- 
2.42.0