diff options
| author | Simon Pilgrim <llvm-dev@redking.me.uk> | 2019-09-04 12:51:40 +0000 |
|---|---|---|
| committer | Simon Pilgrim <llvm-dev@redking.me.uk> | 2019-09-04 12:51:40 +0000 |
| commit | 92e13f2eabebc60644d36283cc40d2433d035b6e (patch) | |
| tree | 84035e256edbba641261fe45cc49f9e8fb94d40b | |
| parent | e8316372b91e182ba9c7b4bae3bf2ddeff1065cc (diff) | |
| download | bcm5719-llvm-92e13f2eabebc60644d36283cc40d2433d035b6e.tar.gz bcm5719-llvm-92e13f2eabebc60644d36283cc40d2433d035b6e.zip | |
Fix "enumeral and non-enumeral type in conditional expression" warnings. NFCI.
llvm-svn: 370892
| -rw-r--r-- | llvm/tools/llvm-objcopy/CopyConfig.cpp | 2 | ||||
| -rw-r--r-- | llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/tools/llvm-objcopy/CopyConfig.cpp b/llvm/tools/llvm-objcopy/CopyConfig.cpp index 9591e5aeb77..b3a62a3a6d5 100644 --- a/llvm/tools/llvm-objcopy/CopyConfig.cpp +++ b/llvm/tools/llvm-objcopy/CopyConfig.cpp @@ -716,7 +716,7 @@ Expected<DriverConfig> parseObjcopyOptions(ArrayRef<const char *> ArgsArr) { for (auto Arg : InputArgs.filtered(OBJCOPY_add_symbol)) { Expected<NewSymbolInfo> NSI = parseNewSymbolInfo( Arg->getValue(), - Config.NewSymbolVisibility.getValueOr(ELF::STV_DEFAULT)); + Config.NewSymbolVisibility.getValueOr((uint8_t)ELF::STV_DEFAULT)); if (!NSI) return NSI.takeError(); Config.SymbolsToAdd.push_back(*NSI); diff --git a/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp b/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp index fa79b609381..bd49426f9d1 100644 --- a/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp +++ b/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp @@ -756,7 +756,7 @@ Error executeObjcopyOnIHex(const CopyConfig &Config, MemoryBuffer &In, Error executeObjcopyOnRawBinary(const CopyConfig &Config, MemoryBuffer &In, Buffer &Out) { uint8_t NewSymbolVisibility = - Config.NewSymbolVisibility.getValueOr(ELF::STV_DEFAULT); + Config.NewSymbolVisibility.getValueOr((uint8_t)ELF::STV_DEFAULT); BinaryReader Reader(Config.BinaryArch, &In, NewSymbolVisibility); std::unique_ptr<Object> Obj = Reader.create(); |
