From c70d979b7eac385ac3ab461a2e8dcb0abbaad977 Mon Sep 17 00:00:00 2001 From: Patrick Mackinlay Date: Fri, 12 Jun 2020 12:01:44 +0700 Subject: asmjit: mame changes (nw) --- 3rdparty/asmjit/src/asmjit/core/api-config.h | 2 ++ 3rdparty/asmjit/src/asmjit/core/compiler.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/3rdparty/asmjit/src/asmjit/core/api-config.h b/3rdparty/asmjit/src/asmjit/core/api-config.h index 1388da49618..1767d332483 100644 --- a/3rdparty/asmjit/src/asmjit/core/api-config.h +++ b/3rdparty/asmjit/src/asmjit/core/api-config.h @@ -139,6 +139,8 @@ namespace asmjit { // [asmjit::Options] // ============================================================================ +#define ASMJIT_STATIC + // ASMJIT_NO_BUILDER implies ASMJIT_NO_COMPILER. #if defined(ASMJIT_NO_BUILDER) && !defined(ASMJIT_NO_COMPILER) #define ASMJIT_NO_COMPILER diff --git a/3rdparty/asmjit/src/asmjit/core/compiler.cpp b/3rdparty/asmjit/src/asmjit/core/compiler.cpp index 28bc93f29f2..251a6ff2a3e 100644 --- a/3rdparty/asmjit/src/asmjit/core/compiler.cpp +++ b/3rdparty/asmjit/src/asmjit/core/compiler.cpp @@ -553,7 +553,7 @@ Error BaseCompiler::emitAnnotatedJump(uint32_t instId, const Operand_& o0, JumpA resetInlineComment(); resetExtraReg(); - JumpNode* node; + JumpNode* node = nullptr; ASMJIT_PROPAGATE(newJumpNode(&node, instId, options, o0, annotation)); node->setExtraReg(extra); -- cgit v1.2.3