Changeset 3715

Timestamp:

Mar 17, 2011, 6:31:19 PM (14 years ago)

Author:

bird

Message:

386/stdarg.h,sys/cdefs.h: Synced in bit from more recent FreeBSDs so that the stdarg.h macros will work with more recent GCC versions. References #212

Location:

trunk/libc/include

Files:

• 386/stdarg.h (modified) (4 diffs)
• sys/cdefs.h (modified) (2 diffs)

trunk/libc/include/386/stdarg.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * FreeBSD 5.1
+ * FreeBSD 9.0
  * @changed bird: EMXisms.
  */
@@ -38 +38 @@
  *
  *      @(#)stdarg.h    8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/i386/include/stdarg.h,v 1.18 2002/11/27 16:28:18 obrien Exp $
+ * $FreeBSD: src/sys/i386/include/stdarg.h,v 1.21 2006/09/21 01:37:02 kan Exp $
  */
 
@@ -53 +53 @@
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3)
+#ifdef __GNUCLIKE_BUILTIN_STDARG
 
 #define va_start(ap, last) \
-        __builtin_stdarg_start((ap), (last))
+        __builtin_va_start((ap), (last))
 
 #define va_arg(ap, type) \
@@ -69 +69 @@
         __builtin_va_end(ap)
 
-#else   /* ! __GNUC__ post GCC 2.95 */
+#else   /* !__GNUCLIKE_BUILTIN_STDARG */
 
 #define __va_size(type) \
         (((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
 
-#ifdef __GNUC__
+#ifdef __GNUCLIKE_BUILTIN_NEXT_ARG
 #define va_start(ap, last) \
         ((ap) = (va_list)__builtin_next_arg(last))
-#else   /* non-GNU compiler */
+#else   /* !__GNUCLIKE_BUILTIN_NEXT_ARG */
 #define va_start(ap, last) \
         ((ap) = (va_list)&(last) + __va_size(last))
-#endif  /* __GNUC__ */
+#endif  /* __GNUCLIKE_BUILTIN_NEXT_ARG */
 
 #define va_arg(ap, type) \
         (*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
 
+#if __ISO_C_VISIBLE >= 1999
+#define va_copy(dest, src) \
+        ((dest) = (src))
+#endif
+
 #define va_end(ap)
 
-#endif /* __GNUC__ post GCC 2.95 */
+#endif /* __GNUCLIKE_BUILTIN_STDARG */
 
 #endif /* !_MACHINE_STDARG_H_ */
+

trunk/libc/include/sys/cdefs.h

@@ -41 +41 @@
  * @changed bird: Check if stuff is defined before accessing it in #if. Stops -Wundef
  *                from bitching.
+ * @changed bird: added __GNUCLIKE_XXX from FreeBSD 8.0 (releng/8.0/sys/sys/cdefs.h 193734)
  */
 
@@ -55 +56 @@
 #define __END_DECLS
 #endif
+
+/*
+ * This code has been put in place to help reduce the addition of
+ * compiler specific defines in FreeBSD code.  It helps to aid in
+ * having a compiler-agnostic source tree.
+ */
+
+#if defined(__GNUC__) || defined(__INTEL_COMPILER)
+
+#if __GNUC__ >= 3 || defined(__INTEL_COMPILER)
+#define __GNUCLIKE_ASM 3
+#define __GNUCLIKE_MATH_BUILTIN_CONSTANTS
+#else
+#define __GNUCLIKE_ASM 2
+#endif
+#define __GNUCLIKE___TYPEOF 1
+#define __GNUCLIKE___OFFSETOF 1
+#define __GNUCLIKE___SECTION 1
+
+#define __GNUCLIKE_ATTRIBUTE_MODE_DI 1
+
+#ifndef __INTEL_COMPILER
+# define __GNUCLIKE_CTOR_SECTION_HANDLING 1
+#endif
+
+#define __GNUCLIKE_BUILTIN_CONSTANT_P 1
+# if defined(__INTEL_COMPILER) && defined(__cplusplus) \
+    && __INTEL_COMPILER < 800
+#  undef __GNUCLIKE_BUILTIN_CONSTANT_P
+# endif
+
+#if (__GNUC_MINOR__ > 95 || __GNUC__ >= 3) && !defined(__INTEL_COMPILER)
+# define __GNUCLIKE_BUILTIN_VARARGS 1
+# define __GNUCLIKE_BUILTIN_STDARG 1
+# define __GNUCLIKE_BUILTIN_VAALIST 1
+#endif
+
+#if defined(__GNUC__)
+# define __GNUC_VA_LIST_COMPATIBILITY 1
+#endif
+
+#ifndef __INTEL_COMPILER
+# define __GNUCLIKE_BUILTIN_NEXT_ARG 1
+# define __GNUCLIKE_MATH_BUILTIN_RELOPS
+#endif
+
+#define __GNUCLIKE_BUILTIN_MEMCPY 1
+
+/* XXX: if __GNUC__ >= 2: not tested everywhere originally, where replaced */
+#define __CC_SUPPORTS_INLINE 1
+#define __CC_SUPPORTS___INLINE 1
+#define __CC_SUPPORTS___INLINE__ 1
+
+#define __CC_SUPPORTS___FUNC__ 1
+#define __CC_SUPPORTS_WARNING 1
+
+#define __CC_SUPPORTS_VARADIC_XXX 1 /* see varargs.h */
+
+#define __CC_SUPPORTS_DYNAMIC_ARRAY_INIT 1
+
+#endif /* __GNUC__ || __INTEL_COMPILER */
 
 /*