Merge branch 'sunweaver-pr/drop-support-for-ancient-platforms' into 3.6.x

Attributes GH PR #289: https://github.com/ArcticaProject/nx-libs/pull/289

5 files changed, 10 insertions, 165 deletions

diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
index 8decfdc3c..32f3e321b 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 <hp.cf>
-# define MacroFile hp.cf
-# undef hpux
-# define HPArchitecture
-#endif /* hpux */
-
 #ifdef __SCO__
 # define MacroIncludeFile <sco5.cf>
 # define MacroFile sco5.cf
@@ -517,24 +504,6 @@
 # define MacIIArchitecture
 #endif /* macII */
 
-#ifdef sgi
-# define MacroIncludeFile <sgi.cf>
-# 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 <stellar.cf>
 # define MacroFile stellar.cf
@@ -542,7 +511,7 @@
 # define StellarArchitecture
 #endif /* stellar */
 
-#if defined(ibm) || defined(_IBMR2) || defined(ibm032) || defined(aix)
+#if defined(ibm) || defined(_IBMR2) || defined(ibm032)
 # define MacroIncludeFile <ibm.cf>
 # define MacroFile ibm.cf
 # ifdef ibm
@@ -557,10 +526,6 @@
 #  undef ibm032
 #  define RtArchitecture
 # endif
-# ifdef aix
-#  undef aix
-#  define AIXArchitecture
-# endif
 # ifdef _IBMR2
 #  undef _IBMR2
 #  if (DefaultOSMajorVersion < 5)
@@ -609,7 +574,7 @@
 # endif
 #endif /* MOTOROLA */
 
-#if defined(SVR4) && !defined(DGUX)
+#if defined(SVR4)
 # ifdef i386
 #  define i386Architecture
 #  undef i386
@@ -702,15 +667,6 @@
 # endif /* ! SVR4 */
 #endif /* SYSV386 */
 
-#ifdef DGUX
-# define i386Architecture
-# define SVR4Architecture
-# define MacroIncludeFile <DGUX.cf>
-# define MacroFile DGUX.cf
-# undef DGUX
-# define DguxArchitecture
-#endif /* DGUX */
-
 #ifdef __convex__
 # define MacroIncludeFile <convex.cf>
 # define MacroFile convex.cf
@@ -720,22 +676,6 @@
 # define ConvexArchitecture
 #endif /* _convex_ */
 
-#ifdef __osf__
-# define MacroIncludeFile <osf1.cf>
-# 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 <Oki.cf>
 # define MacroFile Oki.cf
@@ -947,12 +887,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
@@ -1006,34 +940,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 <lynx.cf>
-# 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 <fujitsu.cf>
 # define MacroFile fujitsu.cf
@@ -1117,44 +1023,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 #endif
 #endif
 
-#ifdef emxos2
-#define MacroIncludeFile <os2.cf>
-#define MacroFile os2.cf
-#define OS2Architecture
-#define i386Architecture
-#endif /* emxos2 */
-
-#if defined(__QNX__) && !defined(__QNXNTO__)
-#define MacroIncludeFile <QNX4.cf>
-#define MacroFile QNX4.cf
-#define QNX4Architecture
-#define i386Architecture
-#endif /* QNX4 */
-
-#ifdef __QNXNTO__
-#define MacroIncludeFile <nto.cf>
-#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
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 5c8effee5..93b659a0d 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
@@ -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)
@@ -1518,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 */
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/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)
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index fb0dbfd08..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
@@ -512,8 +512,8 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #ifndef BuildScanpci
 # if SystemV || SystemV4 || \
     (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \
-    defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \
-    defined(OS2Architecture) || defined(GNUMachArchitecture) || \
+    defined(i386BsdArchitecture) || \
+    defined(GNUMachArchitecture) || \
     (defined(KFreeBSDArchitecture) && defined(i386Architecture))
 #   define BuildScanpci		YES
 # else