diff --git a/include/llvm/CryptoUtils.h b/include/llvm/CryptoUtils.h
index 8b2426d8cc96..15e73eff255b 100644
--- a/include/llvm/CryptoUtils.h
+++ b/include/llvm/CryptoUtils.h
@@ -63,12 +63,12 @@ extern ManagedStatic<CryptoUtils> cryptoutils;
 #endif
 #define ENDIAN_64BITWORD
 
-#elif defined(__sparc)
+#elif defined(__sparc) || defined(__aarch64__)
 
 #ifndef ENDIAN_BIG
 #define ENDIAN_BIG
 #endif
-#if defined(__arch64__)
+#if defined(__aarch64__)
 #define ENDIAN_64BITWORD
 #else
 #define ENDIAN_32BITWORD
diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
index 8647db56cd2f..7117acc22273 100755
--- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
+++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
@@ -687,7 +687,7 @@ class OrcRemoteTargetClient : public OrcRemoteTargetRPCAPI {
 
   uint32_t getTrampolineSize() const { return RemoteTrampolineSize; }
 
-  Expected<std::vector<char>> readMem(char *Dst, JITTargetAddress Src,
+  Expected<std::vector<uint8_t>> readMem(char *Dst, JITTargetAddress Src,
                                       uint64_t Size) {
     // Check for an 'out-of-band' error, e.g. from an MM destructor.
     if (ExistingError)