Made Changes

Author: kshitijvp

llvm/docs/CommandGuide/llvm-objcopy.rst

@@ -178,6 +178,10 @@ multiple file formats.
  specified ``<flag>`` values. Can be specified multiple times to update multiple
  sections.
 
+.. option:: --verbose
+
+  List all object files modified.
+
  Supported flag names are `alloc`, `load`, `noload`, `readonly`, `exclude`,
  `debug`, `code`, `data`, `rom`, `share`, `contents`, `merge`, `strings`, and
  `large`. Not all flags are meaningful for all object file formats or target

llvm/lib/ObjCopy/ELF/ELFObjcopy.cpp

@@ -546,7 +546,7 @@ static Error replaceAndRemoveSections(const CommonConfig &Config,
     };
   }
 
-  if (Error E = Obj.removeSections(ELFConfig.AllowBrokenLinks, RemovePred))
+  if (Error E = Obj.removeSections(ELFConfig.AllowBrokenLinks, RemovePred, Config.Verbose))
     return E;
 
   if (Error E = Obj.compressOrDecompressSections(Config))
@@ -782,7 +782,7 @@ static Error verifyNoteSection(StringRef Name, endianness Endianness,
 // system. The only priority is that keeps/copies overrule removes.
 static Error handleArgs(const CommonConfig &Config, const ELFConfig &ELFConfig,
                         ElfType OutputElfType, Object &Obj) {
-  Obj.isVerboseEnabled = Config.Verbose;
+  Obj.VerboseOutput = Config.Verbose;
   if (Config.OutputArch) {
     Obj.Machine = Config.OutputArch->EMachine;
     Obj.OSABI = Config.OutputArch->OSABI;
@@ -791,7 +791,7 @@ static Error handleArgs(const CommonConfig &Config, const ELFConfig &ELFConfig,
   if (!Config.SplitDWO.empty() && Config.ExtractDWO) {
     return Obj.removeSections(
         ELFConfig.AllowBrokenLinks,
-        [&Obj](const SectionBase &Sec) { return onlyKeepDWOPred(Obj, Sec); });
+        [&Obj](const SectionBase &Sec) { return onlyKeepDWOPred(Obj, Sec); }, Config.Verbose);
   }
 
   // Dump sections before add/remove for compatibility with GNU objcopy.

llvm/lib/ObjCopy/ELF/ELFObject.cpp

@@ -766,10 +766,11 @@ Error SymbolTableSection::removeSymbols(
     function_ref<bool(const Symbol &)> ToRemove) {
   Symbols.erase(
       std::remove_if(std::begin(Symbols) + 1, std::end(Symbols),
-               [ToRemove](const SymPtr &Sym) {
+               [&](const SymPtr &Sym) {
                    if (ToRemove(*Sym)) {
-                       llvm::outs() << "Symbols Removed:" << Sym->Name<< "\n";
-                       return true;
+                    if(VerboseOutput)
+                      outs() << "Symbols Removed:" << Sym->Name<< "\n";
+                    return true;
                    }
                    return false;
                }));
@@ -779,7 +780,6 @@ Error SymbolTableSection::removeSymbols(
   if (Size < PrevSize)
     IndicesChanged = true;
   assignIndices();
-  return Error::success();
 }
 
 void SymbolTableSection::replaceSectionReferences(
@@ -2201,7 +2201,7 @@ Error Object::updateSectionData(SectionBase &S, ArrayRef<uint8_t> Data) {
 }
 
 Error Object::removeSections(
-    bool AllowBrokenLinks, std::function<bool(const SectionBase &)> ToRemove) {
+    bool AllowBrokenLinks, std::function<bool(const SectionBase &)> ToRemove, bool VerboseOutput) {
 
   auto Iter = std::stable_partition(
       std::begin(Sections), std::end(Sections), [=](const SecPtr &Sec) {
@@ -2236,8 +2236,8 @@ Error Object::removeSections(
   for (auto &RemoveSec : make_range(Iter, std::end(Sections))) {
     for (auto &Segment : Segments)
       Segment->removeSection(RemoveSec.get());
-    if (isVerboseEnabled) {
-      llvm::outs() << "Removed Section: " << (RemoveSec.get()->Name);
+    if (VerboseOutput) {
+      outs() << "removed section: " << (RemoveSec.get()->Name);
     }
     RemoveSec->onRemove();
     RemoveSections.insert(RemoveSec.get());
@@ -2282,21 +2282,20 @@ Error Object::replaceSections(
 
   if (Error E = removeSections(
           /*AllowBrokenLinks=*/false,
-          [=](const SectionBase &Sec) { return FromTo.count(&Sec) > 0; }))
+          [=](const SectionBase &Sec) { return FromTo.count(&Sec) > 0; }, false))
     return E;
   llvm::sort(Sections, SectionIndexLess);
   return Error::success();
 }
 
 Error Object::removeSymbols(function_ref<bool(const Symbol &)> ToRemove) {
-  if (SymbolTable)
-    for (const SecPtr &Sec : Sections)
-      if (Error E = Sec->removeSymbols(ToRemove)){
-        if (isVerboseEnabled){
-          llvm::outs() << "Removed Symbols:" << Sec->Name;
-        }
+  if (SymbolTable){
+    for (const SecPtr &Sec : Sections){
+      if (Error E = Sec->removeSymbols(ToRemove))
         return E;
-      }
+      outs() << "removed symbols:" << Sec->Name;
+    }
+  }
   return Error::success();
 }
 
@@ -2583,7 +2582,7 @@ static Error removeUnneededSections(Object &Obj) {
                      : Obj.SymbolTable->getStrTab();
   return Obj.removeSections(false, [&](const SectionBase &Sec) {
     return &Sec == Obj.SymbolTable || &Sec == StrTab;
-  });
+  }, false);
 }
 
 template <class ELFT> Error ELFWriter<ELFT>::finalize() {
@@ -2637,7 +2636,7 @@ template <class ELFT> Error ELFWriter<ELFT>::finalize() {
       if (Error E = Obj.removeSections(false /*AllowBrokenLinks*/,
                                        [this](const SectionBase &Sec) {
                                          return &Sec == Obj.SectionIndexTable;
-                                       }))
+                                       }, false))
         return E;
     }
   }

llvm/lib/ObjCopy/ELF/ELFObject.h

@@ -814,6 +814,8 @@ class SymbolTableSection : public SectionBase {
   void setStrTab(StringTableSection *StrTab) { SymbolNames = StrTab; }
   void assignIndices();
 
+private:
+  bool VerboseOutput;
 protected:
   std::vector<std::unique_ptr<Symbol>> Symbols;
   StringTableSection *SymbolNames = nullptr;
@@ -856,6 +858,7 @@ class SymbolTableSection : public SectionBase {
   static bool classof(const SectionBase *S) {
     return S->OriginalType == ELF::SHT_SYMTAB;
   }
+  bool getVerboseOutput() { return VerboseOutput; }
 };
 
 struct Relocation {
@@ -1195,7 +1198,7 @@ class Object {
   uint32_t Flags;
 
   bool HadShdrs = true;
-  bool isVerboseEnabled = true;
+  bool VerboseOutput;
   bool MustBeRelocatable = false;
   StringTableSection *SectionNames = nullptr;
   SymbolTableSection *SymbolTable = nullptr;
@@ -1225,7 +1228,7 @@ class Object {
   ConstRange<Segment> segments() const { return make_pointee_range(Segments); }
 
   Error removeSections(bool AllowBrokenLinks,
-                       std::function<bool(const SectionBase &)> ToRemove);
+                       std::function<bool(const SectionBase &)> ToRemove, bool VerboseOutput);
   Error compressOrDecompressSections(const CommonConfig &Config);
   Error replaceSections(const DenseMap<SectionBase *, SectionBase *> &FromTo);
   Error removeSymbols(function_ref<bool(const Symbol &)> ToRemove);