* the wasm target in the makefiles renamed wasm32

git-svn-id: branches/wasm@46252 -
This commit is contained in:
nickysn 2020-08-05 14:23:56 +00:00
parent c9ee72b05a
commit 26207eef00
4 changed files with 21 additions and 21 deletions

View File

@ -419,8 +419,8 @@ endif
ifeq ($(CPU_TARGET),z80)
PPSUF=z80
endif
ifeq ($(CPU_TARGET),wasm)
PPSUF=wasm
ifeq ($(CPU_TARGET),wasm32)
PPSUF=wasm32
endif
ifdef CROSSCOMPILE
ifneq ($(CPU_TARGET),jvm)

View File

@ -97,8 +97,8 @@ endif
ifeq ($(CPU_TARGET),z80)
PPSUF=z80
endif
ifeq ($(CPU_TARGET),wasm)
PPSUF=wasm
ifeq ($(CPU_TARGET),wasm32)
PPSUF=wasm32
endif
# cross compilers uses full cpu_target, not just ppc-suffix

View File

@ -350,7 +350,7 @@ endif
override PACKAGE_NAME=compiler
override PACKAGE_VERSION=3.3.1
unexport FPC_VERSION FPC_COMPILERINFO
CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm
CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm32
ALLTARGETS=$(CYCLETARGETS)
ifdef POWERPC
PPC_TARGET=powerpc
@ -522,8 +522,8 @@ endif
ifeq ($(CPC_TARGET),z80)
CPUSUF=z80
endif
ifeq ($(CPC_TARGET),wasm)
CPUSUF=wasm
ifeq ($(CPC_TARGET),wasm32)
CPUSUF=wasm32
endif
NOCPUDEF=1
MSGFILE=msg/error$(FPCLANG).msg
@ -606,7 +606,7 @@ endif
ifeq ($(PPC_TARGET),riscv64)
override LOCALOPT+=-Furiscv
endif
ifeq ($(PPC_TARGET),wasm)
ifeq ($(PPC_TARGET),wasm32)
override LOCALOPT+=-dNOOPT
endif
OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo
@ -4699,8 +4699,8 @@ endif
ifdef TEMPWPONAME2PREFIX
$(MAKE) g$(TEMPWPONAME2) COMPILERTEMPNAME=$(TEMPWPONAME2)
endif
PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 mips mipsel avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm
PPC_SUFFIXES=386 68k ppc sparc arm armeb x64 ppc64 mips mipsel avr jvm 8086 a64 sparc64 rv32 rv64 xtensa z80 wasm
PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 mips mipsel avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm32
PPC_SUFFIXES=386 68k ppc sparc arm armeb x64 ppc64 mips mipsel avr jvm 8086 a64 sparc64 rv32 rv64 xtensa z80 wasm32
INSTALL_TARGETS=$(addsuffix _exe_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
SYMLINKINSTALL_TARGETS=$(addsuffix _symlink_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
.PHONY: $(PPC_TARGETS) $(INSTALL_TARGETS)$(SYMLINKINSTALL_TARGETS)
@ -4804,9 +4804,9 @@ regdatmips : mips/mipsreg.dat
regdatz80 : z80/z80reg.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkz80reg.pp
cd z80 && ..$(PATHSEP)utils$(PATHSEP)mkz80reg$(SRCEXEEXT)
regdatwasm : wasm/wasmreg.dat
regdatwasm : wasm32/wasmreg.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkwasmreg.pp
cd wasm && ..$(PATHSEP)utils$(PATHSEP)mkwasmreg$(SRCEXEEXT)
cd wasm32 && ..$(PATHSEP)utils$(PATHSEP)mkwasmreg$(SRCEXEEXT)
regdat : regdatx86 regdatarm regdatsp regdatavr regdataarch64 regdatmips regdatsp64 regdatz80 regdatwasm
intrdatx86 : x86/x86intr.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkx86inl.pp

View File

@ -32,7 +32,7 @@ fpcdir=..
unexport FPC_VERSION FPC_COMPILERINFO
# Which platforms are ready for inclusion in the cycle
CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm
CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm32
# All supported targets used for clean
ALLTARGETS=$(CYCLETARGETS)
@ -236,8 +236,8 @@ endif
ifeq ($(CPC_TARGET),z80)
CPUSUF=z80
endif
ifeq ($(CPC_TARGET),wasm)
CPUSUF=wasm
ifeq ($(CPC_TARGET),wasm32)
CPUSUF=wasm32
endif
# Do not define the default -d$(CPU_TARGET) because that
@ -370,8 +370,8 @@ ifeq ($(PPC_TARGET),riscv64)
override LOCALOPT+=-Furiscv
endif
# WASM specific
ifeq ($(PPC_TARGET),wasm)
# WASM32 specific
ifeq ($(PPC_TARGET),wasm32)
override LOCALOPT+=-dNOOPT
endif
@ -611,8 +611,8 @@ endif
# cpu targets
#####################################################################
PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 mips mipsel avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm
PPC_SUFFIXES=386 68k ppc sparc arm armeb x64 ppc64 mips mipsel avr jvm 8086 a64 sparc64 rv32 rv64 xtensa z80 wasm
PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 mips mipsel avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm32
PPC_SUFFIXES=386 68k ppc sparc arm armeb x64 ppc64 mips mipsel avr jvm 8086 a64 sparc64 rv32 rv64 xtensa z80 wasm32
INSTALL_TARGETS=$(addsuffix _exe_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
SYMLINKINSTALL_TARGETS=$(addsuffix _symlink_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
@ -764,9 +764,9 @@ regdatz80 : z80/z80reg.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkz80reg.pp
cd z80 && ..$(PATHSEP)utils$(PATHSEP)mkz80reg$(SRCEXEEXT)
regdatwasm : wasm/wasmreg.dat
regdatwasm : wasm32/wasmreg.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkwasmreg.pp
cd wasm && ..$(PATHSEP)utils$(PATHSEP)mkwasmreg$(SRCEXEEXT)
cd wasm32 && ..$(PATHSEP)utils$(PATHSEP)mkwasmreg$(SRCEXEEXT)
regdat : regdatx86 regdatarm regdatsp regdatavr regdataarch64 regdatmips regdatsp64 regdatz80 regdatwasm