From 1839dd642c8acd2958b0c405d4c7da197087c113 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 7 May 2017 19:47:27 +0200 Subject: Fix FTBFS on mips64el architecture due to missing definition of the _XSERVER64 macro. --- nx-X11/config/cf/Imake.cf | 3 +++ nx-X11/config/cf/linux.cf | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) 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..d860f897e 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 -- cgit v1.2.3 From c22c3f729581d076f184d63371b10d53078e68cf Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 27 Jun 2017 19:59:36 +0200 Subject: nx-X11/config/cf/linux.cf: Drop AsOutputArchSize macro from Sparc(64)Architecture ifdef-block. It does not seem to be used anywhere else. --- nx-X11/config/cf/linux.cf | 2 -- 1 file changed, 2 deletions(-) diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index d860f897e..b78281cb5 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -790,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 -- cgit v1.2.3