Explicitly cast ELF_R_TYPE() to the right type.

This commit is contained in:
Marcel Moolenaar 2005-12-18 01:38:26 +00:00
parent f4f1e650cf
commit 55dfaa9163
4 changed files with 7 additions and 7 deletions

View File

@ -135,9 +135,9 @@ reloc_non_plt_obj(Obj_Entry *obj_rtld, Obj_Entry *obj, const Elf_Rela *rela,
break; break;
default: default:
_rtld_error("%s: Unsupported relocation type %d" _rtld_error("%s: Unsupported relocation type %u"
" in non-PLT relocations\n", obj->path, " in non-PLT relocations\n", obj->path,
ELF_R_TYPE(rela->r_info)); (unsigned int)ELF_R_TYPE(rela->r_info));
return -1; return -1;
} }
return(0); return(0);

View File

@ -312,9 +312,9 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld)
/* missing: R_X86_64_GOTPCREL, R_X86_64_32, R_X86_64_32S, R_X86_64_16, R_X86_64_PC16, R_X86_64_8, R_X86_64_PC8 */ /* missing: R_X86_64_GOTPCREL, R_X86_64_32, R_X86_64_32S, R_X86_64_16, R_X86_64_PC16, R_X86_64_8, R_X86_64_PC8 */
default: default:
_rtld_error("%s: Unsupported relocation type %d" _rtld_error("%s: Unsupported relocation type %u"
" in non-PLT relocations\n", obj->path, " in non-PLT relocations\n", obj->path,
ELF_R_TYPE(rela->r_info)); (unsigned int)ELF_R_TYPE(rela->r_info));
goto done; goto done;
} }
} }

View File

@ -318,9 +318,9 @@ reloc_non_plt_obj(Obj_Entry *obj_rtld, Obj_Entry *obj, const Elf_Rela *rela,
break; break;
default: default:
_rtld_error("%s: Unsupported relocation type %d" _rtld_error("%s: Unsupported relocation type %u"
" in non-PLT relocations\n", obj->path, " in non-PLT relocations\n", obj->path,
ELF_R_TYPE(rela->r_info)); (unsigned int)ELF_R_TYPE(rela->r_info));
return -1; return -1;
} }

View File

@ -59,7 +59,7 @@ ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase,
break; break;
default: default:
warnx("unhandled relocation type %u", warnx("unhandled relocation type %u",
ELF_R_TYPE(a->r_info)); (unsigned int)ELF_R_TYPE(a->r_info));
break; break;
} }
} }