diff options
| -rw-r--r-- | imakemdep.h | 57 | ||||
| -rw-r--r-- | main.c | 2 |
2 files changed, 40 insertions, 19 deletions
diff --git a/imakemdep.h b/imakemdep.h index c31a000..1c77250 100644 --- a/imakemdep.h +++ b/imakemdep.h @@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/imake/imakemdep.h,v 3.68 2002/12/24 17:42:58 tsi Exp $ */ +/* $XFree86: xc/config/imake/imakemdep.h,v 3.71 2003/06/12 14:12:26 eich Exp $ */ /* @@ -33,6 +33,10 @@ in this Software without prior written authorization from The Open Group. * definitions. In general you should *not* edit ccimake.c or imake.c! */ +#ifdef __UNIXOS2__ +#define lstat stat +#endif + #ifdef CCIMAKE /* * Step 1: imake_ccflags @@ -367,8 +371,11 @@ char *cpp_argv[ARGUMENTS] = { # ifdef __ia64__ "-D__ia64__", # endif +# ifdef __AMD64__ + "-D__AMD64__", +# endif # ifdef __x86_64__ - "-D__x86_64__", + "-D__AMD64__", # endif # ifdef __s390__ "-D__s390__", @@ -969,6 +976,10 @@ void (*defaultOsTeenyRevFrob)(char *buf, int size) = NULL; * them to the the following table. The definition of struct symtab is * in util/makedepend/def.h. */ +#undef DEF_EVALUATE +#undef DEF_STRINGIFY +#define DEF_EVALUATE(__x) #__x +#define DEF_STRINGIFY(_x) DEF_EVALUATE(_x) struct symtab predefs[] = { #ifdef apollo {"apollo", "1"}, @@ -1055,25 +1066,13 @@ struct symtab predefs[] = { {"mc68020", "1"}, #endif #ifdef __GNUC__ -# if __GNUC__ == 1 - {"__GNUC__", "1"}, -# elif __GNUC__ == 2 - {"__GNUC__", "2"}, -# elif __GNUC__ == 3 - {"__GNUC__", "3"}, -# endif + {"__GNUC__", DEF_STRINGIFY(__GNUC__)}, #endif #ifdef __STRICT_ANSI__ {"__STRICT_ANSI__", "1"}, #endif #ifdef __STDC__ -# if __STDC__ == 0 - {"__STDC__", "0"}, -# elif __STDC__ == 1 - {"__STDC__", "1"}, -# elif __STDC__ == 2 - {"__STDC__", "2"}, -# endif + {"__STDC__", DEF_STRINGIFY(__STDC__)}, #endif #ifdef __HIGHC__ {"__HIGHC__", "1"}, @@ -1202,6 +1201,24 @@ struct symtab predefs[] = { #ifdef __sgi {"__sgi", "1"}, #endif +#ifdef _MIPS_FPSET + {"_MIPS_FPSET", DEF_STRINGIFY(_MIPS_FPSET)}, +#endif +#ifdef _MIPS_ISA + {"_MIPS_ISA", DEF_STRINGIFY(_MIPS_ISA)}, +#endif +#ifdef _MIPS_SIM + {"_MIPS_SIM", DEF_STRINGIFY(_MIPS_SIM)}, +#endif +#ifdef _MIPS_SZINT + {"_MIPS_SZINT", DEF_STRINGIFY(_MIPS_SZINT)}, +#endif +#ifdef _MIPS_SZLONG + {"_MIPS_SZLONG", DEF_STRINGIFY(_MIPS_SZLONG)}, +#endif +#ifdef _MIPS_SZPTR + {"_MIPS_SZPTR", DEF_STRINGIFY(_MIPS_SZPTR)}, +#endif #ifdef __FreeBSD__ {"__FreeBSD__", "1"}, #endif @@ -1238,10 +1255,12 @@ struct symtab predefs[] = { # ifdef __ia64__ {"__ia64__", "1"}, # endif -# ifdef x86_64 +# if defined (AMD64) || defined (x86_64) + {"AMD64", "1"}, {"x86_64", "1"}, # endif -# ifdef __x86_64__ +# if defined (__AMD64__) || defined (__x86_64__) + {"__AMD64__", "1"}, {"__x86_64__", "1"}, # endif # ifdef __i386__ @@ -1312,6 +1331,8 @@ struct symtab predefs[] = { /* add any additional symbols before this line */ {NULL, NULL} }; +#undef DEF_EVALUATE +#undef DEF_STRINGIFY #endif /* CROSSCOMPILE */ #endif /* MAKEDEPEND */ @@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/main.c,v 3.31 2003/01/17 17:09:49 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/main.c,v 3.32 2003/03/26 20:43:48 tsi Exp $ */ #include "def.h" #ifdef hpux |