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 ceb29f0d74914cb4e359422e75f29aa5c5702ce4..7df7c4219679ea7f2a3f610440623bbba5c7e424 100644 (file)
--- 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 b57e78dc3aa86e3b6450b0fed9e6fad40bef2e2a..c0d9f1d03ecfaa362f5d4a05bfe727ddb46549e3 100644 (file)
--- 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;