diff --git a/compiler/aggas.pas b/compiler/aggas.pas
index b06cb0696c..57c2f341b9 100644
--- a/compiler/aggas.pas
+++ b/compiler/aggas.pas
@@ -565,7 +565,7 @@ implementation
if atype<>sec_toc then
writer.AsmWrite('.csect ');
end;
- system_wasm32_wasi,
+ system_wasm32_wasip1,
system_wasm32_embedded:
begin
writer.AsmWrite('.section ');
diff --git a/compiler/ogwasm.pas b/compiler/ogwasm.pas
index dd2e8ae12b..c5f231f9b0 100644
--- a/compiler/ogwasm.pas
+++ b/compiler/ogwasm.pas
@@ -6497,7 +6497,7 @@ implementation
idtxt : 'WASM';
asmbin : '';
asmcmd : '';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [af_outputbinary,af_smartlink_sections];
labelprefix : '..@';
labelmaxlen : -1;
diff --git a/compiler/parser.pas b/compiler/parser.pas
index decf036304..9c1386f847 100644
--- a/compiler/parser.pas
+++ b/compiler/parser.pas
@@ -199,7 +199,7 @@ implementation
if heapsize=0 then
heapsize:=65536;
end;
- system_wasm32_wasi:
+ system_wasm32_wasip1:
begin
if ts_wasm_threads in init_settings.targetswitches then
maxheapsize:=256*1024*1024
diff --git a/compiler/systems.inc b/compiler/systems.inc
index ba05a75f7f..30979cfeda 100644
--- a/compiler/systems.inc
+++ b/compiler/systems.inc
@@ -206,7 +206,7 @@
system_aarch64_darwin, { 111 }
system_z80_amstradcpc, { 112 }
system_m68k_sinclairql, { 113 }
- system_wasm32_wasi, { 114 }
+ system_wasm32_wasip1, { 114 }
system_aarch64_freebsd, { 115 }
system_aarch64_embedded, { 116 }
system_mips64_linux, { 117 }
diff --git a/compiler/systems.pas b/compiler/systems.pas
index 26dce65619..a1d0009d60 100644
--- a/compiler/systems.pas
+++ b/compiler/systems.pas
@@ -296,7 +296,7 @@ interface
systems_darwin = systems_ios + systems_iphonesim + systems_macosx;
{ all WebAssembly systems }
- systems_wasm = [system_wasm32_embedded,system_wasm32_wasi];
+ systems_wasm = [system_wasm32_embedded,system_wasm32_wasip1];
{all solaris systems }
systems_solaris = [system_sparc_solaris, system_i386_solaris,
@@ -398,7 +398,7 @@ interface
system_riscv32_linux,system_riscv64_linux,
system_aarch64_win64,
system_z80_zxspectrum,system_z80_msxdos,
- system_wasm32_wasi,system_loongarch64_linux,
+ system_wasm32_wasip1,system_loongarch64_linux,
system_mipsel_ps1
]+systems_darwin+systems_amigalike;
@@ -1182,7 +1182,7 @@ begin
{$endif aarch64}
{$ifdef wasm32}
- default_target(system_wasm32_wasi);
+ default_target(system_wasm32_wasip1);
{$endif wasm32}
{$ifdef z80}
diff --git a/compiler/systems/i_wasi.pas b/compiler/systems/i_wasi.pas
index 32c0b42cb8..fb17840202 100644
--- a/compiler/systems/i_wasi.pas
+++ b/compiler/systems/i_wasi.pas
@@ -31,7 +31,7 @@ unit i_wasi;
const
system_wasm32_wasi_info : tsysteminfo =
(
- system : system_wasm32_wasi;
+ system : system_wasm32_wasip1;
name : 'The WebAssembly System Interface (WASI)';
shortname : 'Wasi';
flags : [tf_under_development,tf_needs_symbol_size,tf_needs_symbol_type,
diff --git a/compiler/systems/t_wasi.pas b/compiler/systems/t_wasi.pas
index 61f15399d5..c24c86a8ab 100644
--- a/compiler/systems/t_wasi.pas
+++ b/compiler/systems/t_wasi.pas
@@ -396,8 +396,8 @@ end;
initialization
RegisterTarget(system_wasm32_wasi_info);
- RegisterImport(system_wasm32_wasi, timportlibwasi);
- RegisterExport(system_wasm32_wasi, texportlibwasi);
+ RegisterImport(system_wasm32_wasip1, timportlibwasi);
+ RegisterExport(system_wasm32_wasip1, texportlibwasi);
RegisterLinker(ld_int_wasi,TInternalLinkerWasi);
RegisterLinker(ld_wasi, tlinkerwasi);
RegisterRes(res_wasm_info,TWinLikeResourceFile);
diff --git a/compiler/wasm32/agbinaryen.pas b/compiler/wasm32/agbinaryen.pas
index 0789552fef..fdbc03e892 100644
--- a/compiler/wasm32/agbinaryen.pas
+++ b/compiler/wasm32/agbinaryen.pas
@@ -590,7 +590,7 @@ implementation
idtxt : 'BINARYEN';
asmbin : 'wasm-as';
asmcmd : '$ASM $EXTRAOPT';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [];
labelprefix : 'L';
labelmaxlen : -1;
diff --git a/compiler/wasm32/agllvmmc.pas b/compiler/wasm32/agllvmmc.pas
index dfb30b8fc6..a01e909858 100644
--- a/compiler/wasm32/agllvmmc.pas
+++ b/compiler/wasm32/agllvmmc.pas
@@ -438,7 +438,7 @@ implementation
idtxt : 'LLVM-MC-10';
asmbin : 'llvm-mc-10';
asmcmd : '--assemble --arch=wasm32 -mattr=+sign-ext,+exception-handling,+bulk-memory,+atomics --filetype=obj -o $OBJ $EXTRAOPT $ASM';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [af_smartlink_sections];
labelprefix : '.L';
labelmaxlen : -1;
@@ -451,7 +451,7 @@ implementation
idtxt : 'LLVM-MC-11';
asmbin : 'llvm-mc-11';
asmcmd : '--assemble --arch=wasm32 -mattr=+sign-ext,+exception-handling,+bulk-memory,+atomics,+reference-types --filetype=obj -o $OBJ $EXTRAOPT $ASM';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [af_smartlink_sections];
labelprefix : '.L';
labelmaxlen : -1;
@@ -464,7 +464,7 @@ implementation
idtxt : 'LLVM-MC-12';
asmbin : 'llvm-mc-12';
asmcmd : '--assemble --arch=wasm32 -mattr=+sign-ext,+exception-handling,+bulk-memory,+atomics,+reference-types --filetype=obj -o $OBJ $EXTRAOPT $ASM';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [af_smartlink_sections];
labelprefix : '.L';
labelmaxlen : -1;
@@ -489,7 +489,7 @@ implementation
idtxt : 'LLVM-MC-13';
asmbin : 'llvm-mc-13';
asmcmd : '--assemble --arch=wasm32 -mattr=+sign-ext,+exception-handling,+bulk-memory,+atomics,+reference-types --filetype=obj --no-type-check -o $OBJ $EXTRAOPT $ASM';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [af_smartlink_sections];
labelprefix : '.L';
labelmaxlen : -1;
@@ -506,7 +506,7 @@ implementation
idtxt : 'LLVM-MC-14';
asmbin : 'llvm-mc-14';
asmcmd : '--assemble --arch=wasm32 -mattr=+sign-ext,+exception-handling,+bulk-memory,+atomics,+reference-types --filetype=obj --no-type-check -o $OBJ $EXTRAOPT $ASM';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [af_smartlink_sections];
labelprefix : '.L';
labelmaxlen : -1;
@@ -525,7 +525,7 @@ implementation
idtxt : 'LLVM-MC-15';
asmbin : 'llvm-mc-15';
asmcmd : '--assemble --arch=wasm32 -mattr=+sign-ext,+exception-handling,+bulk-memory,+atomics,+reference-types --filetype=obj --no-type-check -o $OBJ $EXTRAOPT $ASM';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [af_smartlink_sections];
labelprefix : '.L';
labelmaxlen : -1;
@@ -541,7 +541,7 @@ implementation
idtxt : 'LLVM-MC-16';
asmbin : 'llvm-mc-16';
asmcmd : '--assemble --arch=wasm32 -mattr=+sign-ext,+exception-handling,+bulk-memory,+atomics,+reference-types --filetype=obj --no-type-check -o $OBJ $EXTRAOPT $ASM';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [af_smartlink_sections];
labelprefix : '.L';
labelmaxlen : -1;
@@ -561,7 +561,7 @@ implementation
idtxt : 'LLVM-MC-17';
asmbin : 'llvm-mc-17';
asmcmd : '--assemble --arch=wasm32 -mattr=+sign-ext,+exception-handling,+bulk-memory,+atomics,+reference-types --filetype=obj --no-type-check -o $OBJ $EXTRAOPT $ASM';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [af_smartlink_sections];
labelprefix : '.L';
labelmaxlen : -1;
@@ -577,7 +577,7 @@ implementation
idtxt : 'LLVM-MC';
asmbin : 'llvm-mc';
asmcmd : '--assemble --arch=wasm32 -mattr=+sign-ext,+exception-handling,+bulk-memory,+atomics,+reference-types --filetype=obj --no-type-check -o $OBJ $EXTRAOPT $ASM';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [af_smartlink_sections];
labelprefix : '.L';
labelmaxlen : -1;
diff --git a/compiler/wasm32/agwasa.pas b/compiler/wasm32/agwasa.pas
index 4d98eb835e..0a165cb975 100644
--- a/compiler/wasm32/agwasa.pas
+++ b/compiler/wasm32/agwasa.pas
@@ -1094,7 +1094,7 @@ implementation
idtxt : 'WASA';
asmbin : 'wasa';
asmcmd : '-r --no-canonicalize-leb128s -o $OBJ $EXTRAOPT $ASM';
- supported_targets : [system_wasm32_embedded,system_wasm32_wasi];
+ supported_targets : [system_wasm32_embedded,system_wasm32_wasip1];
flags : [];
labelprefix : 'L';
labelmaxlen : -1;