From 9d03be0459c9bcec6acaaca4b0092430b4165eb5 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Fri, 23 Oct 2015 16:52:22 +0000 Subject: [PATCH] [llvm-readobj] Don't cast qualifiers away. Now gcc is happy again. Reported by: mikael.holmen at ericsson.com git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@251117 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-readobj/ELFDumper.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/llvm-readobj/ELFDumper.cpp b/tools/llvm-readobj/ELFDumper.cpp index fa4bf36925a..ef07a85f885 100644 --- a/tools/llvm-readobj/ELFDumper.cpp +++ b/tools/llvm-readobj/ELFDumper.cpp @@ -321,7 +321,7 @@ static void printVersionSymbolSection(ELFDumper *Dumper, W.printNumber("Link", Sec->sh_link); const typename ELFO::Elf_Shdr *DynSymSec = Dumper->getDotDynSymSec(); - uint8_t *P = (uint8_t *)Obj->base() + Sec->sh_offset; + const uint8_t *P = (const uint8_t *)Obj->base() + Sec->sh_offset; ErrorOr StrTableOrErr = Obj->getStringTableForSymtab(*DynSymSec); error(StrTableOrErr.getError()); @@ -359,9 +359,10 @@ static void printVersionDefinitionSection(ELFDumper *Dumper, if (Dyn.d_tag == DT_VERDEFNUM) verdef_entries = Dyn.d_un.d_val; } - uint8_t *SecStartAddress = (uint8_t *)Obj->base() + Sec->sh_offset; - uint8_t *SecEndAddress = SecStartAddress + Sec->sh_size; - uint8_t *P = SecStartAddress; + const uint8_t *SecStartAddress = + (const uint8_t *)Obj->base() + Sec->sh_offset; + const uint8_t *SecEndAddress = SecStartAddress + Sec->sh_size; + const uint8_t *P = SecStartAddress; ErrorOr StrTabOrErr = Obj->getSection(Sec->sh_link); error(StrTabOrErr.getError()); @@ -378,9 +379,9 @@ static void printVersionDefinitionSection(ELFDumper *Dumper, W.printNumber("Flags", VD->vd_flags); W.printNumber("Index", VD->vd_ndx); W.printNumber("Cnt", VD->vd_cnt); - W.printString("Name", StringRef((char *)( - Obj->base() + (*StrTabOrErr)->sh_offset + - VD->getAux()->vda_name))); + W.printString("Name", StringRef((const char *)(Obj->base() + + (*StrTabOrErr)->sh_offset + + VD->getAux()->vda_name))); P += VD->vd_next; } } -- 2.34.1