瀏覽代碼

* in the WASI system unit initialization, call InitSystemThreads even if
FPC_WASM_THREADS is not defined (but FPC_HAS_FEATURE_THREADING is defined),
to initialize the nothread manager. This fixes various regressions when WASI
threading is disabled, caused by calls to nil pointer functions.

Nikolay Nikolov 1 年之前
父節點
當前提交
824658874d
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      rtl/wasi/system.pp

+ 3 - 1
rtl/wasi/system.pp

@@ -440,9 +440,11 @@ begin
   initunicodestringmanager;
   { Reset IO Error }
   InOutRes:=0;
-{$ifdef FPC_WASM_THREADS}
+{$ifdef FPC_HAS_FEATURE_THREADING}
   InitSystemThreads;
+{$ifdef FPC_WASM_THREADS}
   InitThreadVars(@WasiRelocateThreadVar);
+{$endif}
 {$endif}
   { Setup stdin, stdout and stderr }
   SysInitStdIO;