Merge pull request #113 from andreas-schwab/master

Add support for riscv64 architecture

4 files changed, 32 insertions, 4 deletions

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index e4bb28063..d4d1cca63 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1445,6 +1445,12 @@
       <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
     </target>
 
+    <target name="c.configure.linux.riscv64" if="isLinuxRiscV64">
+      <echo message="Linux.RISCV64" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
+    </target>
+
     <target name="c.configure.linux.s390" if="isLinuxs390">
       <echo message="Linux.S390" />
       <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
@@ -1457,7 +1463,7 @@
       <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
     </target>
 
-    <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+    <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.riscv64,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
 
     <target name="c.configure.android" if="isAndroid">
       <echo message="Android" />
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 594903155..edeb268cd 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -728,6 +728,12 @@
       <property name="linker.cfg.id.drm"                    value="linker.cfg.linux.nativewindow.drm" />
     </target>
 
+    <target name="c.configure.linux.riscv64" if="isLinuxRiscV64">
+      <echo message="Linux.RISCV64" />
+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+    </target>
+
     <target name="c.configure.linux.s390" if="isLinuxs390">
       <echo message="Linux.S390" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
@@ -742,7 +748,7 @@
       <property name="linker.cfg.id.drm"                    value="linker.cfg.linux.nativewindow.drm" />
     </target>
 
-    <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+    <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.riscv64,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
 
     <target name="c.configure.android" if="isAndroid">
       <echo message="Android" />
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 15db39653..3927c730b 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -783,6 +783,16 @@
       <property name="linker.cfg.id.drm"                    value="linker.cfg.linux.newt.drm"/>
     </target>
 
+    <target name="c.configure.linux.riscv64" if="isLinuxRiscV64">
+      <echo message="Linux.riscv64" />
+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.newt.x11"
+                                                            else="linker.cfg.linux">
+          <isset property="isX11" />
+      </condition>
+      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+    </target>
+
     <target name="c.configure.linux.s390" if="isLinuxs390">
       <echo message="Linux.S390" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
@@ -810,7 +820,7 @@
       <property name="linker.cfg.id.drm"                    value="linker.cfg.linux.newt.drm"/>
     </target>
 
-    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
+    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.riscv64,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
 
     <target name="c.configure.android" if="isAndroid">
       <echo message="Android" />
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml
index f731bab21..825b2c113 100644
--- a/make/build-oculusvr.xml
+++ b/make/build-oculusvr.xml
@@ -336,6 +336,12 @@
       <property name="linker.cfg.id.os"                    value="linker.cfg.linux" />
     </target>
 
+    <target name="c.configure.linux.riscv64" if="isLinuxRiscV64">
+      <echo message="Linux.RISCV64" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux" />
+    </target>
+
     <target name="c.configure.linux.s390" if="isLinuxs390">
       <echo message="Linux.S390" />
       <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
@@ -348,7 +354,7 @@
       <property name="linker.cfg.id.os"                    value="linker.cfg.linux" />
     </target>
 
-    <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+    <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.riscv64,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
 
     <target name="c.configure.android" if="isAndroid">
       <echo message="Android" />