[1723] 2008-07-18 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 1723
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1723
Author:   proski
Date:     2008-07-18 16:11:35 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
2008-07-18  Pavel Roskin  <address@hidden>

        * 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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/kern/dl.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-07-18 03:47:33 UTC (rev 1722)
+++ trunk/grub2/ChangeLog       2008-07-18 16:11:35 UTC (rev 1723)
@@ -1,3 +1,10 @@
+2008-07-18  Pavel Roskin  <address@hidden>
+
+       * 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  <address@hidden>
 
        * configure.ac: Use -m32 or -m64 regardless of whether we had to

Modified: trunk/grub2/kern/dl.c
===================================================================
--- trunk/grub2/kern/dl.c       2008-07-18 03:47:33 UTC (rev 1722)
+++ trunk/grub2/kern/dl.c       2008-07-18 16:11:35 UTC (rev 1723)
@@ -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 @@
 # 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;