From 92c88fc89680b84cb8e3d6fdb8e903510071e4b7 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 18 Oct 2013 17:13:38 +0200 Subject: [PATCH] * grub-core/lib/xzembed/xz_config.h: Enable all bcj filters when not doing embedded decompressor. --- ChangeLog | 5 +++++ grub-core/lib/xzembed/xz_config.h | 25 ++++++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e9314ed3..20c916222 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-18 Vladimir Serbinenko + + * grub-core/lib/xzembed/xz_config.h: Enable all bcj filters when + not doing embedded decompressor. + 2013-10-18 Vladimir Serbinenko * grub-core/disk/ldm.c: Rename variables and arguments to prevent diff --git a/grub-core/lib/xzembed/xz_config.h b/grub-core/lib/xzembed/xz_config.h index 55b88c476..24d570f2b 100644 --- a/grub-core/lib/xzembed/xz_config.h +++ b/grub-core/lib/xzembed/xz_config.h @@ -26,30 +26,41 @@ /* Enable BCJ filter decoders. */ -#if defined(GRUB_TARGET_CPU_I386) || defined(GRUB_TARGET_CPU_X86_64) +#ifndef GRUB_EMBED_DECOMPRESSOR + +#define XZ_DEC_X86 +#define XZ_DEC_POWERPC +#define XZ_DEC_IA64 +#define XZ_DEC_ARM +#define XZ_DEC_ARMTHUMB +#define XZ_DEC_SPARC + +#else + +#if defined(__i386__) || defined(__x86_64__) #define XZ_DEC_X86 #endif -#ifdef GRUB_TARGET_CPU_POWERPC +#ifdef __powerpc__ #define XZ_DEC_POWERPC #endif -#ifdef GRUB_TARGET_CPU_IA64 +#ifdef __ia64__ #define XZ_DEC_IA64 #endif -#ifdef GRUB_TARGET_CPU_ARM +#ifdef __arm__ #define XZ_DEC_ARM #endif -#if 0 +#ifdef __arm__ #define XZ_DEC_ARMTHUMB #endif -#ifdef GRUB_TARGET_CPU_SPARC +#ifdef __sparc__ #define XZ_DEC_SPARC #endif - +#endif #include "xz.h" #include