hurd-l4 wortel/ChangeLog wortel/loader.c laden/...

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/09/29 12:03:55

Modified files:
        wortel         : ChangeLog loader.c 
        laden          : ChangeLog loader.c 

Log message:
        2003-09-29  Marcus Brinkmann  <address@hidden>
        
        * loader.c (loader_elf_load): Fix wordsize check.  Submitted by
        Johan Rydberg.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/ChangeLog.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/loader.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/ChangeLog.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/loader.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: hurd-l4/laden/ChangeLog
diff -u hurd-l4/laden/ChangeLog:1.8 hurd-l4/laden/ChangeLog:1.9
--- hurd-l4/laden/ChangeLog:1.8 Fri Sep 26 09:46:53 2003
+++ hurd-l4/laden/ChangeLog     Mon Sep 29 12:03:55 2003
@@ -1,3 +1,8 @@
+2003-09-29  Marcus Brinkmann  <address@hidden>
+
+       * loader.c (loader_elf_load): Fix wordsize check.  Submitted by
+       Johan Rydberg.
+
 2003-09-25  Johan Rydberg  <address@hidden>
 
         * laden.c (main): Call start_kernel to launch kernel instead
Index: hurd-l4/laden/loader.c
diff -u hurd-l4/laden/loader.c:1.11 hurd-l4/laden/loader.c:1.12
--- hurd-l4/laden/loader.c:1.11 Thu Sep 25 09:46:39 2003
+++ hurd-l4/laden/loader.c      Mon Sep 29 12:03:55 2003
@@ -189,9 +189,9 @@
 
   /* FIXME: Some architectures support both word sizes.  */
   if (!((elf->e_ident[EI_CLASS] == ELFCLASS32
-        && L4_WORDSIZE == 32)
+        && L4_WORDSIZE == L4_WORDSIZE_32)
        || (elf->e_ident[EI_CLASS] == ELFCLASS64
-           && L4_WORDSIZE == 64)))
+           && L4_WORDSIZE == L4_WORDSIZE_64)))
     panic ("%s has invalid word size", name);
   if (!((elf->e_ident[EI_DATA] == ELFDATA2LSB
         && L4_BYTE_ORDER == L4_LITTLE_ENDIAN)
Index: hurd-l4/wortel/ChangeLog
diff -u hurd-l4/wortel/ChangeLog:1.6 hurd-l4/wortel/ChangeLog:1.7
--- hurd-l4/wortel/ChangeLog:1.6        Thu Sep 25 08:39:20 2003
+++ hurd-l4/wortel/ChangeLog    Mon Sep 29 12:03:54 2003
@@ -1,3 +1,8 @@
+2003-09-29  Marcus Brinkmann  <address@hidden>
+
+       * loader.c (loader_elf_load): Fix wordsize check.  Submitted by
+       Johan Rydberg.
+
 2003-09-25  Marcus Brinkmann  <address@hidden>
 
        * loader.c [HAVE_CONFIG_H]: Include <config.h>.
Index: hurd-l4/wortel/loader.c
diff -u hurd-l4/wortel/loader.c:1.6 hurd-l4/wortel/loader.c:1.7
--- hurd-l4/wortel/loader.c:1.6 Thu Sep 25 08:39:21 2003
+++ hurd-l4/wortel/loader.c     Mon Sep 29 12:03:55 2003
@@ -188,11 +188,10 @@
 
   /* FIXME: Some architectures support both word sizes.  */
   if (!((elf->e_ident[EI_CLASS] == ELFCLASS32
-        && L4_WORDSIZE == 32)
+        && L4_WORDSIZE == L4_WORDSIZE_32)
        || (elf->e_ident[EI_CLASS] == ELFCLASS64
-           && L4_WORDSIZE == 64)))
+           && L4_WORDSIZE == L4_WORDSIZE_64)))
     panic ("%s has invalid word size", name);
-
   if (!((elf->e_ident[EI_DATA] == ELFDATA2LSB
         && L4_BYTE_ORDER == L4_LITTLE_ENDIAN)
        || (elf->e_ident[EI_DATA] == ELFDATA2MSB