summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeiya Nuta <nuta@seiya.me>2019-05-29 22:21:12 +0000
committerSeiya Nuta <nuta@seiya.me>2019-05-29 22:21:12 +0000
commit4bc710166fbda5d5ef72084cd0c0fab371774072 (patch)
tree45f6b3687176f547ac31ce7c3616aef62d3bd7d1
parentb9b64468caca25922d84d4520d4cc9b709a05af2 (diff)
downloadbcm5719-llvm-4bc710166fbda5d5ef72084cd0c0fab371774072.tar.gz
bcm5719-llvm-4bc710166fbda5d5ef72084cd0c0fab371774072.zip
[llvm-objcopy][MachO] Print an error message on use of unsupported options
Summary: It is better to print an error message instead of silently ignoring unsupported options. As mentioned in https://reviews.llvm.org/D57045, this is not the best solution and we should print which flag is not supported at some time. Reviewers: alexshap, rupprecht, jhenderson, jakehehrlich Reviewed By: alexshap, rupprecht, jakehehrlich Subscribers: jakehehrlich, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D62578 llvm-svn: 362040
-rw-r--r--llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp38
1 files changed, 37 insertions, 1 deletions
diff --git a/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp b/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
index 33aec0497b8..80fb18599ba 100644
--- a/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
+++ b/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
@@ -10,17 +10,53 @@
#include "../CopyConfig.h"
#include "MachOReader.h"
#include "MachOWriter.h"
+#include "llvm/Support/Errc.h"
#include "llvm/Support/Error.h"
namespace llvm {
namespace objcopy {
namespace macho {
+using namespace object;
+
+static Error handleArgs(const CopyConfig &Config, Object &Obj) {
+ if (Config.AllowBrokenLinks || !Config.BuildIdLinkDir.empty() ||
+ Config.BuildIdLinkInput || Config.BuildIdLinkOutput ||
+ !Config.SplitDWO.empty() || !Config.SymbolsPrefix.empty() ||
+ !Config.AllocSectionsPrefix.empty() || !Config.AddSection.empty() ||
+ !Config.DumpSection.empty() || !Config.KeepSection.empty() ||
+ !Config.OnlySection.empty() || !Config.SymbolsToGlobalize.empty() ||
+ !Config.SymbolsToKeep.empty() || !Config.SymbolsToLocalize.empty() ||
+ !Config.SymbolsToWeaken.empty() || !Config.SymbolsToKeepGlobal.empty() ||
+ !Config.SectionsToRename.empty() || !Config.SymbolsToRename.empty() ||
+ !Config.UnneededSymbolsToRemove.empty() ||
+ !Config.SetSectionFlags.empty() || !Config.ToRemove.empty() ||
+ Config.ExtractDWO || Config.KeepFileSymbols || Config.LocalizeHidden ||
+ Config.PreserveDates || Config.StripDWO || Config.StripNonAlloc ||
+ Config.StripSections || Config.Weaken || Config.DecompressDebugSections ||
+ Config.StripDebug || Config.StripNonAlloc || Config.StripSections ||
+ Config.StripUnneeded || Config.DiscardMode != DiscardType::None ||
+ !Config.SymbolsToAdd.empty() || Config.EntryExpr) {
+ return createStringError(llvm::errc::invalid_argument,
+ "option not supported by llvm-objcopy for MachO");
+ }
+
+ return Error::success();
+}
+
Error executeObjcopyOnBinary(const CopyConfig &Config,
object::MachOObjectFile &In, Buffer &Out) {
MachOReader Reader(In);
std::unique_ptr<Object> O = Reader.create();
- assert(O && "Unable to deserialize MachO object");
+ if (!O)
+ return createFileError(
+ Config.InputFilename,
+ createStringError(object_error::parse_failed,
+ "unable to deserialize MachO object"));
+
+ if (Error E = handleArgs(Config, *O))
+ return createFileError(Config.InputFilename, std::move(E));
+
MachOWriter Writer(*O, In.is64Bit(), In.isLittleEndian(), Out);
return Writer.write();
}
OpenPOWER on IntegriCloud