From 9e762cde8952ce93bf758714c521f45eb479bc0d Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 29 May 2022 19:34:19 +0200 Subject: [PATCH] udpated makefiles --- Makefile | 31 +++++--- components/PascalScript/Source/Makefile | 30 ++++--- components/anchordocking/Makefile | 30 ++++--- components/anchordocking/design/Makefile | 30 ++++--- components/buildintf/Makefile | 30 ++++--- components/cairocanvas/Makefile | 30 ++++--- components/chmhelp/packages/help/Makefile | 30 ++++--- components/chmhelp/packages/idehelp/Makefile | 30 ++++--- components/codetools/Makefile | 30 ++++--- components/codetools/ide/Makefile | 30 ++++--- components/datetimectrls/Makefile | 30 ++++--- components/datetimectrls/design/Makefile | 30 ++++--- components/debuggerintf/Makefile | 30 ++++--- components/exampleswindow/Makefile | 30 ++++--- components/externhelp/Makefile | 30 ++++--- components/fpcunit/Makefile | 30 ++++--- components/fpcunit/ide/Makefile | 30 ++++--- components/fpdebug/Makefile | 30 ++++--- components/freetype/Makefile | 30 ++++--- components/ideintf/Makefile | 30 ++++--- components/instantfpc/Makefile | 30 ++++--- components/jcf2/IdePlugin/lazarus/Makefile | 30 ++++--- components/lazcontrols/Makefile | 30 ++++--- components/lazcontrols/design/Makefile | 30 ++++--- components/lazdebuggergdbmi/Makefile | 30 ++++--- .../lazdebuggers/cmdlinedebuggerbase/Makefile | 30 ++++--- .../lazdebuggers/lazdebuggerfp/Makefile | 30 ++++--- .../lazdebuggers/lazdebuggerfplldb/Makefile | 30 ++++--- .../lazdebuggers/lazdebuggerlldb/Makefile | 30 ++++--- components/lazsvnpkg/Makefile | 30 ++++--- components/lazutils/Makefile | 30 ++++--- components/lclextensions/Makefile | 30 ++++--- components/leakview/Makefile | 30 ++++--- components/macfiles/Makefile | 30 ++++--- components/macroscript/Makefile | 30 ++++--- components/memds/Makefile | 30 ++++--- components/mouseandkeyinput/Makefile | 30 ++++--- components/onlinepackagemanager/Makefile | 30 ++++--- components/pas2js/Makefile | 30 ++++--- components/printers/Makefile | 30 ++++--- components/printers/design/Makefile | 30 ++++--- components/projectgroups/Makefile | 78 ++++++++++++++++--- components/projecttemplates/Makefile | 30 ++++--- components/rtticontrols/Makefile | 30 ++++--- components/sdf/Makefile | 30 ++++--- components/simplewebservergui/Makefile | 78 ++++++++++++++++--- components/sqldb/Makefile | 30 ++++--- components/synedit/design/Makefile | 30 ++++--- components/tachart/Makefile | 30 ++++--- components/tdbf/Makefile | 30 ++++--- components/todolist/Makefile | 30 ++++--- components/turbopower_ipro/Makefile | 30 ++++--- components/turbopower_ipro/design/Makefile | 30 ++++--- packager/registration/Makefile | 30 ++++--- 54 files changed, 1075 insertions(+), 642 deletions(-) diff --git a/Makefile b/Makefile index 16aeb692ab..a83a5bd503 100644 --- a/Makefile +++ b/Makefile @@ -1246,28 +1246,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -1279,16 +1282,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3163,6 +3166,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR @@ -3871,6 +3877,7 @@ else $(MKDIR) $(LAZARUS_INSTALL_DIR)/units/$(FULL_TARGET)/gtk $(MKDIR) $(LAZARUS_INSTALL_DIR)/units/$(FULL_TARGET)/gtk2 $(MKDIR) $(LAZARUS_INSTALL_DIR)/units/$(FULL_TARGET)/qt + $(MKDIR) $(LAZARUS_INSTALL_DIR)/units/$(FULL_TARGET)/qt5 $(MKDIR) $(LAZARUS_INSTALL_DIR)/components/synedit/design/languages endif ifndef BUILDDIR diff --git a/components/PascalScript/Source/Makefile b/components/PascalScript/Source/Makefile index 7ccb79b8a0..17d0dad050 100644 --- a/components/PascalScript/Source/Makefile +++ b/components/PascalScript/Source/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/anchordocking/Makefile b/components/anchordocking/Makefile index 8cfff86fff..3d01ec04d4 100644 --- a/components/anchordocking/Makefile +++ b/components/anchordocking/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/anchordocking/design/Makefile b/components/anchordocking/design/Makefile index d9545cf27c..5a7ffb1832 100644 --- a/components/anchordocking/design/Makefile +++ b/components/anchordocking/design/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/buildintf/Makefile b/components/buildintf/Makefile index 7d5f21efb6..07962ee536 100644 --- a/components/buildintf/Makefile +++ b/components/buildintf/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/cairocanvas/Makefile b/components/cairocanvas/Makefile index 1f41b9c7ae..a27a3bfa24 100644 --- a/components/cairocanvas/Makefile +++ b/components/cairocanvas/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/chmhelp/packages/help/Makefile b/components/chmhelp/packages/help/Makefile index 2dcdb48933..20d5c5569a 100644 --- a/components/chmhelp/packages/help/Makefile +++ b/components/chmhelp/packages/help/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/chmhelp/packages/idehelp/Makefile b/components/chmhelp/packages/idehelp/Makefile index d1c9c428e7..6936197e52 100644 --- a/components/chmhelp/packages/idehelp/Makefile +++ b/components/chmhelp/packages/idehelp/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/codetools/Makefile b/components/codetools/Makefile index 16dd444bc8..065fdfd220 100644 --- a/components/codetools/Makefile +++ b/components/codetools/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/codetools/ide/Makefile b/components/codetools/ide/Makefile index cacd80a9e2..c5b2c3f629 100644 --- a/components/codetools/ide/Makefile +++ b/components/codetools/ide/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/datetimectrls/Makefile b/components/datetimectrls/Makefile index bce9d90ba2..cddb792d77 100644 --- a/components/datetimectrls/Makefile +++ b/components/datetimectrls/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/datetimectrls/design/Makefile b/components/datetimectrls/design/Makefile index 7a8323e63a..44b1aab7f9 100644 --- a/components/datetimectrls/design/Makefile +++ b/components/datetimectrls/design/Makefile @@ -2540,28 +2540,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2573,16 +2576,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3581,6 +3584,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/debuggerintf/Makefile b/components/debuggerintf/Makefile index eaf690e723..fa86b90079 100644 --- a/components/debuggerintf/Makefile +++ b/components/debuggerintf/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/exampleswindow/Makefile b/components/exampleswindow/Makefile index ff1f9356a9..59908c2eb1 100644 --- a/components/exampleswindow/Makefile +++ b/components/exampleswindow/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/externhelp/Makefile b/components/externhelp/Makefile index b69dea4135..a313010593 100644 --- a/components/externhelp/Makefile +++ b/components/externhelp/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/fpcunit/Makefile b/components/fpcunit/Makefile index 79220b75a4..0222b69a68 100644 --- a/components/fpcunit/Makefile +++ b/components/fpcunit/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/fpcunit/ide/Makefile b/components/fpcunit/ide/Makefile index 470e766177..586e2545e3 100644 --- a/components/fpcunit/ide/Makefile +++ b/components/fpcunit/ide/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/fpdebug/Makefile b/components/fpdebug/Makefile index 7ef68692ec..218c19862d 100644 --- a/components/fpdebug/Makefile +++ b/components/fpdebug/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/freetype/Makefile b/components/freetype/Makefile index a8514aedca..38f3d0aa7c 100644 --- a/components/freetype/Makefile +++ b/components/freetype/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/ideintf/Makefile b/components/ideintf/Makefile index 4e8d1b9b97..1bdc2eed1c 100644 --- a/components/ideintf/Makefile +++ b/components/ideintf/Makefile @@ -2540,28 +2540,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2573,16 +2576,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3581,6 +3584,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/instantfpc/Makefile b/components/instantfpc/Makefile index f39c499981..33b278d980 100644 --- a/components/instantfpc/Makefile +++ b/components/instantfpc/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/jcf2/IdePlugin/lazarus/Makefile b/components/jcf2/IdePlugin/lazarus/Makefile index 2fd67bbbd6..4b22adaabc 100644 --- a/components/jcf2/IdePlugin/lazarus/Makefile +++ b/components/jcf2/IdePlugin/lazarus/Makefile @@ -2540,28 +2540,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2573,16 +2576,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3581,6 +3584,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/lazcontrols/Makefile b/components/lazcontrols/Makefile index 0f7cc464d3..d29032884b 100644 --- a/components/lazcontrols/Makefile +++ b/components/lazcontrols/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/lazcontrols/design/Makefile b/components/lazcontrols/design/Makefile index 870f2e3a55..36f87a9120 100644 --- a/components/lazcontrols/design/Makefile +++ b/components/lazcontrols/design/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/lazdebuggergdbmi/Makefile b/components/lazdebuggergdbmi/Makefile index 29aa7e3cf9..6bffc68232 100644 --- a/components/lazdebuggergdbmi/Makefile +++ b/components/lazdebuggergdbmi/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/lazdebuggers/cmdlinedebuggerbase/Makefile b/components/lazdebuggers/cmdlinedebuggerbase/Makefile index 695b5d0c52..bebd40d18e 100644 --- a/components/lazdebuggers/cmdlinedebuggerbase/Makefile +++ b/components/lazdebuggers/cmdlinedebuggerbase/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/lazdebuggers/lazdebuggerfp/Makefile b/components/lazdebuggers/lazdebuggerfp/Makefile index 6b83e2d595..7d0fb793ed 100644 --- a/components/lazdebuggers/lazdebuggerfp/Makefile +++ b/components/lazdebuggers/lazdebuggerfp/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/lazdebuggers/lazdebuggerfplldb/Makefile b/components/lazdebuggers/lazdebuggerfplldb/Makefile index 06452cabbb..c889919451 100644 --- a/components/lazdebuggers/lazdebuggerfplldb/Makefile +++ b/components/lazdebuggers/lazdebuggerfplldb/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/lazdebuggers/lazdebuggerlldb/Makefile b/components/lazdebuggers/lazdebuggerlldb/Makefile index 28deed3bac..bbe387b08f 100644 --- a/components/lazdebuggers/lazdebuggerlldb/Makefile +++ b/components/lazdebuggers/lazdebuggerlldb/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/lazsvnpkg/Makefile b/components/lazsvnpkg/Makefile index 9e48a95463..f16071a383 100644 --- a/components/lazsvnpkg/Makefile +++ b/components/lazsvnpkg/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/lazutils/Makefile b/components/lazutils/Makefile index 100e1accf2..8351f24bef 100644 --- a/components/lazutils/Makefile +++ b/components/lazutils/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/lclextensions/Makefile b/components/lclextensions/Makefile index 16affc428e..f44b2a5496 100644 --- a/components/lclextensions/Makefile +++ b/components/lclextensions/Makefile @@ -2540,28 +2540,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2573,16 +2576,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3581,6 +3584,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/leakview/Makefile b/components/leakview/Makefile index 41cd8efe65..a6e54e7e7f 100644 --- a/components/leakview/Makefile +++ b/components/leakview/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/macfiles/Makefile b/components/macfiles/Makefile index ab47ba25e8..a5ead417f0 100644 --- a/components/macfiles/Makefile +++ b/components/macfiles/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/macroscript/Makefile b/components/macroscript/Makefile index 63bb05da65..640a26e359 100644 --- a/components/macroscript/Makefile +++ b/components/macroscript/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/memds/Makefile b/components/memds/Makefile index 5a9a3655ca..4305fa903b 100644 --- a/components/memds/Makefile +++ b/components/memds/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/mouseandkeyinput/Makefile b/components/mouseandkeyinput/Makefile index cd9ab7b959..a6e683f878 100644 --- a/components/mouseandkeyinput/Makefile +++ b/components/mouseandkeyinput/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/onlinepackagemanager/Makefile b/components/onlinepackagemanager/Makefile index de9fe46e07..b20ac9b4f5 100644 --- a/components/onlinepackagemanager/Makefile +++ b/components/onlinepackagemanager/Makefile @@ -2540,28 +2540,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2573,16 +2576,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3581,6 +3584,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/pas2js/Makefile b/components/pas2js/Makefile index d1736c572b..ccef0c2135 100644 --- a/components/pas2js/Makefile +++ b/components/pas2js/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/printers/Makefile b/components/printers/Makefile index 9e7cc1b309..60eaa55d6b 100644 --- a/components/printers/Makefile +++ b/components/printers/Makefile @@ -2540,28 +2540,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2573,16 +2576,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3581,6 +3584,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/printers/design/Makefile b/components/printers/design/Makefile index 510473573d..975580888a 100644 --- a/components/printers/design/Makefile +++ b/components/printers/design/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/projectgroups/Makefile b/components/projectgroups/Makefile index 7575e78559..cade2d6694 100644 --- a/components/projectgroups/Makefile +++ b/components/projectgroups/Makefile @@ -2,7 +2,7 @@ # Don't edit, this file is generated by FPCMake Version 2.0.0 # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-android aarch64-ios wasm32-embedded wasm32-wasi sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64-linux mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-embedded aarch64-android aarch64-ios wasm32-embedded wasm32-wasi sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari @@ -177,6 +177,8 @@ else ARCH=$(CPU_TARGET) endif endif +ifeq ($(FULL_TARGET),aarch64-embedded) +endif ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(SUBARCH),) $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined) @@ -608,6 +610,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_UNITS+=lazprojectgroups.pas endif +ifeq ($(FULL_TARGET),mips64-linux) +override TARGET_UNITS+=lazprojectgroups.pas +endif ifeq ($(FULL_TARGET),mips64el-linux) override TARGET_UNITS+=lazprojectgroups.pas endif @@ -638,6 +643,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) override TARGET_UNITS+=lazprojectgroups.pas endif +ifeq ($(FULL_TARGET),aarch64-embedded) +override TARGET_UNITS+=lazprojectgroups.pas +endif ifeq ($(FULL_TARGET),aarch64-android) override TARGET_UNITS+=lazprojectgroups.pas endif @@ -926,6 +934,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),mips64-linux) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),mips64el-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -956,6 +967,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),aarch64-embedded) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),aarch64-android) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -1244,6 +1258,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) endif +ifeq ($(FULL_TARGET),mips64-linux) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) +endif ifeq ($(FULL_TARGET),mips64el-linux) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) endif @@ -1274,6 +1291,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) endif +ifeq ($(FULL_TARGET),aarch64-embedded) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) +endif ifeq ($(FULL_TARGET),aarch64-android) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) endif @@ -1562,6 +1582,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . endif +ifeq ($(FULL_TARGET),mips64-linux) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . +endif ifeq ($(FULL_TARGET),mips64el-linux) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . endif @@ -1592,6 +1615,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . endif +ifeq ($(FULL_TARGET),aarch64-embedded) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . +endif ifeq ($(FULL_TARGET),aarch64-android) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . endif @@ -1880,6 +1906,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) endif +ifeq ($(FULL_TARGET),mips64-linux) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) +endif ifeq ($(FULL_TARGET),mips64el-linux) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) endif @@ -1910,6 +1939,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) endif +ifeq ($(FULL_TARGET),aarch64-embedded) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) +endif ifeq ($(FULL_TARGET),aarch64-android) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) endif @@ -2184,13 +2216,32 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) -CROSSGCCOPT=-mabi=32 -else CROSSGCCOPT=-m32 endif endif endif +ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) +else +CROSSGCCOPT=-mabi=64 +endif +endif +ifneq ($(filter $(CPU_TARGET),mips mipsel),) +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) +else +CROSSGCCOPT=-mabi=32 +endif +endif +ifeq ($(BINUTILSPREFIX),) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif +else +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g +endif endif endif ifdef FPCFPMAKE @@ -2201,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -2963,6 +3014,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),mips64-linux) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),mips64el-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2993,6 +3047,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),aarch64-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),aarch64-android) REQUIRE_PACKAGES_RTL=1 endif @@ -3199,10 +3256,13 @@ ifdef CREATESHARED override FPCOPT+=-Cg endif ifneq ($(filter $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) -ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel riscv64 powerpc64),) +ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc64),) override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/projecttemplates/Makefile b/components/projecttemplates/Makefile index df921df61e..25b32f3dc0 100644 --- a/components/projecttemplates/Makefile +++ b/components/projecttemplates/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/rtticontrols/Makefile b/components/rtticontrols/Makefile index 55f76f1592..e25ec3c9da 100644 --- a/components/rtticontrols/Makefile +++ b/components/rtticontrols/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/sdf/Makefile b/components/sdf/Makefile index 8db576dfac..c2aec5a4b4 100644 --- a/components/sdf/Makefile +++ b/components/sdf/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/simplewebservergui/Makefile b/components/simplewebservergui/Makefile index 63d0c1a933..e3b1ee3249 100644 --- a/components/simplewebservergui/Makefile +++ b/components/simplewebservergui/Makefile @@ -2,7 +2,7 @@ # Don't edit, this file is generated by FPCMake Version 2.0.0 # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-android aarch64-ios wasm32-embedded wasm32-wasi sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64-linux mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-embedded aarch64-android aarch64-ios wasm32-embedded wasm32-wasi sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari @@ -177,6 +177,8 @@ else ARCH=$(CPU_TARGET) endif endif +ifeq ($(FULL_TARGET),aarch64-embedded) +endif ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(SUBARCH),) $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined) @@ -608,6 +610,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_UNITS+=simplewebservergui.pas endif +ifeq ($(FULL_TARGET),mips64-linux) +override TARGET_UNITS+=simplewebservergui.pas +endif ifeq ($(FULL_TARGET),mips64el-linux) override TARGET_UNITS+=simplewebservergui.pas endif @@ -638,6 +643,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) override TARGET_UNITS+=simplewebservergui.pas endif +ifeq ($(FULL_TARGET),aarch64-embedded) +override TARGET_UNITS+=simplewebservergui.pas +endif ifeq ($(FULL_TARGET),aarch64-android) override TARGET_UNITS+=simplewebservergui.pas endif @@ -926,6 +934,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),mips64-linux) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),mips64el-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -956,6 +967,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),aarch64-embedded) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),aarch64-android) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -1244,6 +1258,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) endif +ifeq ($(FULL_TARGET),mips64-linux) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) +endif ifeq ($(FULL_TARGET),mips64el-linux) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) endif @@ -1274,6 +1291,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) endif +ifeq ($(FULL_TARGET),aarch64-embedded) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) +endif ifeq ($(FULL_TARGET),aarch64-android) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS) endif @@ -1562,6 +1582,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/design/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . endif +ifeq ($(FULL_TARGET),mips64-linux) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/design/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . +endif ifeq ($(FULL_TARGET),mips64el-linux) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/design/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . endif @@ -1592,6 +1615,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/design/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . endif +ifeq ($(FULL_TARGET),aarch64-embedded) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/design/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . +endif ifeq ($(FULL_TARGET),aarch64-android) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/design/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) . endif @@ -1880,6 +1906,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) endif +ifeq ($(FULL_TARGET),mips64-linux) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) +endif ifeq ($(FULL_TARGET),mips64el-linux) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) endif @@ -1910,6 +1939,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) endif +ifeq ($(FULL_TARGET),aarch64-embedded) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) +endif ifeq ($(FULL_TARGET),aarch64-android) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) endif @@ -2184,13 +2216,32 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) -CROSSGCCOPT=-mabi=32 -else CROSSGCCOPT=-m32 endif endif endif +ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) +else +CROSSGCCOPT=-mabi=64 +endif +endif +ifneq ($(filter $(CPU_TARGET),mips mipsel),) +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) +else +CROSSGCCOPT=-mabi=32 +endif +endif +ifeq ($(BINUTILSPREFIX),) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif +else +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g +endif endif endif ifdef FPCFPMAKE @@ -2201,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -2963,6 +3014,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),mips64-linux) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),mips64el-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2993,6 +3047,9 @@ endif ifeq ($(FULL_TARGET),aarch64-win64) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),aarch64-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),aarch64-android) REQUIRE_PACKAGES_RTL=1 endif @@ -3199,10 +3256,13 @@ ifdef CREATESHARED override FPCOPT+=-Cg endif ifneq ($(filter $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) -ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel riscv64 powerpc64),) +ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc64),) override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/sqldb/Makefile b/components/sqldb/Makefile index dbec7765da..6867255881 100644 --- a/components/sqldb/Makefile +++ b/components/sqldb/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/synedit/design/Makefile b/components/synedit/design/Makefile index 0b403af112..9f77a7993f 100644 --- a/components/synedit/design/Makefile +++ b/components/synedit/design/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/tachart/Makefile b/components/tachart/Makefile index f60545a4f2..6fb83df310 100644 --- a/components/tachart/Makefile +++ b/components/tachart/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/tdbf/Makefile b/components/tdbf/Makefile index 87010f2440..0f1c64c58b 100644 --- a/components/tdbf/Makefile +++ b/components/tdbf/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/todolist/Makefile b/components/todolist/Makefile index 81f8e1e534..53fc936ae6 100644 --- a/components/todolist/Makefile +++ b/components/todolist/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/turbopower_ipro/Makefile b/components/turbopower_ipro/Makefile index 7eff5bd8a3..2d63829f31 100644 --- a/components/turbopower_ipro/Makefile +++ b/components/turbopower_ipro/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/components/turbopower_ipro/design/Makefile b/components/turbopower_ipro/design/Makefile index e5ec9b0c34..6548bcd13b 100644 --- a/components/turbopower_ipro/design/Makefile +++ b/components/turbopower_ipro/design/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR diff --git a/packager/registration/Makefile b/packager/registration/Makefile index 152d659305..a660fc8602 100644 --- a/packager/registration/Makefile +++ b/packager/registration/Makefile @@ -2216,28 +2216,31 @@ ifneq ($(filter sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +CROSSGCCOPT=-m32 +endif +endif +endif ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=64 endif -else +endif ifneq ($(filter $(CPU_TARGET),mips mipsel),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`) else CROSSGCCOPT=-mabi=32 endif -else +endif ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +ifeq ($(GCCLIBDIR),) +GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif else -CROSSGCCOPT=-m32 -endif -endif -endif -endif +ifeq ($(CROSSGCCOPT),) +CROSSGCCOPT=-g endif endif endif @@ -2249,16 +2252,16 @@ else ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) FPCMAKE_CROSSGCCOPT=-m64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),) FPCMAKE_CROSSGCCOPT=-mabi=64 else -ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),) +ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv64) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64) FPCMAKE_CROSSGCCOPT=-mabi=lp64 else -ifeq ($(FPCFPMAKE_CPU_OPT),riscv32) +ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32) FPCMAKE_CROSSGCCOPT=-mabi=ilp32 else FPCMAKE_CROSSGCCOPT=-m32 @@ -3257,6 +3260,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc override FPCOPT+=-Cg endif endif +ifneq ($(filter $(CPU_TARGET),z80),) +override FPCOPT+=-CX -XX +endif ifdef LINKSHARED endif ifdef GCCLIBDIR