From d3493991bf5b65c376f40129cfacd566eefe4e2e Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 9 Jan 2020 15:59:05 -0800 Subject: readelf: RELR (both new and historical). The "historical" variant is still the only one in use on Android right now. We still need to switch to the numbers we agreed on with the other System V ABI users. See https://groups.google.com/g/generic-abi/c/bX460iggiKg for the original discussion on RELR. --- toys/pending/readelf.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/toys/pending/readelf.c b/toys/pending/readelf.c index 838e37d7..58e31432 100644 --- a/toys/pending/readelf.c +++ b/toys/pending/readelf.c @@ -151,9 +151,12 @@ DECODER(dt_type, MAP({{0,"x(NULL)"},{1,"N(NEEDED)"},{2,"b(PLTRELSZ)"}, {24,"d(BIND_NOW)"},{25,"x(INIT_ARRAY)"},{26,"x(FINI_ARRAY)"}, {27,"b(INIT_ARRAYSZ)"},{28,"b(FINI_ARRAYSZ)"},{29,"R(RUNPATH)"}, {30,"f(FLAGS)"},{32,"x(PREINIT_ARRAY)"},{33,"x(PREINIT_ARRAYSZ)"}, + {35,"b(RELRSZ)"},{36,"x(RELR)"},{37,"b(RELRENT)"}, {0x6000000f,"x(ANDROID_REL)"},{0x60000010,"b(ANDROID_RELSZ)"}, - {0x6ffffef5,"x(GNU_HASH)"},{0x6ffffef6,"x(TLSDESC_PLT)"}, - {0x6ffffef7,"x(TLSDESC_GOT)"}, + {0x60000011,"x(ANDROID_RELA)"},{0x60000012,"b(ANDROID_RELASZ)"}, + {0x6fffe000,"x(ANDROID_RELR)"},{0x6fffe001,"b(ANDROID_RELRSZ)"}, + {0x6fffe003,"x(ANDROID_RELRENT)"},{0x6ffffef5,"x(GNU_HASH)"}, + {0x6ffffef6,"x(TLSDESC_PLT)"},{0x6ffffef7,"x(TLSDESC_GOT)"}, {0x6ffffff0,"x(VERSYM)"},{0x6ffffff9,"d(RELACOUNT)"}, {0x6ffffffa,"d(RELCOUNT)"},{0x6ffffffb,"F(FLAGS_1)"}, {0x6ffffffc," (VERDEF)"},{0x6ffffffd,"d(VERDEFNUM)"}, @@ -179,8 +182,10 @@ DECODER(ph_type, MAP({{0,"NULL"},{1,"LOAD"},{2,"DYNAMIC"},{3,"INTERP"}, DECODER(sh_type, MAP({{0,"NULL"},{1,"PROGBITS"},{2,"SYMTAB"},{3,"STRTAB"}, {4,"RELA"},{5,"HASH"},{6,"DYNAMIC"},{7,"NOTE"},{8,"NOBITS"},{9,"REL"}, {10,"SHLIB"},{11,"DYNSYM"},{14,"INIT_ARRAY"},{15,"FINI_ARRAY"}, - {16,"PREINIT_ARRAY"},{17,"GROUP"},{18,"SYMTAB_SHNDX"}, - {0x6ffffff6,"GNU_HASH"},{0x6ffffffd,"VERDEF"},{0x6ffffffe,"VERNEED"}, + {16,"PREINIT_ARRAY"},{17,"GROUP"},{18,"SYMTAB_SHNDX"},{19,"RELR"}, + {0x60000001,"ANDROID_REL"},{0x60000002,"ANDROID_RELA"}, + {0x6fffff00,"ANDROID_RELR"},{0x6ffffff6,"GNU_HASH"}, + {0x6ffffffd,"VERDEF"},{0x6ffffffe,"VERNEED"}, {0x6fffffff,"VERSYM"},{0x70000001,"ARM_EXIDX"}, {0x70000003,"ARM_ATTRIBUTES"}})) -- cgit v1.2.3