From 00c44b76ec6592b74df4bba07d2f6f647f9a1105 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Fri, 25 Oct 2019 15:08:23 -0400
Subject: [PATCH] mips?!
---
irdb-libs/libIRDB-core/src/fileir.cpp | 15 +++------------
zipr | 2 +-
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/irdb-libs/libIRDB-core/src/fileir.cpp b/irdb-libs/libIRDB-core/src/fileir.cpp
index ffda8b488..f4bc10dbe 100644
--- a/irdb-libs/libIRDB-core/src/fileir.cpp
+++ b/irdb-libs/libIRDB-core/src/fileir.cpp
@@ -1156,24 +1156,15 @@ void FileIR_t::setArchitecture()
e_ident[4] == ELFCLASS64 ? 64 :
throw std::invalid_argument("Unknown ELF class");
- const auto e_type =
- elf_big_endian ? be16toh(hdr_union.ehdr32.e_type) :
- elf_big_endian ? le16toh(hdr_union.ehdr32.e_type) :
- throw invalid_argument("Unknown endianness");
+ const auto e_type = elf_big_endian ? be16toh(hdr_union.ehdr32.e_type) : le16toh(hdr_union.ehdr32.e_type) ;
const auto ft =
e_type == ET_DYN ? IRDB_SDK::adftELFSO :
e_type == ET_EXEC ? IRDB_SDK::adftELFEXE :
throw std::invalid_argument("Unknown file type");
- const auto e_machine32 =
- elf_big_endian ? be16toh(hdr_union.ehdr32.e_machine) :
- elf_big_endian ? le16toh(hdr_union.ehdr32.e_machine) :
- throw invalid_argument("Unknown endianness");
- const auto e_machine64 =
- elf_big_endian ? be16toh(hdr_union.ehdr64.e_machine) :
- elf_big_endian ? le16toh(hdr_union.ehdr64.e_machine) :
- throw invalid_argument("Unknown endianness");
+ const auto e_machine32 = elf_big_endian ? be16toh(hdr_union.ehdr32.e_machine) : le16toh(hdr_union.ehdr32.e_machine) ;
+ const auto e_machine64 = elf_big_endian ? be16toh(hdr_union.ehdr64.e_machine) : le16toh(hdr_union.ehdr64.e_machine) ;
const auto mt =
e_machine32 == EM_MIPS ? IRDB_SDK::admtMips32 :
e_machine32 == EM_386 ? IRDB_SDK::admtI386 :
diff --git a/zipr b/zipr
index d06241b49..871213394 160000
--- a/zipr
+++ b/zipr
@@ -1 +1 @@
-Subproject commit d06241b4990d3a764c5cdae7feec1fff8409c23a
+Subproject commit 8712133942f8bd8d8aae4b2b374b644c5442c989
--
GitLab