Changeset 3819 for trunk

Timestamp:

Feb 26, 2014, 1:19:21 AM (11 years ago)

Author:

bird

Message:

sys/cdefs.h: Updated to FreeBSD 9.1.0.

File:

• trunk/libc/include/sys/cdefs.h (modified) (12 diffs)

trunk/libc/include/sys/cdefs.h

@@ -1 +1 @@
 /* $Id: $ */
 /** @file
- * FreeBSD 9.0
+ * FreeBSD 9.1.0
  *
  * @changed bird: Toolkit compatibility (_CDEFS_H_ and __TCPROTO()).
@@ -8 +8 @@
  * @changed bird: __offsetof__ was apparently introduced in gcc 3.4.x.
  */
- 
+
 /*-
  * Copyright (c) 1991, 1993
@@ -41 +41 @@
  *
  *      @(#)cdefs.h     8.8 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/cdefs.h,v 1.114 2011/02/18 21:44:53 nwhitehorn Exp $
+ * $FreeBSD$
  */
 
@@ -230 +230 @@
 #endif
 
+#if !__GNUC_PREREQ__(2, 95)
+#define __alignof(x)    __offsetof(struct { char __a; x __b; }, __b)
+#endif
+
+/*
+ * Keywords added in C11.
+ */
+#if defined(__cplusplus) && __cplusplus >= 201103L
+#define _Alignas(e)             alignas(e)
+#define _Alignof(e)             alignof(e)
+#define _Noreturn               [[noreturn]]
+#define _Static_assert(e, s)    static_assert(e, s)
+/* FIXME: change this to thread_local when clang in base supports it */
+#define _Thread_local           __thread
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+/* Do nothing.  They are language keywords. */
+#else
+/* Not supported.  Implement them using our versions. */
+#define _Alignas(x)             __aligned(x)
+#define _Alignof(x)             __alignof(x)
+#define _Noreturn               __dead2
+#define _Thread_local           __thread
+#ifdef __COUNTER__
+#define _Static_assert(x, y)    __Static_assert(x, __COUNTER__)
+#define __Static_assert(x, y)   ___Static_assert(x, y)
+#define ___Static_assert(x, y)  typedef char __assert_ ## y[(x) ? 1 : -1]
+#else
+#define _Static_assert(x, y)    struct __hack
+#endif
+#endif
+
+/*
+ * Emulation of C11 _Generic().  Unlike the previously defined C11
+ * keywords, it is not possible to implement this using exactly the same
+ * syntax.  Therefore implement something similar under the name
+ * __generic().  Unlike _Generic(), this macro can only distinguish
+ * between a single type, so it requires nested invocations to
+ * distinguish multiple cases.
+ */
+
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+#define __generic(expr, t, yes, no)                                     \
+        _Generic(expr, t: yes, default: no)
+#elif __GNUC_PREREQ__(3, 1) && !defined(__cplusplus)
+#define __generic(expr, t, yes, no)                                     \
+        __builtin_choose_expr(                                          \
+            __builtin_types_compatible_p(__typeof(expr), t), yes, no)
+#endif
+
 #if __GNUC_PREREQ__(2, 96)
 #define __malloc_like   __attribute__((__malloc__))
@@ -256 +305 @@
 #endif
 
+#if __GNUC_PREREQ__(3, 4)
+#define __fastcall      __attribute__((__fastcall__))
+#else
+#define __fastcall
+#endif
+
+#if __GNUC_PREREQ__(4, 1)
+#define __returns_twice __attribute__((__returns_twice__))
+#else
+#define __returns_twice
+#endif
+
 /* XXX: should use `#if __STDC_VERSION__ < 199901'. */
 #if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
@@ -263 +324 @@
 #if (defined(__INTEL_COMPILER) || (defined(__GNUC__) && __GNUC__ >= 2)) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901
 #define __LONG_LONG_SUPPORTED
+#endif
+
+/* C++11 exposes a load of C99 stuff */
+#if defined(__cplusplus) && __cplusplus >= 201103L
+#define __LONG_LONG_SUPPORTED
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
+#endif
+#ifndef __STDC_CONSTANT_MACROS
+#define __STDC_CONSTANT_MACROS
+#endif
 #endif
 
@@ -331 +403 @@
 #else
 #if !defined(__cplusplus) || !__GNUC_PREREQ__(3,4) /* bird: __offsetof__ was introduced in 3.4.x.  */
-#define __offsetof(type, field) ((size_t)(&((type *)0)->field))
+#define __offsetof(type, field) \
+        ((__size_t)(__uintptr_t)((const volatile void *)&((type *)0)->field))
 #else
 #define __offsetof(type, field)                                 \
-  (__offsetof__ (reinterpret_cast <size_t>                      \
+  (__offsetof__ (reinterpret_cast <__size_t>                    \
                  (&reinterpret_cast <const volatile char &>     \
                   (static_cast<type *> (0)->field))))
@@ -352 +425 @@
 #define __scanflike(fmtarg, firstvararg)
 #define __format_arg(fmtarg)
+#define __strfmonlike(fmtarg, firstvararg)
+#define __strftimelike(fmtarg, firstvararg)
 #else
 #define __printflike(fmtarg, firstvararg) \
@@ -358 +433 @@
             __attribute__((__format__ (__scanf__, fmtarg, firstvararg)))
 #define __format_arg(fmtarg)    __attribute__((__format_arg__ (fmtarg)))
+#define __strfmonlike(fmtarg, firstvararg) \
+            __attribute__((__format__ (__strfmon__, fmtarg, firstvararg)))
+#define __strftimelike(fmtarg, firstvararg) \
+            __attribute__((__format__ (__strftime__, fmtarg, firstvararg)))
 #endif
 
@@ -428 +507 @@
  * more recent ELF binutils, we use .ident allowing the ID to be stripped.
  * Usage:
- *      __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.114 2011/02/18 21:44:53 nwhitehorn Exp $");
+ *      __FBSDID("$FreeBSD$");
  */
 #ifndef __FBSDID
@@ -471 +550 @@
 
 #ifndef __DECONST
-#define __DECONST(type, var)    ((type)(uintptr_t)(const void *)(var))
+#define __DECONST(type, var)    ((type)(__uintptr_t)(const void *)(var))
 #endif
 
 #ifndef __DEVOLATILE
-#define __DEVOLATILE(type, var) ((type)(uintptr_t)(volatile void *)(var))
+#define __DEVOLATILE(type, var) ((type)(__uintptr_t)(volatile void *)(var))
 #endif
 
 #ifndef __DEQUALIFY
-#define __DEQUALIFY(type, var)  ((type)(uintptr_t)(const volatile void *)(var))
+#define __DEQUALIFY(type, var)  ((type)(__uintptr_t)(const volatile void *)(var))
 #endif
 
@@ -595 +674 @@
 #endif
 
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+#ifndef __has_include
+#define __has_include(x) 0
+#endif
+#ifndef __has_builtin
+#define __has_builtin(x) 0
+#endif
+
+#if defined(__mips) || defined(__powerpc64__) || defined(__arm__)
+#define __NO_TLS 1
+#endif
+
 /*-
  * There are two strict backwards compatibility modes: