[llvm-readelf] - Do not treat SHT_ANDROID_RELR sections the same as SHT_RELR.

[grimar]

Summary

Currently, when dumping section headers, llvm-readelf
prints "RELR" for SHT_ANDROID_RELR/SHT_RELR sections.
The behavior was introduced in D47919 and revealed in D84330.

But "SHT_ANDROID_RELR" has a different value from "SHT_RELR".
Also, "SHT_ANDROID_REL/SHT_ANDROID_RELA" are printed as "ANDROID_REL/ANDROID_RELA",
what makes the handling of the "SHT_ANDROID_RELR" inconsistent.

This patch makes llvm-readelf to print "ANDROID_RELR" instead of "RELR".

[jhenderson]

Looks good from my point of view, but others should have a chance to chime in.

[MaskRay]

Good from my point of view.

llvm/test/tools/llvm-readobj/ELF/section-types.test

 # GNU-NEXT: init_array              INIT_ARRAY
 # GNU-NEXT: fini_array              FINI_ARRAY
 # GNU-NEXT: preinit_array           PREINIT_ARRAY
 # GNU-NEXT: group                   GROUP
 # GNU-NEXT: symtab_shndx            SYMTAB SECTION INDICES
 # GNU-NEXT: relr                    RELR
 # GNU-NEXT: android_rel             ANDROID_REL
 # GNU-NEXT: android_rela            ANDROID_RELA
-# GNU-NEXT: android_relr            RELR
+# GNU-NEXT: android_relr            ANDROID_RELR
 # GNU-NEXT: llvm_odrtab             LLVM_ODRTAB
 # GNU-NEXT: linker_options          LLVM_LINKER_OPTIONS
 # GNU-NEXT: llvm_call_graph_profile LLVM_CALL_GRAPH_PROFILE
 # GNU-NEXT: llvm_addrsig            LLVM_ADDRSIG
 # GNU-NEXT: .deplibs                LLVM_DEPENDENT_LIBRARIES
 # GNU-NEXT: .llvm_sympart.f         LLVM_SYMPART
 # GNU-NEXT: part1                   LLVM_PART_EHDR
 # GNU-NEXT: .phdrs                  LLVM_PART_PHDR

llvm/tools/llvm-readobj/ELFDumper.cpp

if (Name == "SHT_GNU_HASH")
       return "GNU_HASH";
     // E.g. SHT_GNU_verneed -> VERNEED.
     return Name.drop_front(8).upper();
   }
 
   if (Name == "SHT_SYMTAB_SHNDX")
     return "SYMTAB SECTION INDICES";
 
-  // The SHT_ANDROID_RELR is special, all other SHT_ANDROID_* types are handled
-  // in the common block below.
-  if (Name == "SHT_ANDROID_RELR")
-    return "RELR";
-
   if (Name.startswith("SHT_"))
     return Name.drop_front(4).str();
   return getSectionTypeOffsetString(Type);
 }
 
 static void printSectionDescription(formatted_raw_ostream &OS,
                                     unsigned EMachine) {
   OS << "Key to Flags:\n";