aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-06-28 19:20:36 +0200
committerMihai Moldovan <ionic@ionic.de>2017-06-28 19:20:36 +0200
commit78d41614e4bfb022a7291167f893249f99acd006 (patch)
treed631658e4e3a6b73e796a74572fefc5a303a2a33 /nx-X11
parentcde05c090e06fd686a11b29eae80a62dd7e59466 (diff)
parentc22c3f729581d076f184d63371b10d53078e68cf (diff)
downloadnx-libs-78d41614e4bfb022a7291167f893249f99acd006.tar.gz
nx-libs-78d41614e4bfb022a7291167f893249f99acd006.tar.bz2
nx-libs-78d41614e4bfb022a7291167f893249f99acd006.zip
Merge branch 'sunweaver-pr/fix-ftbfs-on-mips64el' into 3.6.x
Attributes GH PR #454: https://github.com/ArcticaProject/nx-libs/pull/454
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/config/cf/Imake.cf3
-rw-r--r--nx-X11/config/cf/linux.cf17
2 files changed, 17 insertions, 3 deletions
diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
index 32f3e321b..47518164b 100644
--- a/nx-X11/config/cf/Imake.cf
+++ b/nx-X11/config/cf/Imake.cf
@@ -883,6 +883,9 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# undef __mips__
# if defined(MIPSEL) || defined(_MIPSEL)
# define MipselArchitecture
+# if (_MIPS_SIM == _ABI64)
+# define Mips64elArchitecture
+# endif
# endif
# undef MIPSEL
# undef _MIPSEL
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index cd34555e6..b78281cb5 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -723,7 +723,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* Mc68020Architecture */
-#ifdef MipsArchitecture
+#if defined(MipsArchitecture) && !defined(MipselArchitecture)
# ifndef OptimizedCDebugFlags
# define OptimizedCDebugFlags DefaultGcc2MipsOpt
# endif
@@ -732,6 +732,19 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif
+#ifdef MipselArchitecture
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags DefaultGcc2MipsOpt
+# endif
+# define LinuxMachineDefines -D__MIPSEL__
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+# ifdef Mips64elArchitecture
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+# else
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+# endif
+#endif
+
#ifdef Ppc64Architecture
# define DefaultCCOptions -mminimal-toc
# ifndef OptimizedCDebugFlags
@@ -777,10 +790,8 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# define AsVISOption -Av9a
# ifdef Sparc64Architecture
-# define AsOutputArchSize 64
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
# else
-# define AsOutputArchSize 32
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
# endif
#endif