From 39c5f11ec6d2eef713a9b9f537796f11858a4332 Mon Sep 17 00:00:00 2001 From: nickysn Date: Wed, 5 Aug 2020 14:17:27 +0000 Subject: [PATCH] * the WASM define renamed WASM32 git-svn-id: branches/wasm@46250 - --- compiler/fpcdefs.inc | 3 ++- compiler/pp.pas | 6 +++--- compiler/ppcwasm32.lpi | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/compiler/fpcdefs.inc b/compiler/fpcdefs.inc index e60d729741..111f48ab75 100644 --- a/compiler/fpcdefs.inc +++ b/compiler/fpcdefs.inc @@ -376,7 +376,8 @@ {$define symansistr} {$endif} -{$ifdef wasm} +{$ifdef wasm32} + {$define wasm} {$define cpu32bit} {$define cpu64bitalu} {$define cpu32bitaddr} diff --git a/compiler/pp.pas b/compiler/pp.pas index 6cdcfec2cf..0ec4514392 100644 --- a/compiler/pp.pas +++ b/compiler/pp.pas @@ -41,7 +41,7 @@ program pp; RISCV64 generate a compiler for the RiscV64 architecture SPARC generate a compiler for SPARC SPARC64 generate a compiler for SPARC64 - WASM generate a compiler for WebAssembly + WASM32 generate a compiler for WebAssembly 32-bit X86_64 generate a compiler for the AMD x86-64 architecture XTENSA generate a compiler for XTENSA Z80 generate a compiler for Z80 @@ -195,12 +195,12 @@ program pp; {$endif CPUDEFINED} {$define CPUDEFINED} {$endif Z80} -{$ifdef WASM} +{$ifdef WASM32} {$ifdef CPUDEFINED} {$fatal ONLY one of the switches for the CPU type must be defined} {$endif CPUDEFINED} {$define CPUDEFINED} -{$endif WASM} +{$endif WASM32} {$ifndef CPUDEFINED} {$fatal A CPU type switch must be defined} diff --git a/compiler/ppcwasm32.lpi b/compiler/ppcwasm32.lpi index 686e7fc041..9217f62629 100644 --- a/compiler/ppcwasm32.lpi +++ b/compiler/ppcwasm32.lpi @@ -12,7 +12,7 @@ - + <Title Value="ppcwasm32"/> </General> <BuildModes Count="1"> <Item1 Name="default" Default="True"/> @@ -61,7 +61,7 @@ <ConfigFile> <StopAfterErrCount Value="50"/> </ConfigFile> - <CustomOptions Value="-dwasm + <CustomOptions Value="-dwasm32 -dnoopt"/> </Other> </CompilerOptions>