diff options
| author | joerg <joerg@FreeBSD.org> | 2005-03-02 21:33:29 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 2005-03-02 21:33:29 +0000 |
| commit | c85a3e95f78bb183ec62ae6ef948265e7ade6b7a (patch) | |
| tree | 69c98a86a28838e983d8eca9ba158f46450df8c1 /sys/i386/include/_types.h | |
| parent | 2307c11d0fa1ac2133cff99d6c1a90c711b15f61 (diff) | |
| download | FreeBSD-src-c85a3e95f78bb183ec62ae6ef948265e7ade6b7a.zip FreeBSD-src-c85a3e95f78bb183ec62ae6ef948265e7ade6b7a.tar.gz | |
netchild's mega-patch to isolate compiler dependencies into a central
place.
This moves the dependency on GCC's and other compiler's features into
the central sys/cdefs.h file, while the individual source files can
then refer to #ifdef __COMPILER_FEATURE_FOO where they by now used to
refer to #if __GNUC__ > 3.1415 && __BARC__ <= 42.
By now, GCC and ICC (the Intel compiler) have been actively tested on
IA32 platforms by netchild. Extension to other compilers is supposed
to be possible, of course.
Submitted by: netchild
Reviewed by: various developers on arch@, some time ago
Diffstat (limited to 'sys/i386/include/_types.h')
| -rw-r--r-- | sys/i386/include/_types.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/i386/include/_types.h b/sys/i386/include/_types.h index 9884c83..7df734d 100644 --- a/sys/i386/include/_types.h +++ b/sys/i386/include/_types.h @@ -39,6 +39,10 @@ #ifndef _MACHINE__TYPES_H_ #define _MACHINE__TYPES_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + /* * Basic types upon which most other types are built. */ @@ -54,7 +58,7 @@ typedef unsigned int __uint32_t; typedef long long __int64_t; /* LONGLONG */ typedef unsigned long long __uint64_t; -#elif defined(__GNUC__) || defined(__INTEL_COMPILER) +#elif defined(__GNUCLIKE_ATTRIBUTE_MODE_DI) typedef int __attribute__((__mode__(__DI__))) __int64_t; typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t; #else @@ -114,12 +118,13 @@ typedef __uint32_t __vm_size_t; /* * Unusual type definitions. */ -#if (defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) && !defined(__INTEL_COMPILER)) +#ifdef __GNUCLIKE_BUILTIN_VARARGS typedef __builtin_va_list __va_list; /* internally known to gcc */ #else typedef char * __va_list; -#endif /* ! (__GNUC__ post 2.95 || __INTEL_COMPILER) */ -#if defined(__GNUC__) && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#endif /* __GNUCLIKE_BUILTIN_VARARGS */ +#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ + && !defined(__NO_GNUC_VA_LIST) #define __GNUC_VA_LIST typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif |
