* grub-core/lib/xzembed/xz_config.h: Enable all bcj filters when

	not doing embedded decompressor.

diff --git a/ChangeLog b/ChangeLog
index 5e9314ed3e018d4e278716a0f9f7a07c5dd9d58e..20c916222ecfbeceb1ac809de0b585c4106e4500 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/xzembed/xz_config.h: Enable all bcj filters when
+       not doing embedded decompressor.
+
 2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * 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 55b88c476bd6f32bac071fea2174c48ef71e57e8..24d570f2bbd7a43401bfbcee63f2704de9f0745f 100644 (file)
--- 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 <stdlib.h>