Changeset 1617 for trunk/src/emx/include/sys/cdefs.h

Timestamp:

Nov 7, 2004, 10:33:03 AM (21 years ago)

Author:

bird

Message:

Debugging signals.

File:

• trunk/src/emx/include/sys/cdefs.h (modified) (21 diffs, 1 prop)

trunk/src/emx/include/sys/cdefs.h

@@ -14 +14 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
@@ -35 +31 @@
  *
  *      @(#)cdefs.h     8.8 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/cdefs.h,v 1.69 2003/04/18 18:59:34 bde Exp $
+ * $FreeBSD: src/sys/sys/cdefs.h,v 1.81 2004/04/07 04:19:49 imp Exp $
  */
 
 /** @file
- * FreeBSD 5.1
+ * FreeBSD 5.2
  *
  * @changed bird: Toolkit compatibility (_CDEFS_H_ and __TCPROTO()).
@@ -58 +54 @@
 #define __BEGIN_DECLS
 #define __END_DECLS
+#endif
+
+/*
+ * Macro to test if we're using a specific version of gcc or later.
+ */
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+#define __GNUC_PREREQ__(ma, mi) \
+        (__GNUC__ > (ma) || __GNUC__ == (ma) && __GNUC_MINOR__ >= (mi))
+#else
+#define __GNUC_PREREQ__(ma, mi) 0
 #endif
 
@@ -85 +91 @@
 #define __inline        inline          /* convert to C++ keyword */
 #else
-#ifndef __GNUC__
+#if !(defined(__GNUC__) || defined(__INTEL_COMPILER))
 #define __inline                        /* delete GCC keyword */
-#endif /* !__GNUC__ */
+#endif /* !(__GNUC__ || __INTEL_COMPILER) */
 #endif /* !__cplusplus */
 
@@ -95 +101 @@
 #define __STRING(x)     "x"
 
-#ifndef __GNUC__
+#if !(defined(__GNUC__) || defined(__INTEL_COMPILER))
 #define __const                         /* delete pseudo-ANSI C keywords */
 #define __inline
@@ -114 +120 @@
 #define volatile
 #endif  /* !NO_ANSI_KEYWORDS */
-#endif  /* !__GNUC__ */
+#endif  /* !(__GNUC__ || __INTEL_COMPILER) */
 #endif  /* !(__STDC__ || __cplusplus) */
 
@@ -134 +140 @@
 #define __section(x)
 #else
-#if __GNUC__ < 2 || __GNUC__ == 2 && __GNUC_MINOR__ < 5
+#if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER)
 #define __dead2
 #define __pure2
 #define __unused
 #endif
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7
+#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7 && !defined(__INTEL_COMPILER)
 #define __dead2         __attribute__((__noreturn__))
 #define __pure2         __attribute__((__const__))
@@ -145 +151 @@
 /* XXX Find out what to do for __packed, __aligned and __section */
 #endif
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ == 3
+#if __GNUC_PREREQ__(2, 7)
 #define __dead2         __attribute__((__noreturn__))
 #define __pure2         __attribute__((__const__))
@@ -153 +159 @@
 #define __section(x)    __attribute__((__section__(x)))
 #endif
+#if defined(__INTEL_COMPILER)
+#define __dead2         __attribute__((__noreturn__))
+#define __pure2         __attribute__((__const__))
+#define __unused        __attribute__((__unused__))
+#define __packed        __attribute__((__packed__))
+#define __aligned(x)    __attribute__((__aligned__(x)))
+#define __section(x)    __attribute__((__section__(x)))
+#endif
+#endif
+
+#if __GNUC_PREREQ__(3, 1) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
+#define __always_inline __attribute__((__always_inline__))
+#else
+#define __always_inline
+#endif
+
+#if __GNUC_PREREQ__(3, 3)
+#define __nonnull(x)    __attribute__((__nonnull__(x)))
+#else
+#define __nonnull(x)
 #endif
 
 /* XXX: should use `#if __STDC_VERSION__ < 199901'. */
-#if !(__GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3)
+#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
 #define __func__        NULL
 #endif
 
-#if __GNUC__ >= 2 && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901
+#if (defined(__INTEL_COMPILER) || (defined(__GNUC__) && __GNUC__ >= 2)) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901
 #define __LONG_LONG_SUPPORTED
 #endif
@@ -171 +197 @@
  */
 #if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901 /* bird: check if not defined. (-pedantic) */
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901
 #define __restrict
 #else
 #define __restrict      restrict
 #endif
+#endif
+
+/*
+ * GNU C version 2.96 adds explicit branch prediction so that
+ * the CPU back-end can hint the processor and also so that
+ * code blocks can be reordered such that the predicted path
+ * sees a more linear flow, thus improving cache behavior, etc.
+ *
+ * The following two macros provide us with a way to utilize this
+ * compiler feature.  Use __predict_true() if you expect the expression
+ * to evaluate to true, and __predict_false() if you expect the
+ * expression to evaluate to false.
+ *
+ * A few notes about usage:
+ *
+ *      * Generally, __predict_false() error condition checks (unless
+ *        you have some _strong_ reason to do otherwise, in which case
+ *        document it), and/or __predict_true() `no-error' condition
+ *        checks, assuming you want to optimize for the no-error case.
+ *
+ *      * Other than that, if you don't know the likelihood of a test
+ *        succeeding from empirical or other `hard' evidence, don't
+ *        make predictions.
+ *
+ *      * These are meant to be used in places that are run `a lot'.
+ *        It is wasteful to make predictions in code that is run
+ *        seldomly (e.g. at subsystem initialization time) as the
+ *        basic block reordering that this affects can often generate
+ *        larger code.
+ */
+#if __GNUC_PREREQ__(2, 96)
+#define __predict_true(exp)     __builtin_expect((exp), 1)
+#define __predict_false(exp)    __builtin_expect((exp), 0)
+#else
+#define __predict_true(exp)     (exp)
+#define __predict_false(exp)    (exp)
 #endif
 
@@ -190 +252 @@
  * didn't permit keeping the keywords out of the application namespace).
  */
-#if __GNUC__ < 2 || __GNUC__ == 2 && __GNUC_MINOR__ < 7
+#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
 #define __printflike(fmtarg, firstvararg)
 #define __scanflike(fmtarg, firstvararg)
@@ -201 +263 @@
 
 /* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
-#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 /* bird: check if defined to avoid -Wundef messages */
+#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 && defined(__GNUC__) && !defined(__INTEL_COMPILER) /* bird: check if defined to avoid -Wundef messages */
 #define __printf0like(fmtarg, firstvararg) \
             __attribute__((__format__ (__printf0__, fmtarg, firstvararg)))
@@ -208 +270 @@
 #endif
 
-#if 0 /* def __GNUC__ - bird: ELF specific, so skip everything */
+#if 0 /* defined(__GNUC__) || defined(__INTEL_COMPILER) - bird: ELF specific, so skip everything */
+#ifndef __INTEL_COMPILER
 #define __strong_reference(sym,aliassym)        \
         extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)));
