Mercurial > ecos

diff packages/services/objloader/current/src/objelf.c @ 2013:8bf90d16b837

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* include/objelf.h: Include hal_tables.h otherwise we get strange linker errors. * cdl/objloader.cdl: Rearranged the building of the test case. * include/relocate_i386.h (New): * src/relocate_i386.c (New): Added a relocator for i386. * src/objelf.c: Fixed various Elf_Rel vs Elf_Rela issues. * test/load_mods.c: * test/library/hello.c: Modified to make use of the eCos test infrastructure. Uses a romfs to hold the object file to be loaded.
author asl
date Fri, 08 Jul 2005 20:14:13 +0000
parents 662e1b34b811
children 6fd46febe457
line wrap: on
line diff
--- a/packages/services/objloader/current/src/objelf.c
+++ b/packages/services/objloader/current/src/objelf.c
@@ -171,12 +171,22 @@ cyg_ldr_print_rel_names( PELF_OBJECT p )
             {
                 sprintf( strname, 
                          "%08X  %08X  ", 
+#if ELF_ARCH_RELTYPE == Elf_Rela        
                          p_rela[j].r_offset,
-                         p_rela[j].r_info );
+                         p_rela[j].r_info 
+#else
+                         p_rel[j].r_offset,
+                         p_rel[j].r_info 
+#endif
+                         );
 
                 diag_printf( strname );         
-                
+
+#if ELF_ARCH_RELTYPE == Elf_Rela        
                 cyg_uint8 sym_type = ELF32_R_SYM( p_rela[j].r_info );
+#else
+                cyg_uint8 sym_type = ELF32_R_SYM( p_rel[j].r_info );
+#endif
                 if ( strlen ( p_strtab + p_symtab[sym_type].st_name ) > 0 )
                     diag_printf( p_strtab + p_symtab[sym_type].st_name );         
                 else 
@@ -220,7 +230,7 @@ static void
     return (void*)( addr + p_symtab[sym_index].st_value);
 }    
 
-static void
+void
 *cyg_ldr_external_address( PELF_OBJECT p, cyg_uint32 sym_index )
 {
     cyg_uint8*    tmp2;