From 184c5d778210dea8eab045a5f7ecf9d4344c1c34 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
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 <hp.cf>
-# define MacroFile hp.cf
-# undef hpux
-# define HPArchitecture
-#endif /* hpux */
-
 #ifdef __SCO__
 # define MacroIncludeFile <sco5.cf>
 # 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