diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-30 13:35:39 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-30 13:35:39 +0200 |
| commit | 2124e2fae72c4ac4694f5d4d17e62a6fa1fe8654 (patch) | |
| tree | c982e3870520d69a1ba5965eb6570454e5082923 | |
| parent | b7034724abb859db36a3fa4312e4827141114f45 (diff) | |
| parent | 460562852eb4b1e14d2eeb81d2b96ea5de6ef683 (diff) | |
| download | nx-libs-2124e2fae72c4ac4694f5d4d17e62a6fa1fe8654.tar.gz nx-libs-2124e2fae72c4ac4694f5d4d17e62a6fa1fe8654.tar.bz2 nx-libs-2124e2fae72c4ac4694f5d4d17e62a6fa1fe8654.zip | |
Merge branch 'AlexGhiti-int/alex/riscv64_support' into 3.6.x
Attributes GH PR #1023: https://github.com/ArcticaProject/nx-libs/pull/1023
| -rw-r--r-- | nx-X11/config/cf/Imake.cf | 5 | ||||
| -rw-r--r-- | nx-X11/config/cf/Imake.tmpl | 2 | ||||
| -rw-r--r-- | nx-X11/config/cf/linux.cf | 9 |
3 files changed, 16 insertions, 0 deletions
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 |