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 /tests/utils | |
| 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
Diffstat (limited to 'tests/utils')
| -rw-r--r-- | tests/utils/Makefile | 8 | ||||
| -rw-r--r-- | tests/utils/testsuite/Makefile | 8 |
2 files changed, 16 insertions, 0 deletions
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 |