From d12f9524138899e43deb1a70fb37c97559d8f64e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 18:41:52 +0100 Subject: drop platform support: unifdef __UNIXOS2__. Fixes ArcticaProject/nx-libs#271. --- nx-X11/config/cf/Imake.cf | 7 ------- nx-X11/config/cf/Imake.tmpl | 2 +- nx-X11/config/cf/xorg.cf | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) (limited to 'nx-X11/config/cf') diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 8decfdc3c..54c7d0aee 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -1117,13 +1117,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 #endif #endif -#ifdef emxos2 -#define MacroIncludeFile -#define MacroFile os2.cf -#define OS2Architecture -#define i386Architecture -#endif /* emxos2 */ - #if defined(__QNX__) && !defined(__QNXNTO__) #define MacroIncludeFile #define MacroFile QNX4.cf diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 5c8effee5..1488c9a32 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -466,7 +466,7 @@ XCOMM the platform-specific parameters - edit site.def to change #define HasBasename YES #endif #ifndef HasGetopt -# if !defined(Win32Architecture) && !defined(OS2Architecture) +# if !defined(Win32Architecture) # define HasGetopt YES # else # define HasGetopt NO diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index fb0dbfd08..63ea21264 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -513,7 +513,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # if SystemV || SystemV4 || \ (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ - defined(OS2Architecture) || defined(GNUMachArchitecture) || \ + defined(GNUMachArchitecture) || \ (defined(KFreeBSDArchitecture) && defined(i386Architecture)) # define BuildScanpci YES # else -- cgit v1.2.3 From ace255eda62081526b721e82ed0339c566975ad3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 19:20:13 +0100 Subject: drop platform support: unifdef Lynx. Fixes ArcticaProject/nx-libs#272. --- nx-X11/config/cf/Imake.cf | 28 ---------------------------- nx-X11/config/cf/xorg.cf | 2 +- 2 files changed, 1 insertion(+), 29 deletions(-) (limited to 'nx-X11/config/cf') diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 54c7d0aee..69c3a0670 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -1006,34 +1006,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 # endif #endif /* linux || __GLIBC__ */ -#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) -# define MacroIncludeFile -# define MacroFile lynx.cf -# define LynxOSArchitecture -# undef __Lynx__ -# undef Lynx -# undef lynx -# if defined(i386) || defined(__i386__) || defined(__x86__) -# define i386Architecture -# undef i386 -# undef __i386__ -# undef __x86__ -# endif -# ifdef __powerpc__ -# define PpcArchitecture -# undef __powerpc__ -# endif -# if defined(sparc) || defined(__sparc__) -# define SparcArchitecture -# undef sparc -# undef __sparc__ -# endif -/* for compatibility with 3.3.x */ -# ifdef PpcArchitecture -# define PowerPCArchitecture -# endif -#endif /* LynxOS AT/PPC/microSPARC */ - #ifdef __uxp__ # define MacroIncludeFile # define MacroFile fujitsu.cf diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 63ea21264..fbec1b0d1 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -512,7 +512,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef BuildScanpci # if SystemV || SystemV4 || \ (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ - defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ + defined(i386BsdArchitecture) || \ defined(GNUMachArchitecture) || \ (defined(KFreeBSDArchitecture) && defined(i386Architecture)) # define BuildScanpci YES -- cgit v1.2.3 From 184c5d778210dea8eab045a5f7ecf9d4344c1c34 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 20:59:35 +0100 Subject: drop platform support: unifdef hpux and __hppa__. Fixes ArcticaProject/nx-libs#273. --- nx-X11/config/cf/Imake.cf | 19 ------------------- nx-X11/config/cf/Imake.tmpl | 2 -- nx-X11/config/cf/linux.cf | 21 --------------------- nx-X11/config/cf/xorg.cf | 2 +- 4 files changed, 1 insertion(+), 43 deletions(-) (limited to 'nx-X11/config/cf') diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 69c3a0670..98655ec56 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -184,12 +184,6 @@ # undef __vax__ # define VaxArchitecture # endif -# ifdef __hppa__ -# ifndef HPArchitecture -# define HPArchitecture -# endif -# undef __hppa__ -# endif /* __hppa__ */ #endif /* OpenBSD */ /* Systems based on kernel of OpenBSD */ @@ -374,13 +368,6 @@ # define SunArchitecture #endif /* sun */ -#ifdef hpux -# define MacroIncludeFile -# define MacroFile hp.cf -# undef hpux -# define HPArchitecture -#endif /* hpux */ - #ifdef __SCO__ # define MacroIncludeFile # define MacroFile sco5.cf @@ -947,12 +934,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 # undef MIPSEL # undef _MIPSEL # endif -# ifdef __hppa__ -# ifndef HPArchitecture -# define HPArchitecture -# endif -# undef __hppa__ -# endif /* __hppa__ */ # ifdef __sh__ # ifndef SuperHArchitecture # define SuperHArchitecture diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 1488c9a32..e8e1fb09b 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -515,8 +515,6 @@ XCOMM the platform-specific parameters - edit site.def to change #define ByteOrder X_BIG_ENDIAN #elif defined(PpcArchitecture) || defined(Ppc64Architecture) #define ByteOrder X_BIG_ENDIAN -#elif defined(HPArchitecture) -#define ByteOrder X_BIG_ENDIAN #elif defined(SuperHArchitecture) #define ByteOrder X_LITTLE_ENDIAN #elif defined(SuperHebArchitecture) diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index c6ae58474..1a3f6bc5b 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -535,13 +535,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define LdCmd CcCmd -nostdlib -Wl,"-m alpha" # define AsmDefines -DUSE_GAS -U__ELF__ # endif /* AlphaArchitecture */ -# ifdef HPArchitecture -# define CcCmd gcc -# define CplusplusCmd g++ -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -# define AsmDefines -DUSE_GAS -U__ELF__ -# endif /* HPArchitecture */ # ifdef i386Architecture # define CcCmd gcc -b i486-linuxaout # define CplusplusCmd g++ -b i486-linuxaout @@ -580,13 +573,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define AsmDefines -D__ELF__ # define CplusplusCmd c++ -b alpha-linux # endif /* AlphaArchitecture */ -# ifdef HPArchitecture -# define CcCmd gcc -# define CplusplusCmd g++ -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -# define AsmDefines -D__ELF__ -# endif /* HPArchitecture */ # ifdef i386Architecture # define CcCmd gcc -b i486-linux # define AsCmd CcCmd -c -x assembler @@ -708,13 +694,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* Arm64Achitecture */ -#ifdef HPArchitecture -# define OptimizedCDebugFlags -O2 GccAliasingArgs -# define LinuxMachineDefines -D__hppa__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#endif - #ifdef i386Architecture # ifndef OptimizedCDebugFlags # define OptimizedCDebugFlags DefaultGcc2i386Opt diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index fbec1b0d1..2b71b90ec 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -244,7 +244,7 @@ NX_VERSION_CURRENT_STRING = nxVersionString defined(Sparc64Architecture) || defined(MipsArchitecture) || \ defined(AlphaArchitecture) || defined(PpcArchitecture) || \ defined(Mc68020Architecture) || defined(Arm32Architecture) || \ - defined(HPArchitecture) || defined(SuperHArchitecture) + defined(SuperHArchitecture) # ifndef XorgServer # define XorgServer YES # endif -- cgit v1.2.3 From 4b178918ba19ebd9daa6f87fa790b6f6767b1f61 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 21:20:22 +0100 Subject: drop platform support: unifdef AIXV3, AIXV4 (and AIXrt, AIX386). Fixes ArcticaProject/nx-libs#274. --- nx-X11/config/cf/Imake.cf | 6 +----- nx-X11/config/cf/site.def | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'nx-X11/config/cf') diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 98655ec56..ed4191be6 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -529,7 +529,7 @@ # define StellarArchitecture #endif /* stellar */ -#if defined(ibm) || defined(_IBMR2) || defined(ibm032) || defined(aix) +#if defined(ibm) || defined(_IBMR2) || defined(ibm032) # define MacroIncludeFile # define MacroFile ibm.cf # ifdef ibm @@ -544,10 +544,6 @@ # undef ibm032 # define RtArchitecture # endif -# ifdef aix -# undef aix -# define AIXArchitecture -# endif # ifdef _IBMR2 # undef _IBMR2 # if (DefaultOSMajorVersion < 5) diff --git a/nx-X11/config/cf/site.def b/nx-X11/config/cf/site.def index f5e769278..da4c13793 100644 --- a/nx-X11/config/cf/site.def +++ b/nx-X11/config/cf/site.def @@ -46,7 +46,7 @@ * the two following macros need to be defined directly (where "X11" is * really whatever the TopLevelProject macro is defined to be). */ -# if defined(AIXArchitecture) || defined(SVR4Architecture) || \ +# if defined(SVR4Architecture) || \ defined(SCOArchitecture) || defined(Win32Architecture) || \ defined(UXPArchitecture) || defined(SunArchitecture) || \ defined(DynixPtxArchitecture) || defined(i386IscArchitecture) -- cgit v1.2.3 From a9c30796dce587627524ffa886eeef5e73144c46 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 21:32:46 +0100 Subject: drop platform support: unifdef __osf__. Fixes ArcticaProject/nx-libs#288. --- nx-X11/config/cf/Imake.cf | 16 ---------------- nx-X11/config/cf/Imake.tmpl | 6 +++--- 2 files changed, 3 insertions(+), 19 deletions(-) (limited to 'nx-X11/config/cf') diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index ed4191be6..5ff2ee16b 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -703,22 +703,6 @@ # define ConvexArchitecture #endif /* _convex_ */ -#ifdef __osf__ -# define MacroIncludeFile -# define MacroFile osf1.cf -# define OSF1Architecture -# undef __osf__ -# ifdef __mips__ -# undef __mips__ -# define MipsArchitecture -# define MipselArchitecture -# endif -# ifdef __alpha -# undef __alpha -# define AlphaArchitecture -# endif -#endif /* __osf__ */ - #ifdef Oki # define MacroIncludeFile # define MacroFile Oki.cf diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index e8e1fb09b..93b659a0d 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -1516,21 +1516,21 @@ TCLIBDIR = TclLibDir #define LibManSuffix 3 /* use just one tab or cpp will die */ #endif #ifndef FileManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) +#if SystemV || SystemV4 #define FileManSuffix 4 /* use just one tab or cpp will die */ #else #define FileManSuffix 5 /* use just one tab or cpp will die */ #endif #endif #ifndef MiscManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) +#if SystemV || SystemV4 #define MiscManSuffix 5 /* use just one tab or cpp will die */ #else #define MiscManSuffix 7 /* use just one tab or cpp will die */ #endif #endif #ifndef DriverManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) +#if SystemV || SystemV4 #define DriverManSuffix 7 /* use just one tab or cpp will die */ #else #define DriverManSuffix 4 /* use just one tab or cpp will die */ -- cgit v1.2.3 From 754e48ac009e4ddf452af06ee3451ecaf7946547 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 21:41:57 +0100 Subject: drop platform support: unifdef DGUX. Relates to ArcticaProject/nx-libs#275. --- nx-X11/config/cf/Imake.cf | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'nx-X11/config/cf') diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 5ff2ee16b..086d9d0eb 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -592,7 +592,7 @@ # endif #endif /* MOTOROLA */ -#if defined(SVR4) && !defined(DGUX) +#if defined(SVR4) # ifdef i386 # define i386Architecture # undef i386 @@ -685,15 +685,6 @@ # endif /* ! SVR4 */ #endif /* SYSV386 */ -#ifdef DGUX -# define i386Architecture -# define SVR4Architecture -# define MacroIncludeFile -# define MacroFile DGUX.cf -# undef DGUX -# define DguxArchitecture -#endif /* DGUX */ - #ifdef __convex__ # define MacroIncludeFile # define MacroFile convex.cf -- cgit v1.2.3 From c6250a86468b1c2c23d41b27c4d6e438518ec917 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 21:51:55 +0100 Subject: drop platform support: unifdef QNX. Relates to ArcticaProject/nx-libs#275. --- nx-X11/config/cf/Imake.cf | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'nx-X11/config/cf') diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 086d9d0eb..2387e8067 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -1041,37 +1041,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 #endif #endif -#if defined(__QNX__) && !defined(__QNXNTO__) -#define MacroIncludeFile -#define MacroFile QNX4.cf -#define QNX4Architecture -#define i386Architecture -#endif /* QNX4 */ - -#ifdef __QNXNTO__ -#define MacroIncludeFile -#define MacroFile nto.cf -#define NTOArchitecture -# ifdef PPC -# define PPCArchitecture -# undef PPC -# endif -# ifdef MIPS -# define mipsArchitecture -# undef MIPS -# endif -# ifdef i386 -# define i386Architecture -# undef i386 -# endif /* i386 */ -# ifdef __i386__ -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __i386__ -# endif /* __i386__ */ -#endif /* QNX/Neutrino */ - #ifdef SparcArchitecture # if defined(__sparc_v9) || defined(__arch64__) # define Sparc64Architecture -- cgit v1.2.3 From 2d45d8d805df95f7277d333e026a008dbd07f479 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 22:03:39 +0100 Subject: drop platform support: unifdef sgi. Relates to ArcticaProject/nx-libs#275. --- nx-X11/config/cf/Imake.cf | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'nx-X11/config/cf') diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 2387e8067..32f3e321b 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -504,24 +504,6 @@ # define MacIIArchitecture #endif /* macII */ -#ifdef sgi -# define MacroIncludeFile -# define MacroFile sgi.cf -# undef sgi -# define SGIArchitecture -# undef mips -# undef __mips -# define MipsArchitecture -# ifdef _SVR4 -# undef _SVR4 -# define SVR4Architecture -# endif -# ifdef _SYSTYPE_SVR4 -# undef _SYSTYPE_SVR4 -# define SVR4Architecture -# endif -#endif /* sgi */ - #ifdef stellar # define MacroIncludeFile # define MacroFile stellar.cf -- cgit v1.2.3