diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-06-28 22:23:42 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-06-28 22:23:42 +0200 |
| commit | 3d255540f40b7e60dfee0807216a7705a1e9682a (patch) | |
| tree | c9164b62d6c58a2c87b2b0fb633e1c09c95699d9 /nx-X11/config | |
| parent | 78d41614e4bfb022a7291167f893249f99acd006 (diff) | |
| parent | 65c420515bb767eebc24c44bffcd78c2f8c59da1 (diff) | |
| download | nx-libs-3d255540f40b7e60dfee0807216a7705a1e9682a.tar.gz nx-libs-3d255540f40b7e60dfee0807216a7705a1e9682a.tar.bz2 nx-libs-3d255540f40b7e60dfee0807216a7705a1e9682a.zip | |
Merge branch 'sunweaver-pr/fix-ftbfs-on-hppa' into 3.6.x
Attributes GH PR #453: https://github.com/ArcticaProject/nx-libs/pull/453
Diffstat (limited to 'nx-X11/config')
| -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 |
4 files changed, 36 insertions, 1 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 |