+#endif
 #ifdef __STDC__
 #define __weak_reference(sym,alias)     \
@@ -228 +292 @@
         __asm__(".previous")
 #endif  /* __STDC__ */
-#endif  /* __GNUC__ */
-
-#if 0 /*def __GNUC__ - ELF specific. */
+#endif  /* __GNUC__ || __INTEL_COMPILER */
+
+#if 0 /* defined(__GNUC__) || defined(__INTEL_COMPILER) - ELF specific. */
 #define __IDSTRING(name,string) __asm__(".ident\t\"" string "\"")
 #else
 /*
- * This doesn't work in header files. But it may be better than nothing.
- * The alternative is: #define __IDSTRING(name,string)  [nothing]
+ * The following definition might not work well if used in header files,
+ * but it should be better than nothing.  If you want a "do nothing"
+ * version, then it should generate some harmless declaration, such as:
+ *    #define __IDSTRING(name,string)   struct __hack
  */
 #define __IDSTRING(name,string) static const char name[] __unused = string
@@ -244 +310 @@
  * more recent ELF binutils, we use .ident allowing the ID to be stripped.
  * Usage:
- *      __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.69 2003/04/18 18:59:34 bde Exp $");
+ *      __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.81 2004/04/07 04:19:49 imp Exp $");
  */
 #ifndef __FBSDID
@@ -258 +324 @@
 #define __RCSID(s)      __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
 #else
-#define __RCSID(s)
+#define __RCSID(s)      struct __hack
 #endif
 #endif
@@ -266 +332 @@
 #define __RCSID_SOURCE(s)       __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s)
 #else
-#define __RCSID_SOURCE(s)
+#define __RCSID_SOURCE(s)       struct __hack
 #endif
 #endif
@@ -274 +340 @@
 #define __SCCSID(s)     __IDSTRING(__CONCAT(__sccsid_,__LINE__),s)
 #else
-#define __SCCSID(s)
+#define __SCCSID(s)     struct __hack
 #endif
 #endif
@@ -282 +348 @@
 #define __COPYRIGHT(s)  __IDSTRING(__CONCAT(__copyright_,__LINE__),s)
 #else
-#define __COPYRIGHT(s)
+#define __COPYRIGHT(s)  struct __hack
 #endif
 #endif
@@ -321 +387 @@
 
 /* Deal with IEEE Std. 1003.1-1990, in which _POSIX_C_SOURCE == 1. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1 /* bird: check if defined to avoid -Wundef message. */
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1
 #undef _POSIX_C_SOURCE          /* Probably illegal, but beyond caring now. */
 #define _POSIX_C_SOURCE         199009
@@ -327 +393 @@
 
 /* Deal with IEEE Std. 1003.2-1992, in which _POSIX_C_SOURCE == 2. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2 /* bird: check if defined to avoid -Wundef message. */
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2
 #undef _POSIX_C_SOURCE
 #define _POSIX_C_SOURCE         199209