Make XZ compression parameters dependent on target and not host CPU.

	* configure.ac: Define GRUB_TARGET_CPU_XYZ series.
	* grub-core/lib/xzembed/xz_config.h: Use GRUB_TARGET_CPU_XYZ.

diff --git a/ChangeLog b/ChangeLog
index 4479081e8652b3481e1f87a3d31e7c3866a85d89..d7529526d4fd77ce2bdb32b97ff1a3076ac38724 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Make XZ compression parameters dependent on target and not host CPU.
+
+       * configure.ac: Define GRUB_TARGET_CPU_XYZ series.
+       * grub-core/lib/xzembed/xz_config.h: Use GRUB_TARGET_CPU_XYZ.
+
 2012-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/powerpc/dl.c (grub_arch_dl_get_tramp_got_size): Remove

diff --git a/configure.ac b/configure.ac
index bdaff3646a6360f84d313e2a62444922b0fcf72a..8a33d036cb4f3c29d7c03abd53814ee30549a1f0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -177,7 +177,7 @@ esac
 if test x${target_cpu} = xmipsel ; then
    machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE=`echo mips_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
 else
-   machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
+   machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,` -DGRUB_TARGET_CPU_`echo ${target_cpu} | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`=1"
 fi
 
 HOST_CPPFLAGS="$HOST_CPPFLAGS $machine_CPPFLAGS"

diff --git a/grub-core/lib/xzembed/xz_config.h b/grub-core/lib/xzembed/xz_config.h
index 0af0d2b813d16236465c6119c51e399c66a63fcd..55b88c476bd6f32bac071fea2174c48ef71e57e8 100644 (file)
--- a/grub-core/lib/xzembed/xz_config.h
+++ b/grub-core/lib/xzembed/xz_config.h
@@ -26,27 +26,27 @@
 
 /* Enable BCJ filter decoders. */
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(GRUB_TARGET_CPU_I386) || defined(GRUB_TARGET_CPU_X86_64)
   #define XZ_DEC_X86
 #endif
 
-#ifdef __powerpc__
+#ifdef GRUB_TARGET_CPU_POWERPC
   #define XZ_DEC_POWERPC
 #endif
 
-#ifdef __ia64__
+#ifdef GRUB_TARGET_CPU_IA64
   #define XZ_DEC_IA64
 #endif
 
-#ifdef __arm__
+#ifdef GRUB_TARGET_CPU_ARM
   #define XZ_DEC_ARM
 #endif
 
-#ifdef __thumb__
+#if 0
   #define XZ_DEC_ARMTHUMB
 #endif
 
-#ifdef __sparc__
+#ifdef GRUB_TARGET_CPU_SPARC
   #define XZ_DEC_SPARC
 #endif