diff --git a/.gitattributes b/.gitattributes
index b17ecea696..082b0561ee 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -965,36 +965,36 @@ compiler/utils/ppuutils/ppuxml.pp svneol=native#text/plain
 compiler/utils/samplecfg svneol=native#text/plain
 compiler/verbose.pas svneol=native#text/plain
 compiler/version.pas svneol=native#text/plain
-compiler/wasm/aasmcpu.pas svneol=native#text/plain
-compiler/wasm/agbinaryen.pas svneol=native#text/plain
-compiler/wasm/agwat.pas svneol=native#text/plain
-compiler/wasm/cgcpu.pas svneol=native#text/plain
-compiler/wasm/cpubase.pas svneol=native#text/plain
-compiler/wasm/cpuinfo.pas svneol=native#text/plain
-compiler/wasm/cpunode.pas svneol=native#text/plain
-compiler/wasm/cpupara.pas svneol=native#text/plain
-compiler/wasm/cpupi.pas svneol=native#text/plain
-compiler/wasm/cputarg.pas svneol=native#text/plain
-compiler/wasm/hlcgcpu.pas svneol=native#text/plain
-compiler/wasm/itcpuwasm.pas svneol=native#text/plain
-compiler/wasm/nwasmadd.pas svneol=native#text/plain
-compiler/wasm/nwasmcal.pas svneol=native#text/plain
-compiler/wasm/nwasmcon.pas svneol=native#text/plain
-compiler/wasm/nwasmflw.pas svneol=native#text/plain
-compiler/wasm/nwasmmat.pas svneol=native#text/plain
-compiler/wasm/rgcpu.pas svneol=native#text/plain
-compiler/wasm/rwasmcon.inc svneol=native#text/plain
-compiler/wasm/rwasmnor.inc svneol=native#text/plain
-compiler/wasm/rwasmnum.inc svneol=native#text/plain
-compiler/wasm/rwasmrni.inc svneol=native#text/plain
-compiler/wasm/rwasmsri.inc svneol=native#text/plain
-compiler/wasm/rwasmstd.inc svneol=native#text/plain
-compiler/wasm/rwasmsup.inc svneol=native#text/plain
-compiler/wasm/symcpu.pas svneol=native#text/plain
-compiler/wasm/tgcpu.pas svneol=native#text/plain
-compiler/wasm/tripletcpu.pas svneol=native#text/plain
-compiler/wasm/wasmdef.pas svneol=native#text/plain
-compiler/wasm/wasmreg.dat svneol=native#text/plain
+compiler/wasm32/aasmcpu.pas svneol=native#text/plain
+compiler/wasm32/agbinaryen.pas svneol=native#text/plain
+compiler/wasm32/agwat.pas svneol=native#text/plain
+compiler/wasm32/cgcpu.pas svneol=native#text/plain
+compiler/wasm32/cpubase.pas svneol=native#text/plain
+compiler/wasm32/cpuinfo.pas svneol=native#text/plain
+compiler/wasm32/cpunode.pas svneol=native#text/plain
+compiler/wasm32/cpupara.pas svneol=native#text/plain
+compiler/wasm32/cpupi.pas svneol=native#text/plain
+compiler/wasm32/cputarg.pas svneol=native#text/plain
+compiler/wasm32/hlcgcpu.pas svneol=native#text/plain
+compiler/wasm32/itcpuwasm.pas svneol=native#text/plain
+compiler/wasm32/nwasmadd.pas svneol=native#text/plain
+compiler/wasm32/nwasmcal.pas svneol=native#text/plain
+compiler/wasm32/nwasmcon.pas svneol=native#text/plain
+compiler/wasm32/nwasmflw.pas svneol=native#text/plain
+compiler/wasm32/nwasmmat.pas svneol=native#text/plain
+compiler/wasm32/rgcpu.pas svneol=native#text/plain
+compiler/wasm32/rwasmcon.inc svneol=native#text/plain
+compiler/wasm32/rwasmnor.inc svneol=native#text/plain
+compiler/wasm32/rwasmnum.inc svneol=native#text/plain
+compiler/wasm32/rwasmrni.inc svneol=native#text/plain
+compiler/wasm32/rwasmsri.inc svneol=native#text/plain
+compiler/wasm32/rwasmstd.inc svneol=native#text/plain
+compiler/wasm32/rwasmsup.inc svneol=native#text/plain
+compiler/wasm32/symcpu.pas svneol=native#text/plain
+compiler/wasm32/tgcpu.pas svneol=native#text/plain
+compiler/wasm32/tripletcpu.pas svneol=native#text/plain
+compiler/wasm32/wasmdef.pas svneol=native#text/plain
+compiler/wasm32/wasmreg.dat svneol=native#text/plain
 compiler/widestr.pas svneol=native#text/plain
 compiler/wpo.pas svneol=native#text/plain
 compiler/wpobase.pas svneol=native#text/plain
