From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 18 Jan 2012 12:59:03 +0000 (+0100)
Subject: 	Make XZ compression parameters dependent on target and not host CPU.
X-Git-Tag: 2.00~787
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ec0fc1c3bdf6743c08e39f9c6faa5d86a7f1a40;p=thirdparty%2Fgrub.git

	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 4479081e8..d7529526d 100644
--- 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 bdaff3646..8a33d036c 100644
--- 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 0af0d2b81..55b88c476 100644
--- 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