diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-06-23 12:49:07 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-06-23 12:49:07 +0000 |
| commit | 0ea5099c2e47e9b3918fd1a2162c7fa3503f98b1 (patch) | |
| tree | ac14f79c9f533e6274429439f18df3ca28f49c3a /util | |
| parent | 30cb4f8f1715be9e13c7923f8df6d6e71b6289ec (diff) | |
Pull some local changes from XF4 that didn't make it to xenocara.
Noticed by todd@ with a failed sgi build.
Diffstat (limited to 'util')
| -rw-r--r-- | util/cf/Imake.cf | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/util/cf/Imake.cf b/util/cf/Imake.cf index 73576a2f7..eec78707d 100644 --- a/util/cf/Imake.cf +++ b/util/cf/Imake.cf @@ -128,18 +128,27 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ # define Sparc64Architecture # endif # undef sparc +# undef sparc64 # endif # if defined(__mips__) || defined(mips) # define MipsArchitecture +# ifdef __LP64__ +# define Mips64Architecture +# endif # ifdef arc # define ArcArchitecture # undef arc # endif +# ifdef sgi +# define SGIArchitecture +# undef sgi +# endif # ifdef pmax # define PmaxArchitecture # undef pmax # endif # undef mips +# undef __mips__ # endif # if defined(__alpha__) || defined(alpha) # define AlphaArchitecture @@ -152,6 +161,14 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ # undef __x86_64__ # undef amd64 # endif +# if defined(__arm__) +# define Arm32Architecture +# undef __arm__ +# if defined(zaurus) +# undef zaurus +# define ZaurusArchitecture +# endif +# endif # if defined(__mc68020__) || defined(mc68020) # define Mc68020Architecture # if defined(amiga) @@ -176,12 +193,20 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ # endif # undef mc68000 # endif +# if defined(__m88k__) || defined(m88k) +# define Mc88000Architecture +# undef m88k +# endif # ifdef __powerpc__ # define PpcArchitecture # undef __powerpc__ # undef __macppc__ # undef macppc # endif +# ifdef __sh__ +# undef __sh__ +# define SuperHArchitecture +# endif # ifdef __vax__ # undef vax # undef __vax__ |