Skip to content

Commit 171f6f1

Browse files
committed
Force RuntimeDyld backend for Win LLVM21 ORCJIT
1 parent 0d7df15 commit 171f6f1

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,18 @@
5757
/* conflict with ObjectLinkingLayer.h */
5858
#include "util/u_memory.h"
5959

60-
#if DETECT_ARCH_RISCV64 == 1 || DETECT_ARCH_RISCV32 == 1 || DETECT_ARCH_LOONGARCH64 == 1 || (defined(_WIN32) && LLVM_VERSION_MAJOR >= 15)
61-
/* use ObjectLinkingLayer (JITLINK backend) */
62-
#define USE_JITLINK
63-
#endif
64-
/* else use old RTDyldObjectLinkingLayer (RuntimeDyld backend) */
65-
6660
#if defined(_WIN32) && LLVM_VERSION_MAJOR >= 21
6761
#define LP_ORCJIT_WIN21_STABILITY_MODE 1
6862
#else
6963
#define LP_ORCJIT_WIN21_STABILITY_MODE 0
7064
#endif
7165

66+
#if DETECT_ARCH_RISCV64 == 1 || DETECT_ARCH_RISCV32 == 1 || DETECT_ARCH_LOONGARCH64 == 1 || (defined(_WIN32) && LLVM_VERSION_MAJOR >= 15 && !LP_ORCJIT_WIN21_STABILITY_MODE)
67+
/* use ObjectLinkingLayer (JITLINK backend) */
68+
#define USE_JITLINK
69+
#endif
70+
/* else use old RTDyldObjectLinkingLayer (RuntimeDyld backend) */
71+
7272
namespace {
7373

7474
class LPObjectCacheORC : public llvm::ObjectCache {

0 commit comments

Comments
 (0)