1 files changed, 12 insertions, 22 deletions
diff --git a/contrib/llvm-project/llvm/tools/llvm-objcopy/llvm-objcopy.h b/contrib/llvm-project/llvm/tools/llvm-objcopy/llvm-objcopy.h
index 18a789ca1f83..97a166769f95 100644
--- a/contrib/llvm-project/llvm/tools/llvm-objcopy/llvm-objcopy.h
+++ b/contrib/llvm-project/llvm/tools/llvm-objcopy/llvm-objcopy.h
@@ -9,32 +9,22 @@
 #ifndef LLVM_TOOLS_OBJCOPY_OBJCOPY_H
 #define LLVM_TOOLS_OBJCOPY_OBJCOPY_H
 
-#include "llvm/ADT/Twine.h"
-#include "llvm/Support/Compiler.h"
 #include "llvm/Support/Error.h"
-#include "llvm/Support/raw_ostream.h"
-#include <string>
 
 namespace llvm {
-namespace objcopy {
 
-LLVM_ATTRIBUTE_NORETURN extern void error(Twine Message);
-LLVM_ATTRIBUTE_NORETURN extern void error(Error E);
-LLVM_ATTRIBUTE_NORETURN extern void reportError(StringRef File, Error E);
-LLVM_ATTRIBUTE_NORETURN extern void reportError(StringRef File,
-                                                std::error_code EC);
-
-// This is taken from llvm-readobj.
-// [see here](llvm/tools/llvm-readobj/llvm-readobj.h:38)
-template <class T> T unwrapOrError(Expected<T> EO) {
-  if (EO)
-    return *EO;
-  std::string Buf;
-  raw_string_ostream OS(Buf);
-  logAllUnhandledErrors(EO.takeError(), OS);
-  OS.flush();
-  error(Buf);
-}
+struct NewArchiveMember;
+
+namespace object {
+
+class Archive;
+
+} // end namespace object
+
+namespace objcopy {
+struct CopyConfig;
+Expected<std::vector<NewArchiveMember>>
+createNewArchiveMembers(CopyConfig &Config, const object::Archive &Ar);
 
 } // end namespace objcopy
 } // end namespace llvm