summaryrefslogtreecommitdiff
path: root/laden
diff options
context:
space:
mode:
authormarcus <marcus>2003-09-29 16:03:54 +0000
committermarcus <marcus>2003-09-29 16:03:54 +0000
commit5180cbd989a7b154c1d143352989543fa0849c71 (patch)
tree179cf2080d2ca7ae615c7989e059bad74d5cba2c /laden
parentce4b359495801433e649a2420e657076b5e41b8c (diff)
2003-09-29 Marcus Brinkmann <marcus@gnu.org>
* loader.c (loader_elf_load): Fix wordsize check. Submitted by Johan Rydberg.
Diffstat (limited to 'laden')
-rw-r--r--laden/ChangeLog5
-rw-r--r--laden/loader.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/laden/ChangeLog b/laden/ChangeLog
index 8ca5334..7658cb7 100644
--- a/laden/ChangeLog
+++ b/laden/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-29 Marcus Brinkmann <marcus@gnu.org>
+
+ * loader.c (loader_elf_load): Fix wordsize check. Submitted by
+ Johan Rydberg.
+
2003-09-25 Johan Rydberg <jrydberg@night.trouble.net>
* laden.c (main): Call start_kernel to launch kernel instead
diff --git a/laden/loader.c b/laden/loader.c
index 2634bff..a7a6575 100644
--- a/laden/loader.c
+++ b/laden/loader.c
@@ -189,9 +189,9 @@ loader_elf_load (const char *name, l4_word_t start, l4_word_t end,
/* 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)