resolve PR comments

Author: david-salinas

llvm/lib/Object/OffloadBundle.cpp

@@ -89,17 +89,17 @@ Error OffloadBundleFatBin::readEntries(StringRef Buffer,
     uint64_t EntryIDSize;
     StringRef EntryID;
 
-    if (Error EC = Reader.readInteger(EntryOffset))
-      return EC;
+    if (Error Err = Reader.readInteger(EntryOffset))
+      return Err;
 
-    if (Error EC = Reader.readInteger(EntrySize))
-      return EC;
+    if (Error Err = Reader.readInteger(EntrySize))
+      return Err;
 
-    if (Error EC = Reader.readInteger(EntryIDSize))
-      return EC;
+    if (Error Err = Reader.readInteger(EntryIDSize))
+      return Err;
 
-    if (Error EC = Reader.readFixedString(EntryID, EntryIDSize))
-      return EC;
+    if (Error Err = Reader.readFixedString(EntryID, EntryIDSize))
+      return Err;
 
     auto Entry = std::make_unique<OffloadBundleEntry>(
         EntryOffset + SectionOffset, EntrySize, EntryIDSize, EntryID);

llvm/test/tools/llvm-readobj/ELF/AMDGPU/offloading-fail.test

@@ -1,5 +1,4 @@
 ## Test that --offloading with a fatbin works correctly.
-# REQUIRES: target={{x86_64-.*-linux.*}}
 # REQUIRES: amdgpu-registered-target
 
 # RUN: yaml2obj %s -o %t.elf

llvm/test/tools/llvm-readobj/ELF/AMDGPU/offloading.test

@@ -1,5 +1,4 @@
 ## Test that --offloading with a fatbin works correctly.
-# REQUIRES: target={{x86_64-.*-linux.*}}
 # REQUIRES: amdgpu-registered-target
 
 # RUN: yaml2obj %s -o %t.elf

llvm/tools/llvm-readobj/llvm-readobj.cpp

@@ -135,10 +135,10 @@ static bool HashHistogram;
 static bool Memtag;
 static bool NeededLibraries;
 static bool Notes;
+static bool Offloading;
 static bool ProgramHeaders;
 static bool SectionGroups;
 static bool VersionInfo;
-static bool Offloading;
 
 // Mach-O specific options.
 static bool MachODataInCode;
@@ -273,6 +273,7 @@ static void parseOptions(const opt::InputArgList &Args) {
   opts::Memtag = Args.hasArg(OPT_memtag);
   opts::NeededLibraries = Args.hasArg(OPT_needed_libs);
   opts::Notes = Args.hasArg(OPT_notes);
+  opts::Offloading = Args.hasArg(OPT_offloading);
   opts::PrettyPrint = Args.hasArg(OPT_pretty_print);
   opts::ProgramHeaders = Args.hasArg(OPT_program_headers);
   opts::SectionGroups = Args.hasArg(OPT_section_groups);
@@ -289,7 +290,6 @@ static void parseOptions(const opt::InputArgList &Args) {
     }
   }
   opts::VersionInfo = Args.hasArg(OPT_version_info);
-  opts::Offloading = Args.hasArg(OPT_offloading);
 
   // Mach-O specific options.
   opts::MachODataInCode = Args.hasArg(OPT_macho_data_in_code);