Fix for build breaks

Author: Kyungwoo Lee

llvm/lib/CodeGenData/CodeGenDataReader.cpp

@@ -12,6 +12,7 @@
 
 #include "llvm/CodeGenData/CodeGenDataReader.h"
 #include "llvm/CodeGenData/OutlinedHashTreeRecord.h"
+#include "llvm/Object/ObjectFile.h"
 #include "llvm/Support/MemoryBuffer.h"
 
 #define DEBUG_TYPE "cg-data-reader"
@@ -75,7 +76,7 @@ Error IndexedCodeGenDataReader::read() {
   auto *End =
       reinterpret_cast<const unsigned char *>(DataBuffer->getBufferEnd());
   if (auto E = IndexedCGData::Header::readFromBuffer(Start).moveInto(Header))
-    return std::move(E);
+    return E;
 
   if (hasOutlinedHashTree()) {
     const unsigned char *Ptr = Start + Header.OutlinedHashTreeOffset;

llvm/test/tools/llvm-cgdata/merge-archive.test

@@ -1,4 +1,4 @@
-# REQUIRES: shell
+# REQUIRES: shell, aarch64-registered-target
 # UNSUPPORTED: system-windows
 
 # Merge an archive that has two object files having cgdata (__llvm_outline)

llvm/test/tools/llvm-cgdata/merge-concat.test

@@ -1,4 +1,4 @@
-# REQUIRES: shell
+# REQUIRES: shell, aarch64-registered-target
 # UNSUPPORTED: system-windows
 
 # Merge a binary file (e.g., a linked executable) having concatenated cgdata (__llvm_outline)

llvm/test/tools/llvm-cgdata/merge-double.test

@@ -1,4 +1,4 @@
-# REQUIRES: shell
+# REQUIRES: shell, aarch64-registered-target
 # UNSUPPORTED: system-windows
 
 # Merge two object files having cgdata (__llvm_outline)

llvm/test/tools/llvm-cgdata/merge-single.test

@@ -1,4 +1,4 @@
-# REQUIRES: shell
+# REQUIRES: shell, aarch64-registered-target
 # UNSUPPORTED: system-windows
 
 # Test merge a single object file into a cgdata