From e7768064128ff589af356b39ae3b987add3e2e2c Mon Sep 17 00:00:00 2001
From: pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2>
Date: Fri, 12 Mar 2021 13:23:41 +0000
Subject:  Update Makefile's after commits 48929/48930

git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@48940 3ad0048d-3df7-0310-abae-a5850022a9f2
---
 Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 702277ebfe..eec3486abd 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-- 
cgit v1.2.1


From f4b984d2356cc47030adc7378858c428a399a589 Mon Sep 17 00:00:00 2001
From: florian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>
Date: Sat, 13 Mar 2021 16:33:31 +0000
Subject:   * riscv64-linux: generate PIC for all units as it is required for
 shared libraries

git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@48948 3ad0048d-3df7-0310-abae-a5850022a9f2
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index eec3486abd..da2e0ee429 100644
--- a/Makefile
+++ b/Makefile
@@ -1692,7 +1692,7 @@ ifdef CREATESHARED
 override FPCOPT+=-Cg
 endif
 ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),)
-ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)
+ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel riscv64),)
 override FPCOPT+=-Cg
 endif
 endif
-- 
cgit v1.2.1