From: proski <proski@localhost>
Date: Fri, 18 Jul 2008 16:11:35 +0000 (+0000)
Subject: 2008-07-18  Pavel Roskin  <proski@gnu.org>
X-Git-Tag: 1.98~1393
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b095e2adbfe3914b4d788ea315e6c0fbd33460ea;p=thirdparty%2Fgrub.git

2008-07-18  Pavel Roskin  <proski@gnu.org>

	* kern/dl.c: Go back to using GRUB_CPU_SIZEOF_VOID_P.  We cannot
	load foreign architecture modules correctly anyway.  Keep
	support for loading host architecture modules, whether we
	compile them or not.
---

diff --git a/ChangeLog b/ChangeLog
index ceb29f0d7..7df7c4219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-18  Pavel Roskin  <proski@gnu.org>
+
+	* kern/dl.c: Go back to using GRUB_CPU_SIZEOF_VOID_P.  We cannot
+	load foreign architecture modules correctly anyway.  Keep
+	support for loading host architecture modules, whether we
+	compile them or not.
+
 2008-07-17  Pavel Roskin  <proski@gnu.org>
 
 	* configure.ac: Use -m32 or -m64 regardless of whether we had to
diff --git a/kern/dl.c b/kern/dl.c
index b57e78dc3..c0d9f1d03 100644
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -29,7 +29,7 @@
 #include <grub/env.h>
 #include <grub/cache.h>
 
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
+#if GRUB_CPU_SIZEOF_VOID_P == 4
 
 typedef Elf32_Word Elf_Word;
 typedef Elf32_Addr Elf_Addr;
@@ -40,7 +40,7 @@ typedef Elf32_Sym Elf_Sym;
 # define ELF_ST_BIND(val)	ELF32_ST_BIND (val)
 # define ELF_ST_TYPE(val)	ELF32_ST_TYPE (val)
 
-#elif GRUB_TARGET_SIZEOF_VOID_P == 8
+#elif GRUB_CPU_SIZEOF_VOID_P == 8
 
 typedef Elf64_Word Elf_Word;
 typedef Elf64_Addr Elf_Addr;