diff --git a/compiler/ppcwasm32.lpi b/compiler/ppcwasm32.lpi
index 9217f62629..f977e3f874 100644
--- a/compiler/ppcwasm32.lpi
+++ b/compiler/ppcwasm32.lpi
@@ -37,12 +37,12 @@
     <Version Value="11"/>
     <PathDelim Value="\"/>
     <Target>
-      <Filename Value="wasm\pp"/>
+      <Filename Value="wasm32\pp"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="wasm"/>
-      <OtherUnitFiles Value="wasm;systems"/>
-      <UnitOutputDirectory Value="wasm\lazbuild"/>
+      <IncludeFiles Value="wasm32"/>
+      <OtherUnitFiles Value="wasm32;systems"/>
+      <UnitOutputDirectory Value="wasm32\lazbuild"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/compiler/wasm/aasmcpu.pas b/compiler/wasm32/aasmcpu.pas
similarity index 100%
rename from compiler/wasm/aasmcpu.pas
rename to compiler/wasm32/aasmcpu.pas
diff --git a/compiler/wasm/agbinaryen.pas b/compiler/wasm32/agbinaryen.pas
similarity index 100%
rename from compiler/wasm/agbinaryen.pas
rename to compiler/wasm32/agbinaryen.pas
diff --git a/compiler/wasm/agwat.pas b/compiler/wasm32/agwat.pas
similarity index 100%
rename from compiler/wasm/agwat.pas
rename to compiler/wasm32/agwat.pas
diff --git a/compiler/wasm/cgcpu.pas b/compiler/wasm32/cgcpu.pas
similarity index 100%
rename from compiler/wasm/cgcpu.pas
rename to compiler/wasm32/cgcpu.pas
diff --git a/compiler/wasm/cpubase.pas b/compiler/wasm32/cpubase.pas
similarity index 100%
rename from compiler/wasm/cpubase.pas
rename to compiler/wasm32/cpubase.pas
diff --git a/compiler/wasm/cpuinfo.pas b/compiler/wasm32/cpuinfo.pas
similarity index 100%
rename from compiler/wasm/cpuinfo.pas
rename to compiler/wasm32/cpuinfo.pas
diff --git a/compiler/wasm/cpunode.pas b/compiler/wasm32/cpunode.pas
similarity index 100%
rename from compiler/wasm/cpunode.pas
rename to compiler/wasm32/cpunode.pas
diff --git a/compiler/wasm/cpupara.pas b/compiler/wasm32/cpupara.pas
similarity index 100%
rename from compiler/wasm/cpupara.pas
rename to compiler/wasm32/cpupara.pas
diff --git a/compiler/wasm/cpupi.pas b/compiler/wasm32/cpupi.pas
similarity index 100%
rename from compiler/wasm/cpupi.pas
rename to compiler/wasm32/cpupi.pas
diff --git a/compiler/wasm/cputarg.pas b/compiler/wasm32/cputarg.pas
similarity index 100%
rename from compiler/wasm/cputarg.pas
rename to compiler/wasm32/cputarg.pas
diff --git a/compiler/wasm/hlcgcpu.pas b/compiler/wasm32/hlcgcpu.pas
similarity index 100%
rename from compiler/wasm/hlcgcpu.pas
rename to compiler/wasm32/hlcgcpu.pas
diff --git a/compiler/wasm/itcpuwasm.pas b/compiler/wasm32/itcpuwasm.pas
similarity index 100%
rename from compiler/wasm/itcpuwasm.pas
rename to compiler/wasm32/itcpuwasm.pas
diff --git a/compiler/wasm/nwasmadd.pas b/compiler/wasm32/nwasmadd.pas
similarity index 100%
rename from compiler/wasm/nwasmadd.pas
rename to compiler/wasm32/nwasmadd.pas
diff --git a/compiler/wasm/nwasmcal.pas b/compiler/wasm32/nwasmcal.pas
similarity index 100%
rename from compiler/wasm/nwasmcal.pas
rename to compiler/wasm32/nwasmcal.pas
diff --git a/compiler/wasm/nwasmcon.pas b/compiler/wasm32/nwasmcon.pas
similarity index 100%
rename from compiler/wasm/nwasmcon.pas
rename to compiler/wasm32/nwasmcon.pas
diff --git a/compiler/wasm/nwasmflw.pas b/compiler/wasm32/nwasmflw.pas
similarity index 100%
rename from compiler/wasm/nwasmflw.pas
rename to compiler/wasm32/nwasmflw.pas
diff --git a/compiler/wasm/nwasmmat.pas b/compiler/wasm32/nwasmmat.pas
similarity index 100%
rename from compiler/wasm/nwasmmat.pas
rename to compiler/wasm32/nwasmmat.pas
diff --git a/compiler/wasm/rgcpu.pas b/compiler/wasm32/rgcpu.pas
similarity index 100%
rename from compiler/wasm/rgcpu.pas
rename to compiler/wasm32/rgcpu.pas
diff --git a/compiler/wasm/rwasmcon.inc b/compiler/wasm32/rwasmcon.inc
similarity index 100%
rename from compiler/wasm/rwasmcon.inc
rename to compiler/wasm32/rwasmcon.inc
diff --git a/compiler/wasm/rwasmnor.inc b/compiler/wasm32/rwasmnor.inc
similarity index 100%
rename from compiler/wasm/rwasmnor.inc
rename to compiler/wasm32/rwasmnor.inc
diff --git a/compiler/wasm/rwasmnum.inc b/compiler/wasm32/rwasmnum.inc
similarity index 100%
rename from compiler/wasm/rwasmnum.inc
rename to compiler/wasm32/rwasmnum.inc
diff --git a/compiler/wasm/rwasmrni.inc b/compiler/wasm32/rwasmrni.inc
similarity index 100%
rename from compiler/wasm/rwasmrni.inc
rename to compiler/wasm32/rwasmrni.inc
diff --git a/compiler/wasm/rwasmsri.inc b/compiler/wasm32/rwasmsri.inc
similarity index 100%
rename from compiler/wasm/rwasmsri.inc
rename to compiler/wasm32/rwasmsri.inc
diff --git a/compiler/wasm/rwasmstd.inc b/compiler/wasm32/rwasmstd.inc
similarity index 100%
rename from compiler/wasm/rwasmstd.inc
rename to compiler/wasm32/rwasmstd.inc
diff --git a/compiler/wasm/rwasmsup.inc b/compiler/wasm32/rwasmsup.inc
similarity index 100%
rename from compiler/wasm/rwasmsup.inc
rename to compiler/wasm32/rwasmsup.inc
diff --git a/compiler/wasm/symcpu.pas b/compiler/wasm32/symcpu.pas
similarity index 100%
rename from compiler/wasm/symcpu.pas
rename to compiler/wasm32/symcpu.pas
diff --git a/compiler/wasm/tgcpu.pas b/compiler/wasm32/tgcpu.pas
similarity index 100%
rename from compiler/wasm/tgcpu.pas
rename to compiler/wasm32/tgcpu.pas
diff --git a/compiler/wasm/tripletcpu.pas b/compiler/wasm32/tripletcpu.pas
similarity index 100%
rename from compiler/wasm/tripletcpu.pas
rename to compiler/wasm32/tripletcpu.pas
diff --git a/compiler/wasm/wasmdef.pas b/compiler/wasm32/wasmdef.pas
similarity index 100%
rename from compiler/wasm/wasmdef.pas
rename to compiler/wasm32/wasmdef.pas
diff --git a/compiler/wasm/wasmreg.dat b/compiler/wasm32/wasmreg.dat
similarity index 100%
rename from compiler/wasm/wasmreg.dat
rename to compiler/wasm32/wasmreg.dat