diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 8 | ||||
| -rw-r--r-- | tests/test/cg/obj/linux/riscv64/cpptcl1.o | bin | 5960 -> 6064 bytes | |||
| -rw-r--r-- | tests/test/cg/obj/linux/riscv64/cpptcl2.o | bin | 1416 -> 1520 bytes | |||
| -rw-r--r-- | tests/test/cg/obj/linux/riscv64/ctest.o | bin | 11064 -> 11152 bytes | |||
| -rw-r--r-- | tests/test/cg/obj/linux/riscv64/tcext3.o | bin | 4008 -> 4232 bytes | |||
| -rw-r--r-- | tests/test/cg/obj/linux/riscv64/tcext4.o | bin | 2176 -> 2288 bytes | |||
| -rw-r--r-- | tests/test/cg/obj/linux/riscv64/tcext5.o | bin | 8024 -> 8264 bytes | |||
| -rw-r--r-- | tests/test/cg/obj/linux/riscv64/tcext6.o | bin | 9912 -> 10016 bytes | |||
| -rw-r--r-- | tests/tstunits/Makefile | 8 | ||||
| -rw-r--r-- | tests/utils/Makefile | 8 | ||||
| -rw-r--r-- | tests/utils/testsuite/Makefile | 8 | ||||
| -rw-r--r-- | tests/webtbs/tw2242.pp | 4 |
12 files changed, 34 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index 5ba9988b9c..a0debfe836 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -912,10 +912,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/test/cg/obj/linux/riscv64/cpptcl1.o b/tests/test/cg/obj/linux/riscv64/cpptcl1.o Binary files differindex ed87ce332c..516e62dce3 100644 --- a/tests/test/cg/obj/linux/riscv64/cpptcl1.o +++ b/tests/test/cg/obj/linux/riscv64/cpptcl1.o diff --git a/tests/test/cg/obj/linux/riscv64/cpptcl2.o b/tests/test/cg/obj/linux/riscv64/cpptcl2.o Binary files differindex a68a01df73..90082aff94 100644 --- a/tests/test/cg/obj/linux/riscv64/cpptcl2.o +++ b/tests/test/cg/obj/linux/riscv64/cpptcl2.o diff --git a/tests/test/cg/obj/linux/riscv64/ctest.o b/tests/test/cg/obj/linux/riscv64/ctest.o Binary files differindex eb33cb3d97..28d04474ff 100644 --- a/tests/test/cg/obj/linux/riscv64/ctest.o +++ b/tests/test/cg/obj/linux/riscv64/ctest.o diff --git a/tests/test/cg/obj/linux/riscv64/tcext3.o b/tests/test/cg/obj/linux/riscv64/tcext3.o Binary files differindex 65ac546a49..65a87df479 100644 --- a/tests/test/cg/obj/linux/riscv64/tcext3.o +++ b/tests/test/cg/obj/linux/riscv64/tcext3.o diff --git a/tests/test/cg/obj/linux/riscv64/tcext4.o b/tests/test/cg/obj/linux/riscv64/tcext4.o Binary files differindex d88800bc40..9b60368927 100644 --- a/tests/test/cg/obj/linux/riscv64/tcext4.o +++ b/tests/test/cg/obj/linux/riscv64/tcext4.o diff --git a/tests/test/cg/obj/linux/riscv64/tcext5.o b/tests/test/cg/obj/linux/riscv64/tcext5.o Binary files differindex 7331c3788d..af318ca626 100644 --- a/tests/test/cg/obj/linux/riscv64/tcext5.o +++ b/tests/test/cg/obj/linux/riscv64/tcext5.o diff --git a/tests/test/cg/obj/linux/riscv64/tcext6.o b/tests/test/cg/obj/linux/riscv64/tcext6.o Binary files differindex 580f242dda..a3a365394f 100644 --- a/tests/test/cg/obj/linux/riscv64/tcext6.o +++ b/tests/test/cg/obj/linux/riscv64/tcext6.o diff --git a/tests/tstunits/Makefile b/tests/tstunits/Makefile index d1c41669c9..93523e6836 100644 --- a/tests/tstunits/Makefile +++ b/tests/tstunits/Makefile @@ -1227,10 +1227,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 c1c6f12edb..fdf149bee4 100644 --- a/tests/utils/Makefile +++ b/tests/utils/Makefile @@ -1232,10 +1232,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 23c67efe51..75924e7d76 100644 --- a/tests/utils/testsuite/Makefile +++ b/tests/utils/testsuite/Makefile @@ -1228,10 +1228,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/webtbs/tw2242.pp b/tests/webtbs/tw2242.pp index e99f415321..7ea094d6f6 100644 --- a/tests/webtbs/tw2242.pp +++ b/tests/webtbs/tw2242.pp @@ -8124,6 +8124,7 @@ s += chr(68); s += chr(69); s += chr(70); s += chr(71); +{$if not defined(cpuarm) and not defined(cpusparc) and not defined(cpuaarch64) and not defined(cpuriscv)} s += chr(72); s += chr(73); s += chr(74); @@ -8193,7 +8194,6 @@ s += chr(85); s += chr(86); s += chr(87); s += chr(88); -{$if not defined(cpuarm) and not defined(cpusparc) and not defined(cpuaarch64)} s += chr(89); s += chr(90); s += chr(65); @@ -13077,7 +13077,7 @@ s += chr(80); s += chr(81); s += chr(82); s += chr(83); -{$endif cpuarm or cpusparc} +{$endif not defined(cpuarm) and not defined(cpusparc) and not defined(cpuaarch64) and not defined(cpuriscv)} {$endif not fpc_pic} writeln(s) END. |