diff options
author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-03-12 13:23:41 +0000 |
---|---|---|
committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-03-12 13:23:41 +0000 |
commit | e7768064128ff589af356b39ae3b987add3e2e2c (patch) | |
tree | 10238318dd4ffe6674c2a027d3804d2230a61e47 | |
parent | 0a62609a78ee3da5ed989e487228af6a3a7f7270 (diff) | |
download | fpc-e7768064128ff589af356b39ae3b987add3e2e2c.tar.gz |
Update Makefile's after commits 48929/48930
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@48940 3ad0048d-3df7-0310-abae-a5850022a9f2
223 files changed, 1787 insertions, 3 deletions
@@ -1073,10 +1073,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/compiler/Makefile b/compiler/Makefile index 3003b10dc4..67cfa02ce9 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -2765,10 +2765,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif @@ -5052,9 +5060,9 @@ endif cycledep: $(MAKE) cycle USEDEPEND=1 extcycle: - $(MAKE) cycle OPT="$(OPT) -n -glttt -CRriot -dEXTDEBUG" ALLOW_WARNINGS=1 + $(MAKE) cycle RTLOPT="$(RTLOPT) -n -glttt -CRriot -dEXTDEBUG" LOCALOPT="$(LOCALOPT) -n -glttt -CRriot -dEXTDEBUG" ALLOW_WARNINGS=1 extoptcycle: - $(MAKE) cycle OPT="$(OPT) -n -glttt -CRriot -dEXTDEBUG -dDEBUG_ALL_OPT" ALLOW_WARNINGS=1 + $(MAKE) cycle RTLOPT="$(RTLOPT) -n -glttt -CRriot -dEXTDEBUG -dDEBUG_ALL_OPT" LOCALOPT="$(LOCALOPT) -n -glttt -CRriot -dEXTDEBUG -dDEBUG_ALL_OPT" ALLOW_WARNINGS=1 cvstest: $(MAKE) cycle 'LOCALOPT=-n -Se' 'RTLOPT=-n -Se' ifeq ($(findstring -dFPC_SOFT_FPUX80,$(LOCALOPT)),) diff --git a/compiler/utils/Makefile b/compiler/utils/Makefile index 3b69835f57..63d425a239 100644 --- a/compiler/utils/Makefile +++ b/compiler/utils/Makefile @@ -1850,10 +1850,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/installer/Makefile b/installer/Makefile index e83465bea4..8610f6a94c 100644 --- a/installer/Makefile +++ b/installer/Makefile @@ -1028,10 +1028,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/Makefile b/packages/Makefile index 3c215af83a..a69295d498 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -631,10 +631,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/a52/Makefile b/packages/a52/Makefile index 2ebb38205b..c7330e8cc4 100644 --- a/packages/a52/Makefile +++ b/packages/a52/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/ami-extra/Makefile b/packages/ami-extra/Makefile index 88e6d1d58e..f08bf39f30 100644 --- a/packages/ami-extra/Makefile +++ b/packages/ami-extra/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/amunits/Makefile b/packages/amunits/Makefile index 549ff4614f..525ab3ed99 100644 --- a/packages/amunits/Makefile +++ b/packages/amunits/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/arosunits/Makefile b/packages/arosunits/Makefile index 7c33b49bc9..8b375eb9c1 100644 --- a/packages/arosunits/Makefile +++ b/packages/arosunits/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/aspell/Makefile b/packages/aspell/Makefile index a8e2ae42ed..1a3cb6d2e1 100644 --- a/packages/aspell/Makefile +++ b/packages/aspell/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/bfd/Makefile b/packages/bfd/Makefile index e9d8b37f22..2e5c60bc81 100644 --- a/packages/bfd/Makefile +++ b/packages/bfd/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/bzip2/Makefile b/packages/bzip2/Makefile index 8092b034d1..3eb4db4b18 100644 --- a/packages/bzip2/Makefile +++ b/packages/bzip2/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/cairo/Makefile b/packages/cairo/Makefile index 50de047a51..de55b45fdc 100644 --- a/packages/cairo/Makefile +++ b/packages/cairo/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/cdrom/Makefile b/packages/cdrom/Makefile index 0a4d7cd4a6..defc2f5751 100644 --- a/packages/cdrom/Makefile +++ b/packages/cdrom/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/chm/Makefile b/packages/chm/Makefile index 06adc55330..25a835693c 100644 --- a/packages/chm/Makefile +++ b/packages/chm/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/cocoaint/Makefile b/packages/cocoaint/Makefile index f95155be4a..ea03608129 100644 --- a/packages/cocoaint/Makefile +++ b/packages/cocoaint/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/dblib/Makefile b/packages/dblib/Makefile index 8394e97192..d903efd547 100644 --- a/packages/dblib/Makefile +++ b/packages/dblib/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/dbus/Makefile b/packages/dbus/Makefile index dbc0307b53..149c83799d 100644 --- a/packages/dbus/Makefile +++ b/packages/dbus/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/dts/Makefile b/packages/dts/Makefile index 19e6786dfc..80b1744ec5 100644 --- a/packages/dts/Makefile +++ b/packages/dts/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fastcgi/Makefile b/packages/fastcgi/Makefile index e846eadf2f..23a432094c 100644 --- a/packages/fastcgi/Makefile +++ b/packages/fastcgi/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-async/Makefile b/packages/fcl-async/Makefile index c116a4a8ff..0f50e1a085 100644 --- a/packages/fcl-async/Makefile +++ b/packages/fcl-async/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-base/Makefile b/packages/fcl-base/Makefile index 3cc3ce99ac..2f71e87b42 100644 --- a/packages/fcl-base/Makefile +++ b/packages/fcl-base/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-db/Makefile b/packages/fcl-db/Makefile index d84241a87f..994c2d65dd 100644 --- a/packages/fcl-db/Makefile +++ b/packages/fcl-db/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-extra/Makefile b/packages/fcl-extra/Makefile index ac5ea63f99..44ca6acd05 100644 --- a/packages/fcl-extra/Makefile +++ b/packages/fcl-extra/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-fpcunit/Makefile b/packages/fcl-fpcunit/Makefile index 494b100fcf..fc19e438f5 100644 --- a/packages/fcl-fpcunit/Makefile +++ b/packages/fcl-fpcunit/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-image/Makefile b/packages/fcl-image/Makefile index bc7611e8bc..d1eceff083 100644 --- a/packages/fcl-image/Makefile +++ b/packages/fcl-image/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-js/Makefile b/packages/fcl-js/Makefile index 652ac1efbe..8a307a73da 100644 --- a/packages/fcl-js/Makefile +++ b/packages/fcl-js/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-json/Makefile b/packages/fcl-json/Makefile index 6e8e40505d..21fe396179 100644 --- a/packages/fcl-json/Makefile +++ b/packages/fcl-json/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-net/Makefile b/packages/fcl-net/Makefile index ccad2953da..6a8ea7de02 100644 --- a/packages/fcl-net/Makefile +++ b/packages/fcl-net/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-passrc/Makefile b/packages/fcl-passrc/Makefile index 484cb79715..9ce658305e 100644 --- a/packages/fcl-passrc/Makefile +++ b/packages/fcl-passrc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-pdf/Makefile b/packages/fcl-pdf/Makefile index 6859686fd1..4f435486e7 100644 --- a/packages/fcl-pdf/Makefile +++ b/packages/fcl-pdf/Makefile @@ -631,10 +631,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-process/Makefile b/packages/fcl-process/Makefile index 5eefc9eced..7c7553d100 100644 --- a/packages/fcl-process/Makefile +++ b/packages/fcl-process/Makefile @@ -631,10 +631,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-registry/Makefile b/packages/fcl-registry/Makefile index 20500e1a62..f1efb6bedb 100644 --- a/packages/fcl-registry/Makefile +++ b/packages/fcl-registry/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-report/Makefile b/packages/fcl-report/Makefile index a83d8d37d9..7d4a18776e 100644 --- a/packages/fcl-report/Makefile +++ b/packages/fcl-report/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-res/Makefile b/packages/fcl-res/Makefile index aa8cbcc0d6..131d0ecdcf 100644 --- a/packages/fcl-res/Makefile +++ b/packages/fcl-res/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-sdo/Makefile b/packages/fcl-sdo/Makefile index 8b0117f46c..e56b98265d 100644 --- a/packages/fcl-sdo/Makefile +++ b/packages/fcl-sdo/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-sound/Makefile b/packages/fcl-sound/Makefile index 05dc5cf58e..32c1a76a00 100644 --- a/packages/fcl-sound/Makefile +++ b/packages/fcl-sound/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-stl/Makefile b/packages/fcl-stl/Makefile index 027dedc682..3de5417053 100644 --- a/packages/fcl-stl/Makefile +++ b/packages/fcl-stl/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-web/Makefile b/packages/fcl-web/Makefile index 0aefff4de3..2e5d5af9eb 100644 --- a/packages/fcl-web/Makefile +++ b/packages/fcl-web/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fcl-xml/Makefile b/packages/fcl-xml/Makefile index 6cc8d0b256..6d28a28063 100644 --- a/packages/fcl-xml/Makefile +++ b/packages/fcl-xml/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fftw/Makefile b/packages/fftw/Makefile index ccc5717bfa..c0b163cb63 100644 --- a/packages/fftw/Makefile +++ b/packages/fftw/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fpgtk/Makefile b/packages/fpgtk/Makefile index 14bb860490..7c2a58d267 100644 --- a/packages/fpgtk/Makefile +++ b/packages/fpgtk/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fpindexer/Makefile b/packages/fpindexer/Makefile index 65a6886fff..e6fa62d229 100644 --- a/packages/fpindexer/Makefile +++ b/packages/fpindexer/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fpmkunit/Makefile b/packages/fpmkunit/Makefile index 2a0f24ed82..005ddf407c 100644 --- a/packages/fpmkunit/Makefile +++ b/packages/fpmkunit/Makefile @@ -647,10 +647,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fppkg/Makefile b/packages/fppkg/Makefile index 9730328c1c..8c7743f5aa 100644 --- a/packages/fppkg/Makefile +++ b/packages/fppkg/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fuse/Makefile b/packages/fuse/Makefile index 0e9d4100b4..15229205b5 100644 --- a/packages/fuse/Makefile +++ b/packages/fuse/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/fv/Makefile b/packages/fv/Makefile index 4c25a22b93..ebf3307bbd 100644 --- a/packages/fv/Makefile +++ b/packages/fv/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile index 331e9948cb..2cc03adcb5 100644 --- a/packages/gdbint/Makefile +++ b/packages/gdbint/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/gdbm/Makefile b/packages/gdbm/Makefile index 0dc4e7f9bd..bbd7d51eb2 100644 --- a/packages/gdbm/Makefile +++ b/packages/gdbm/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/ggi/Makefile b/packages/ggi/Makefile index 70a148d70f..d7219d52c8 100644 --- a/packages/ggi/Makefile +++ b/packages/ggi/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/gmp/Makefile b/packages/gmp/Makefile index 18bd3b1b38..6af88c6d9a 100644 --- a/packages/gmp/Makefile +++ b/packages/gmp/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/gnome1/Makefile b/packages/gnome1/Makefile index 7b7d1effbd..fb8411ad1f 100644 --- a/packages/gnome1/Makefile +++ b/packages/gnome1/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/gnutls/Makefile b/packages/gnutls/Makefile index 0d6e8b3ff3..4049ff3164 100644 --- a/packages/gnutls/Makefile +++ b/packages/gnutls/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/googleapi/Makefile b/packages/googleapi/Makefile index 06d10292e0..4024a04084 100644 --- a/packages/googleapi/Makefile +++ b/packages/googleapi/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/graph/Makefile b/packages/graph/Makefile index ef8fe27f4e..fd4e6b7141 100644 --- a/packages/graph/Makefile +++ b/packages/graph/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/gtk1/Makefile b/packages/gtk1/Makefile index 2211e90b66..77e3208196 100644 --- a/packages/gtk1/Makefile +++ b/packages/gtk1/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/gtk2/Makefile b/packages/gtk2/Makefile index dfb3cfeac0..07333005a0 100644 --- a/packages/gtk2/Makefile +++ b/packages/gtk2/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/hash/Makefile b/packages/hash/Makefile index 9e90ffc01a..795411e32c 100644 --- a/packages/hash/Makefile +++ b/packages/hash/Makefile @@ -631,10 +631,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/hermes/Makefile b/packages/hermes/Makefile index c8a5cb959b..c8c5aa0870 100644 --- a/packages/hermes/Makefile +++ b/packages/hermes/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/httpd13/Makefile b/packages/httpd13/Makefile index f3222f6ecf..a439be0c43 100644 --- a/packages/httpd13/Makefile +++ b/packages/httpd13/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/httpd20/Makefile b/packages/httpd20/Makefile index 2f9e41feda..1218210fa3 100644 --- a/packages/httpd20/Makefile +++ b/packages/httpd20/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/httpd22/Makefile b/packages/httpd22/Makefile index 1d6654aaf2..04609c365e 100644 --- a/packages/httpd22/Makefile +++ b/packages/httpd22/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/httpd24/Makefile b/packages/httpd24/Makefile index 0d164aed44..0857afccb5 100644 --- a/packages/httpd24/Makefile +++ b/packages/httpd24/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/ibase/Makefile b/packages/ibase/Makefile index da064290d6..545097492c 100644 --- a/packages/ibase/Makefile +++ b/packages/ibase/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/iconvenc/Makefile b/packages/iconvenc/Makefile index 32e6923c09..09f4793b21 100644 --- a/packages/iconvenc/Makefile +++ b/packages/iconvenc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/ide/Makefile b/packages/ide/Makefile index bcc6f7d8a0..e6cdb69c6e 100644 --- a/packages/ide/Makefile +++ b/packages/ide/Makefile @@ -616,10 +616,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/imagemagick/Makefile b/packages/imagemagick/Makefile index b62b47cbdb..c1d4783f6c 100644 --- a/packages/imagemagick/Makefile +++ b/packages/imagemagick/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/imlib/Makefile b/packages/imlib/Makefile index a373159120..34380ef7bd 100644 --- a/packages/imlib/Makefile +++ b/packages/imlib/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/iosxlocale/Makefile b/packages/iosxlocale/Makefile index 59d5de2f1a..7e76a6324a 100644 --- a/packages/iosxlocale/Makefile +++ b/packages/iosxlocale/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/jni/Makefile b/packages/jni/Makefile index 3aa9eb1099..f2b90cf172 100644 --- a/packages/jni/Makefile +++ b/packages/jni/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/ldap/Makefile b/packages/ldap/Makefile index 4a17509a7e..6245d42ad7 100644 --- a/packages/ldap/Makefile +++ b/packages/ldap/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libc/Makefile b/packages/libc/Makefile index 86ccfa7807..fbbee2128c 100644 --- a/packages/libc/Makefile +++ b/packages/libc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libcups/Makefile b/packages/libcups/Makefile index cd6de1c31b..381ca9127a 100644 --- a/packages/libcups/Makefile +++ b/packages/libcups/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libcurl/Makefile b/packages/libcurl/Makefile index 34b7a47759..f30eda6eaa 100644 --- a/packages/libcurl/Makefile +++ b/packages/libcurl/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libenet/Makefile b/packages/libenet/Makefile index 0dcaa9ab53..bb99b93423 100644 --- a/packages/libenet/Makefile +++ b/packages/libenet/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libffi/Makefile b/packages/libffi/Makefile index 9e22c050c7..4a29e08f30 100644 --- a/packages/libffi/Makefile +++ b/packages/libffi/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libfontconfig/Makefile b/packages/libfontconfig/Makefile index 617a718250..a4b0734607 100644 --- a/packages/libfontconfig/Makefile +++ b/packages/libfontconfig/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libgbafpc/Makefile b/packages/libgbafpc/Makefile index cf7fe3d5da..23d4b13c78 100644 --- a/packages/libgbafpc/Makefile +++ b/packages/libgbafpc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libgc/Makefile b/packages/libgc/Makefile index 92c3cc9b7f..3f563d9665 100644 --- a/packages/libgc/Makefile +++ b/packages/libgc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libgd/Makefile b/packages/libgd/Makefile index db3ad3ccd9..34390357b4 100644 --- a/packages/libgd/Makefile +++ b/packages/libgd/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libmagic/Makefile b/packages/libmagic/Makefile index 6be4e68e96..036f073e31 100644 --- a/packages/libmagic/Makefile +++ b/packages/libmagic/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libmicrohttpd/Makefile b/packages/libmicrohttpd/Makefile index 15504aa466..d242332668 100644 --- a/packages/libmicrohttpd/Makefile +++ b/packages/libmicrohttpd/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libndsfpc/Makefile b/packages/libndsfpc/Makefile index 35f2d687a6..de6cee9335 100644 --- a/packages/libndsfpc/Makefile +++ b/packages/libndsfpc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libogcfpc/Makefile b/packages/libogcfpc/Makefile index 3a010f4591..69158e272f 100644 --- a/packages/libogcfpc/Makefile +++ b/packages/libogcfpc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libpng/Makefile b/packages/libpng/Makefile index ce93d5eaaa..d2f16af652 100644 --- a/packages/libpng/Makefile +++ b/packages/libpng/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/librsvg/Makefile b/packages/librsvg/Makefile index 402d973253..99d93fd723 100644 --- a/packages/librsvg/Makefile +++ b/packages/librsvg/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libsee/Makefile b/packages/libsee/Makefile index e80f7fe2bd..56e0b6360d 100644 --- a/packages/libsee/Makefile +++ b/packages/libsee/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libtar/Makefile b/packages/libtar/Makefile index 5d4825627c..b085bcb650 100644 --- a/packages/libtar/Makefile +++ b/packages/libtar/Makefile @@ -631,10 +631,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libusb/Makefile b/packages/libusb/Makefile index 612e54d58a..ab34b4b647 100644 --- a/packages/libusb/Makefile +++ b/packages/libusb/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libvlc/Makefile b/packages/libvlc/Makefile index 2ff3d6d524..2f33a121a5 100644 --- a/packages/libvlc/Makefile +++ b/packages/libvlc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/libxml/Makefile b/packages/libxml/Makefile index 84accf12c1..53ea167a26 100644 --- a/packages/libxml/Makefile +++ b/packages/libxml/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/lua/Makefile b/packages/lua/Makefile index d46c25ee20..7585f36b0d 100644 --- a/packages/lua/Makefile +++ b/packages/lua/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/mad/Makefile b/packages/mad/Makefile index e4e3ef3556..461653489c 100644 --- a/packages/mad/Makefile +++ b/packages/mad/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/matroska/Makefile b/packages/matroska/Makefile index 47f33027ed..359028f28b 100644 --- a/packages/matroska/Makefile +++ b/packages/matroska/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/modplug/Makefile b/packages/modplug/Makefile index 7a695d47b3..7867715ac0 100644 --- a/packages/modplug/Makefile +++ b/packages/modplug/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/morphunits/Makefile b/packages/morphunits/Makefile index 5fd58c3e1c..19f338d08b 100644 --- a/packages/morphunits/Makefile +++ b/packages/morphunits/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/mysql/Makefile b/packages/mysql/Makefile index 9110673547..8059101d3c 100644 --- a/packages/mysql/Makefile +++ b/packages/mysql/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/ncurses/Makefile b/packages/ncurses/Makefile index a1f458330d..7fb44e06dc 100644 --- a/packages/ncurses/Makefile +++ b/packages/ncurses/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/newt/Makefile b/packages/newt/Makefile index 3352c542f0..f0bb67628f 100644 --- a/packages/newt/Makefile +++ b/packages/newt/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/numlib/Makefile b/packages/numlib/Makefile index 36382b6f9f..d04b47ef34 100644 --- a/packages/numlib/Makefile +++ b/packages/numlib/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/nvapi/Makefile b/packages/nvapi/Makefile index 39a359d0d4..844a02e39d 100644 --- a/packages/nvapi/Makefile +++ b/packages/nvapi/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/objcrtl/Makefile b/packages/objcrtl/Makefile index b0e058e46e..df6a724132 100644 --- a/packages/objcrtl/Makefile +++ b/packages/objcrtl/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/odata/Makefile b/packages/odata/Makefile index d77d01bcce..70e0e19441 100644 --- a/packages/odata/Makefile +++ b/packages/odata/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/odbc/Makefile b/packages/odbc/Makefile index 965878fade..e1d4b0ee26 100644 --- a/packages/odbc/Makefile +++ b/packages/odbc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/oggvorbis/Makefile b/packages/oggvorbis/Makefile index 1a32697c79..a5670ec755 100644 --- a/packages/oggvorbis/Makefile +++ b/packages/oggvorbis/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/openal/Makefile b/packages/openal/Makefile index 3d6d5f8921..475e13222c 100644 --- a/packages/openal/Makefile +++ b/packages/openal/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/opencl/Makefile b/packages/opencl/Makefile index 5cf412149e..3cf0e712e2 100644 --- a/packages/opencl/Makefile +++ b/packages/opencl/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/opengl/Makefile b/packages/opengl/Makefile index 0ac63bd894..86fadb51bd 100644 --- a/packages/opengl/Makefile +++ b/packages/opengl/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/opengles/Makefile b/packages/opengles/Makefile index 2357023a98..02f49ba6ee 100644 --- a/packages/opengles/Makefile +++ b/packages/opengles/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/openssl/Makefile b/packages/openssl/Makefile index 485cfafab3..6cd2375569 100644 --- a/packages/openssl/Makefile +++ b/packages/openssl/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/oracle/Makefile b/packages/oracle/Makefile index ea0d2b23e7..a8837f7ec0 100644 --- a/packages/oracle/Makefile +++ b/packages/oracle/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/os2units/Makefile b/packages/os2units/Makefile index 9756d6b484..12ffb3b03b 100644 --- a/packages/os2units/Makefile +++ b/packages/os2units/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/os4units/Makefile b/packages/os4units/Makefile index 42e3f2cd01..6ee495e90e 100644 --- a/packages/os4units/Makefile +++ b/packages/os4units/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/palmunits/Makefile b/packages/palmunits/Makefile index 5a2252aca8..b7ed8301d3 100644 --- a/packages/palmunits/Makefile +++ b/packages/palmunits/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/pasjpeg/Makefile b/packages/pasjpeg/Makefile index 7b6a9140d4..8a4f379912 100644 --- a/packages/pasjpeg/Makefile +++ b/packages/pasjpeg/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/pastojs/Makefile b/packages/pastojs/Makefile index 105789a7af..8e5ceda054 100644 --- a/packages/pastojs/Makefile +++ b/packages/pastojs/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/paszlib/Makefile b/packages/paszlib/Makefile index 7ca374b5cb..2a5723d342 100644 --- a/packages/paszlib/Makefile +++ b/packages/paszlib/Makefile @@ -631,10 +631,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/pcap/Makefile b/packages/pcap/Makefile index fcaaf5ced2..1f8eb9813a 100644 --- a/packages/pcap/Makefile +++ b/packages/pcap/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/postgres/Makefile b/packages/postgres/Makefile index 913f4f20ff..9317bca14a 100644 --- a/packages/postgres/Makefile +++ b/packages/postgres/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/proj4/Makefile b/packages/proj4/Makefile index 7fffb35797..83a6a76bee 100644 --- a/packages/proj4/Makefile +++ b/packages/proj4/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/ptc/Makefile b/packages/ptc/Makefile index 8caf62f1f0..a14aa29129 100644 --- a/packages/ptc/Makefile +++ b/packages/ptc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/pthreads/Makefile b/packages/pthreads/Makefile index 98b3e78881..c30e65f9e7 100644 --- a/packages/pthreads/Makefile +++ b/packages/pthreads/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/pxlib/Makefile b/packages/pxlib/Makefile index 529046a10b..30c54edf31 100644 --- a/packages/pxlib/Makefile +++ b/packages/pxlib/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/qlunits/Makefile b/packages/qlunits/Makefile index 00e2cb5523..47f328ea0a 100644 --- a/packages/qlunits/Makefile +++ b/packages/qlunits/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/regexpr/Makefile b/packages/regexpr/Makefile index 5d69bac477..15c0980925 100644 --- a/packages/regexpr/Makefile +++ b/packages/regexpr/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/rexx/Makefile b/packages/rexx/Makefile index c7b8917c4c..c685c72dbb 100644 --- a/packages/rexx/Makefile +++ b/packages/rexx/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/rtl-console/Makefile b/packages/rtl-console/Makefile index ceffdddd90..39821b111b 100644 --- a/packages/rtl-console/Makefile +++ b/packages/rtl-console/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/rtl-extra/Makefile b/packages/rtl-extra/Makefile index 519381520d..e9ab85c5c1 100644 --- a/packages/rtl-extra/Makefile +++ b/packages/rtl-extra/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/rtl-generics/Makefile b/packages/rtl-generics/Makefile index 06d10292e0..4024a04084 100644 --- a/packages/rtl-generics/Makefile +++ b/packages/rtl-generics/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/rtl-objpas/Makefile b/packages/rtl-objpas/Makefile index faf853cb61..f9655ca833 100644 --- a/packages/rtl-objpas/Makefile +++ b/packages/rtl-objpas/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/rtl-unicode/Makefile b/packages/rtl-unicode/Makefile index ff230efc86..678072d180 100644 --- a/packages/rtl-unicode/Makefile +++ b/packages/rtl-unicode/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/sdl/Makefile b/packages/sdl/Makefile index 542e0649a7..3cc793c3b0 100644 --- a/packages/sdl/Makefile +++ b/packages/sdl/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/sndfile/Makefile b/packages/sndfile/Makefile index fa55ba09e8..0ad789233e 100644 --- a/packages/sndfile/Makefile +++ b/packages/sndfile/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/sqlite/Makefile b/packages/sqlite/Makefile index f3f02d9608..bfb0cffa3b 100644 --- a/packages/sqlite/Makefile +++ b/packages/sqlite/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/svgalib/Makefile b/packages/svgalib/Makefile index 7d2cd64fc6..5b665d26db 100644 --- a/packages/svgalib/Makefile +++ b/packages/svgalib/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/symbolic/Makefile b/packages/symbolic/Makefile index 93ac65a098..5bba2ee9e4 100644 --- a/packages/symbolic/Makefile +++ b/packages/symbolic/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/syslog/Makefile b/packages/syslog/Makefile index c887fa952e..77305d598a 100644 --- a/packages/syslog/Makefile +++ b/packages/syslog/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/tcl/Makefile b/packages/tcl/Makefile index 2a626330f4..6bb1828f85 100644 --- a/packages/tcl/Makefile +++ b/packages/tcl/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/tosunits/Makefile b/packages/tosunits/Makefile index 873bbe87d1..122b1ec641 100644 --- a/packages/tosunits/Makefile +++ b/packages/tosunits/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/tplylib/Makefile b/packages/tplylib/Makefile index c88cbf36e2..245d96811f 100644 --- a/packages/tplylib/Makefile +++ b/packages/tplylib/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/univint/Makefile b/packages/univint/Makefile index 6253b09e80..33687d070a 100644 --- a/packages/univint/Makefile +++ b/packages/univint/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/unixutil/Makefile b/packages/unixutil/Makefile index b7c9f8e11e..bfb41259aa 100644 --- a/packages/unixutil/Makefile +++ b/packages/unixutil/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/unzip/Makefile b/packages/unzip/Makefile index 9915da9bd7..67422aae5a 100644 --- a/packages/unzip/Makefile +++ b/packages/unzip/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/users/Makefile b/packages/users/Makefile index 639d618c70..3f4f99119c 100644 --- a/packages/users/Makefile +++ b/packages/users/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/utmp/Makefile b/packages/utmp/Makefile index ef35dc8077..9e1f07d1ef 100644 --- a/packages/utmp/Makefile +++ b/packages/utmp/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/uuid/Makefile b/packages/uuid/Makefile index da05e81850..1455d3663a 100644 --- a/packages/uuid/Makefile +++ b/packages/uuid/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/vcl-compat/Makefile b/packages/vcl-compat/Makefile index afd4cc18a8..ffa161dc9c 100644 --- a/packages/vcl-compat/Makefile +++ b/packages/vcl-compat/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/webidl/Makefile b/packages/webidl/Makefile index 284ee63831..48a5570a44 100644 --- a/packages/webidl/Makefile +++ b/packages/webidl/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/winceunits/Makefile b/packages/winceunits/Makefile index 2d915424bd..9af27b9d80 100644 --- a/packages/winceunits/Makefile +++ b/packages/winceunits/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/winunits-base/Makefile b/packages/winunits-base/Makefile index 2e405ad16f..19540f282c 100644 --- a/packages/winunits-base/Makefile +++ b/packages/winunits-base/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/winunits-jedi/Makefile b/packages/winunits-jedi/Makefile index ebc8b1f12a..df8983a580 100644 --- a/packages/winunits-jedi/Makefile +++ b/packages/winunits-jedi/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/x11/Makefile b/packages/x11/Makefile index c959b70ebc..8419571124 100644 --- a/packages/x11/Makefile +++ b/packages/x11/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/xforms/Makefile b/packages/xforms/Makefile index 3a1250b722..68908ddfdc 100644 --- a/packages/xforms/Makefile +++ b/packages/xforms/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/zlib/Makefile b/packages/zlib/Makefile index 151eaa9781..ad9ff49045 100644 --- a/packages/zlib/Makefile +++ b/packages/zlib/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/packages/zorba/Makefile b/packages/zorba/Makefile index a66805a12e..7c08029f2b 100644 --- a/packages/zorba/Makefile +++ b/packages/zorba/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/Makefile b/rtl/Makefile index f47827dde3..a47a10caa4 100644 --- a/rtl/Makefile +++ b/rtl/Makefile @@ -906,10 +906,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/aix/Makefile b/rtl/aix/Makefile index f8a7ea6100..ee3fa9992e 100644 --- a/rtl/aix/Makefile +++ b/rtl/aix/Makefile @@ -2185,10 +2185,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile index 945b8000fc..08c1b606de 100644 --- a/rtl/amiga/Makefile +++ b/rtl/amiga/Makefile @@ -2496,10 +2496,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/android/Makefile b/rtl/android/Makefile index 2e8705bbce..339188811c 100644 --- a/rtl/android/Makefile +++ b/rtl/android/Makefile @@ -2869,7 +2869,7 @@ endif ifeq ($(FULL_TARGET),z80-amstradcpc) override COMPILER_TARGETDIR+=. endif -override SHARED_LIBUNITS=$(SYSTEMUNIT) objpas strings dos unix baseunix unixtype unixutil sysutils typinfo math $(CPU_UNITS) getopts errors sockets sortbase classes fgl sysconst rtlconsts +override SHARED_LIBUNITS=$(SYSTEMUNIT) objpas strings dos unix baseunix unixtype unixutil sysutils typinfo math $(CPU_UNITS) getopts errors sockets sortbase classes fgl sysconst rtlconsts ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -3119,10 +3119,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/android/jvm/Makefile b/rtl/android/jvm/Makefile index 873995ca31..5cad704cab 100644 --- a/rtl/android/jvm/Makefile +++ b/rtl/android/jvm/Makefile @@ -1547,10 +1547,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/aros/Makefile b/rtl/aros/Makefile index ad4d976cb5..c6260469b5 100644 --- a/rtl/aros/Makefile +++ b/rtl/aros/Makefile @@ -2490,10 +2490,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/atari/Makefile b/rtl/atari/Makefile index 92949b356e..d6b171fef5 100644 --- a/rtl/atari/Makefile +++ b/rtl/atari/Makefile @@ -2484,10 +2484,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile index 02e2c894d3..701ea4cdcb 100644 --- a/rtl/beos/Makefile +++ b/rtl/beos/Makefile @@ -2796,10 +2796,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile index d6d9e3e3ce..5b19ff1a2e 100644 --- a/rtl/darwin/Makefile +++ b/rtl/darwin/Makefile @@ -2189,10 +2189,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/dragonfly/Makefile b/rtl/dragonfly/Makefile index 125ce08d30..7604323c1c 100644 --- a/rtl/dragonfly/Makefile +++ b/rtl/dragonfly/Makefile @@ -2496,10 +2496,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile index 9ff63f8104..cc231e408e 100644 --- a/rtl/embedded/Makefile +++ b/rtl/embedded/Makefile @@ -2029,10 +2029,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile index b988a69294..a2ddd1454d 100644 --- a/rtl/emx/Makefile +++ b/rtl/emx/Makefile @@ -2488,10 +2488,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile index 0fdb7b2f8e..e2ce7f34fa 100644 --- a/rtl/freebsd/Makefile +++ b/rtl/freebsd/Makefile @@ -2501,10 +2501,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/freertos/Makefile b/rtl/freertos/Makefile index a8c5f04c62..7e6c5348a1 100644 --- a/rtl/freertos/Makefile +++ b/rtl/freertos/Makefile @@ -2340,10 +2340,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile index 185f202c91..ecc4701586 100644 --- a/rtl/gba/Makefile +++ b/rtl/gba/Makefile @@ -2173,10 +2173,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index 67b9d8197b..bb20106577 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -2489,10 +2489,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/haiku/Makefile b/rtl/haiku/Makefile index 3f41d68108..30c75c22ca 100644 --- a/rtl/haiku/Makefile +++ b/rtl/haiku/Makefile @@ -2804,10 +2804,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/java/Makefile b/rtl/java/Makefile index 9cec6bc024..4ed44570b5 100644 --- a/rtl/java/Makefile +++ b/rtl/java/Makefile @@ -1551,10 +1551,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index 10b620dd50..62da828ee1 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -3153,10 +3153,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile index 28dc5bd120..7022cd8a4a 100644 --- a/rtl/macos/Makefile +++ b/rtl/macos/Makefile @@ -2176,10 +2176,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile index a011960876..4fa2ff6c26 100644 --- a/rtl/morphos/Makefile +++ b/rtl/morphos/Makefile @@ -2174,10 +2174,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile index b392ea6f80..e95822dc1b 100644 --- a/rtl/msdos/Makefile +++ b/rtl/msdos/Makefile @@ -2174,10 +2174,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/msxdos/Makefile b/rtl/msxdos/Makefile index 5ac12e71bf..4694017506 100644 --- a/rtl/msxdos/Makefile +++ b/rtl/msxdos/Makefile @@ -1862,10 +1862,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile index d4537d453d..eab03e13bc 100644 --- a/rtl/nativent/Makefile +++ b/rtl/nativent/Makefile @@ -2182,10 +2182,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile index b2cf42f300..b1776bb24e 100644 --- a/rtl/nds/Makefile +++ b/rtl/nds/Makefile @@ -2173,10 +2173,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile index cae83b638b..2cc7f1b2dd 100644 --- a/rtl/netbsd/Makefile +++ b/rtl/netbsd/Makefile @@ -2498,10 +2498,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile index df825cd2c9..40a018bba4 100644 --- a/rtl/netware/Makefile +++ b/rtl/netware/Makefile @@ -2492,10 +2492,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile index 4242b9f3fe..2444f1381a 100644 --- a/rtl/netwlibc/Makefile +++ b/rtl/netwlibc/Makefile @@ -2485,10 +2485,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile index d799faf895..ed3447d143 100644 --- a/rtl/openbsd/Makefile +++ b/rtl/openbsd/Makefile @@ -2503,10 +2503,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index d16e0b41d2..62dca5a122 100644 --- a/rtl/os2/Makefile +++ b/rtl/os2/Makefile @@ -2488,10 +2488,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile index 9a896c3f2e..6b9960dc83 100644 --- a/rtl/palmos/Makefile +++ b/rtl/palmos/Makefile @@ -2172,10 +2172,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/sinclairql/Makefile b/rtl/sinclairql/Makefile index d46fb9d0d5..aeca4a464a 100644 --- a/rtl/sinclairql/Makefile +++ b/rtl/sinclairql/Makefile @@ -2484,10 +2484,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile index aefb95cd87..c053305b43 100644 --- a/rtl/solaris/Makefile +++ b/rtl/solaris/Makefile @@ -2185,10 +2185,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile index e57254318a..e0229f3c19 100644 --- a/rtl/symbian/Makefile +++ b/rtl/symbian/Makefile @@ -1858,10 +1858,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile index d02418a771..b71d0b7378 100644 --- a/rtl/watcom/Makefile +++ b/rtl/watcom/Makefile @@ -2487,10 +2487,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/wii/Makefile b/rtl/wii/Makefile index 03850c71c1..f23c20220f 100644 --- a/rtl/wii/Makefile +++ b/rtl/wii/Makefile @@ -1861,10 +1861,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile index 04aeb9699a..a668af8b54 100644 --- a/rtl/win16/Makefile +++ b/rtl/win16/Makefile @@ -1862,10 +1862,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 2b9a101443..84fbded21d 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -2485,10 +2485,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile index cc96191dbe..ad664bc5ba 100644 --- a/rtl/win64/Makefile +++ b/rtl/win64/Makefile @@ -2489,10 +2489,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile index f16c228b6d..3fddbf31fa 100644 --- a/rtl/wince/Makefile +++ b/rtl/wince/Makefile @@ -1864,10 +1864,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/rtl/zxspectrum/Makefile b/rtl/zxspectrum/Makefile index d5b4d5c185..5b6c5335d6 100644 --- a/rtl/zxspectrum/Makefile +++ b/rtl/zxspectrum/Makefile @@ -1550,10 +1550,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/tests/Makefile b/tests/Makefile index e908b07b74..c067d9295c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -909,10 +909,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/tests/tstunits/Makefile b/tests/tstunits/Makefile index f4c80ee24f..03456495e4 100644 --- a/tests/tstunits/Makefile +++ b/tests/tstunits/Makefile @@ -1221,10 +1221,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/tests/utils/Makefile b/tests/utils/Makefile index 45289e6694..981641d00d 100644 --- a/tests/utils/Makefile +++ b/tests/utils/Makefile @@ -1226,10 +1226,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/tests/utils/testsuite/Makefile b/tests/utils/testsuite/Makefile index 8eff8f9d64..b8ddc02a18 100644 --- a/tests/utils/testsuite/Makefile +++ b/tests/utils/testsuite/Makefile @@ -1222,10 +1222,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/Makefile b/utils/Makefile index e70735991c..36a6667d94 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -616,10 +616,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/debugsvr/Makefile b/utils/debugsvr/Makefile index a676d1570e..84e8e4f73d 100644 --- a/utils/debugsvr/Makefile +++ b/utils/debugsvr/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/dxegen/Makefile b/utils/dxegen/Makefile index 216eee6a9b..6a674d561d 100644 --- a/utils/dxegen/Makefile +++ b/utils/dxegen/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/fpcmkcfg/Makefile b/utils/fpcmkcfg/Makefile index e834ae7421..e01647225e 100644 --- a/utils/fpcmkcfg/Makefile +++ b/utils/fpcmkcfg/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/fpcres/Makefile b/utils/fpcres/Makefile index 5530c017a6..11f63b787f 100644 --- a/utils/fpcres/Makefile +++ b/utils/fpcres/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/fpcreslipo/Makefile b/utils/fpcreslipo/Makefile index 114ae0aba9..cf3425f3ae 100644 --- a/utils/fpcreslipo/Makefile +++ b/utils/fpcreslipo/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/fpdoc/Makefile b/utils/fpdoc/Makefile index 8291af3ce2..17a08d83dc 100644 --- a/utils/fpdoc/Makefile +++ b/utils/fpdoc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/fpmc/Makefile b/utils/fpmc/Makefile index 5bd8c77b49..0bf5f046c4 100644 --- a/utils/fpmc/Makefile +++ b/utils/fpmc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/fppkg/Makefile b/utils/fppkg/Makefile index 3f22794b7f..ac66d9b4df 100644 --- a/utils/fppkg/Makefile +++ b/utils/fppkg/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/fprcp/Makefile b/utils/fprcp/Makefile index ba6a1ceb69..bb888cbe20 100644 --- a/utils/fprcp/Makefile +++ b/utils/fprcp/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile index 3ac9ed8947..87eda194be 100644 --- a/utils/h2pas/Makefile +++ b/utils/h2pas/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/ihxutil/Makefile b/utils/ihxutil/Makefile index b07e87ee2a..b78026348b 100644 --- a/utils/ihxutil/Makefile +++ b/utils/ihxutil/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/importtl/Makefile b/utils/importtl/Makefile index a5702771bd..ada1f49cda 100644 --- a/utils/importtl/Makefile +++ b/utils/importtl/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/instantfpc/Makefile b/utils/instantfpc/Makefile index 432c10e3f2..22c76cab12 100644 --- a/utils/instantfpc/Makefile +++ b/utils/instantfpc/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/json2pas/Makefile b/utils/json2pas/Makefile index e04c10a29a..07d92d5f3d 100644 --- a/utils/json2pas/Makefile +++ b/utils/json2pas/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/mksymbian/Makefile b/utils/mksymbian/Makefile index b5516c6c39..2ef4835364 100644 --- a/utils/mksymbian/Makefile +++ b/utils/mksymbian/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/pas2fpm/Makefile b/utils/pas2fpm/Makefile index 1aec985e4b..d74bdb7c6e 100644 --- a/utils/pas2fpm/Makefile +++ b/utils/pas2fpm/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/pas2jni/Makefile b/utils/pas2jni/Makefile index fb37c16d80..661d31966d 100644 --- a/utils/pas2jni/Makefile +++ b/utils/pas2jni/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/pas2js/Makefile b/utils/pas2js/Makefile index 4ec370b12d..e0fcedf8c8 100644 --- a/utils/pas2js/Makefile +++ b/utils/pas2js/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/pas2ut/Makefile b/utils/pas2ut/Makefile index 41d4e7d16f..fd638d51e8 100644 --- a/utils/pas2ut/Makefile +++ b/utils/pas2ut/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/rmwait/Makefile b/utils/rmwait/Makefile index 94c701c640..efe5fc65d3 100644 --- a/utils/rmwait/Makefile +++ b/utils/rmwait/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/tply/Makefile b/utils/tply/Makefile index 343058831b..fe929e9320 100644 --- a/utils/tply/Makefile +++ b/utils/tply/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif diff --git a/utils/unicode/Makefile b/utils/unicode/Makefile index da579f6b20..bbc5ca917d 100644 --- a/utils/unicode/Makefile +++ b/utils/unicode/Makefile @@ -607,10 +607,18 @@ else ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) FPCMAKE_CROSSGCCOPT=-mabi=32 else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),) +FPCMAKE_CROSSGCCOPT=-mabi=lp64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),) +FPCMAKE_CROSSGCCOPT=-mabi=ilp32 +else FPCMAKE_CROSSGCCOPT=-m32 endif endif endif +endif +endif FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif |