1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
|
From 460562852eb4b1e14d2eeb81d2b96ea5de6ef683 Mon Sep 17 00:00:00 2001
From: Alexandre Ghiti <alexandre.ghiti@canonical.com>
Date: Fri, 10 Sep 2021 08:51:53 +0200
Subject: [PATCH] nx-X11: Add support for riscv64 architecture
Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
nx-X11/config/cf/Imake.cf | 5 +++++
nx-X11/config/cf/Imake.tmpl | 2 ++
nx-X11/config/cf/linux.cf | 9 +++++++++
3 files changed, 16 insertions(+)
diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
index 9d683b858..612bc4e38 100644
--- a/nx-X11/config/cf/Imake.cf
+++ b/nx-X11/config/cf/Imake.cf
@@ -878,6 +878,11 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# undef __powerpc64__
# undef tmp_set_big_endian
# endif
+# ifdef __riscv
+# if __riscv_xlen == 64
+# define Riscv64Architecture
+# endif
+# endif
# ifdef sparc
# define SparcArchitecture
# undef sparc
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index de1fca937..266be8c5a 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -509,6 +509,8 @@ XCOMM the platform-specific parameters - edit site.def to change
#define ByteOrder X_BIG_ENDIAN
#elif defined(Ppc64LeArchitecture)
#define ByteOrder X_LITTLE_ENDIAN
+#elif defined(Riscv64Architecture)
+#define ByteOrder X_LITTLE_ENDIAN
#elif defined(HPArchitecture)
#define ByteOrder X_BIG_ENDIAN
#elif defined(SuperHArchitecture)
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index c3e9eaafd..6851be558 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -783,6 +783,15 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* PpcArchitecture */
+#ifdef Riscv64Architecture
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags -O3
+# endif
+# define LinuxMachineDefines -D__riscv64__
+# define ServerOSDefines XFree86ServerOSDefines
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+#endif /* Riscv64Achitecture */
+
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
# define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs
--
2.30.2
|