summaryrefslogtreecommitdiff
path: root/laden
diff options
context:
space:
mode:
authormarcus <marcus>2004-03-29 23:23:30 +0000
committermarcus <marcus>2004-03-29 23:23:30 +0000
commitdeab221c715fb12b6007186b49ce36e788971ff7 (patch)
treec4e6abe593fc9ce7c00c995ea003972acc750d04 /laden
parentb1eb39cdd0e99025f30fddb2ed55115bcae4e678 (diff)
libl4/
2003-03-30 Wolfgang Jährling <wolfgang@pro-linux.de> * l4/types.h (_L4_WORDSIZE_32, _L4_WORDSIZE_64): Removed. All users changed to use numeric constants 32 and 64 instead. * l4/gnu/types.h (L4_WORDSIZE_32, L4_WORDSIZE_64): Removed. * l4/math.h: All users of _L4_WORDSIZE_32 or _L4_WORDSIZE_64 changed to use numeric constants 32 and 64 instead. * l4/thread.h: Likewise. * l4/kip.h: Likewise. Use _L4_WORDSIZE instead of L4_WORDSIZE. * ia32/l4/bits/types.h (_L4_WORDSIZE): Define to 32. * powerpc/l4/bits/types.h (_L4_WORDSIZE): Likewise. laden/ 2004-03-30 Marcus Brinkmann <marcus@gnu.org> * loader.c (loader_elf_dest, loader_elf_load): Use 32 and 64 instead of _L4_WORDSIZE_32 and _L4_WORDSIZE_64. wortel/ 2004-03-30 Marcus Brinkmann <marcus@gnu.org> * loader.c (loader_elf_dest, loader_elf_load): Use 32 and 64 instead of _L4_WORDSIZE_32 and _L4_WORDSIZE_64.
Diffstat (limited to 'laden')
-rw-r--r--laden/ChangeLog5
-rw-r--r--laden/loader.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/laden/ChangeLog b/laden/ChangeLog
index 9d47cb0..ed407c4 100644
--- a/laden/ChangeLog
+++ b/laden/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-30 Marcus Brinkmann <marcus@gnu.org>
+
+ * loader.c (loader_elf_dest, loader_elf_load): Use 32 and 64
+ instead of _L4_WORDSIZE_32 and _L4_WORDSIZE_64.
+
2004-03-15 Marcus Brinkmann <marcus@gnu.org>
* loader.h (loader_get_memory_desc): Change return type to
diff --git a/laden/loader.c b/laden/loader.c
index b0adbfd..bab5bab 100644
--- a/laden/loader.c
+++ b/laden/loader.c
@@ -204,9 +204,9 @@ loader_elf_dest (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 == L4_WORDSIZE_32)
+ && L4_WORDSIZE == 32)
|| (elf->e_ident[EI_CLASS] == ELFCLASS64
- && L4_WORDSIZE == L4_WORDSIZE_64)))
+ && L4_WORDSIZE == 64)))
panic ("%s has invalid word size", name);
if (!((elf->e_ident[EI_DATA] == ELFDATA2LSB
&& L4_BYTE_ORDER == L4_LITTLE_ENDIAN)
@@ -275,9 +275,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 == L4_WORDSIZE_32)
+ && L4_WORDSIZE == 32)
|| (elf->e_ident[EI_CLASS] == ELFCLASS64
- && L4_WORDSIZE == L4_WORDSIZE_64)))
+ && L4_WORDSIZE == 64)))
panic ("%s has invalid word size", name);
if (!((elf->e_ident[EI_DATA] == ELFDATA2LSB
&& L4_BYTE_ORDER == L4_LITTLE_ENDIAN)