diff options
| -rw-r--r-- | nx-X11/config/cf/Imake.cf | 12 | ||||
| -rw-r--r-- | nx-X11/config/cf/Imake.tmpl | 2 | ||||
| -rw-r--r-- | nx-X11/config/cf/linux.cf | 21 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 2 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa.patches_6.4.1/4004_define-USE_IEEE-macro-for-more-platforms.patch | 3 | ||||
| -rw-r--r-- | nx-X11/include/Xmd.h | 1 |
6 files changed, 39 insertions, 2 deletions
diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 47518164b..676c7ebc5 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -184,6 +184,12 @@ # undef __vax__ # define VaxArchitecture # endif +# ifdef __hppa__ +# ifndef HPArchitecture +# define HPArchitecture +# endif +# undef __hppa__ +# endif /* __hppa__ */ #endif /* OpenBSD */ /* Systems based on kernel of OpenBSD */ @@ -890,6 +896,12 @@ 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 15e3a9ad3..85228ae07 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -507,6 +507,8 @@ 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 b78281cb5..41c85f3c3 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -537,6 +537,13 @@ 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 @@ -575,6 +582,13 @@ 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 @@ -676,6 +690,13 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # endif #endif /* AlphaArchitecture */ +#ifdef HPArchitecture +# define OptimizedCDebugFlags -O2 GccAliasingArgs +# define LinuxMachineDefines -D__hppa__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +#endif /* HPArchitecture */ + #ifdef Arm32Architecture # define DefaultCCOptions # ifndef OptimizedCDebugFlags diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 1aa7daf06..13ccd577c 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(SuperHArchitecture) + defined(HPArchitecture) || defined(SuperHArchitecture) # ifndef XorgServer # define XorgServer YES # endif diff --git a/nx-X11/extras/Mesa.patches_6.4.1/4004_define-USE_IEEE-macro-for-more-platforms.patch b/nx-X11/extras/Mesa.patches_6.4.1/4004_define-USE_IEEE-macro-for-more-platforms.patch index 7db909b91..0a512e6b5 100644 --- a/nx-X11/extras/Mesa.patches_6.4.1/4004_define-USE_IEEE-macro-for-more-platforms.patch +++ b/nx-X11/extras/Mesa.patches_6.4.1/4004_define-USE_IEEE-macro-for-more-platforms.patch @@ -5,12 +5,13 @@ Index: Mesa/src/mesa/main/imports.h =================================================================== --- Mesa.orig/src/mesa/main/imports.h +++ Mesa/src/mesa/main/imports.h -@@ -204,6 +204,8 @@ typedef union { GLfloat f; GLint i; } fi +@@ -204,6 +204,9 @@ typedef union { GLfloat f; GLint i; } fi defined(ia64) || defined(__ia64__) || \ defined(__mips) || defined(_MIPS_ARCH) || \ defined(__arm__) || \ + defined(__aarch64__) || \ + defined(__mc68000__) || \ ++ defined(__hppa__) || \ defined(__sh__) || \ (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS))) #define USE_IEEE diff --git a/nx-X11/include/Xmd.h b/nx-X11/include/Xmd.h index 50159edd3..be99dfc98 100644 --- a/nx-X11/include/Xmd.h +++ b/nx-X11/include/Xmd.h @@ -58,6 +58,7 @@ SOFTWARE. defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ + (defined(__hppa__) && defined(__LP64__)) || \ defined(__amd64__) || defined(amd64) || \ defined(__powerpc64__) #define LONG64 /* 32/64-bit architecture */ |