svn commit: r287139 - in stable: 10/sys/x86/include 9/sys/x86/include

[Jung-uk Kim]

Author: jkim
Date: Tue Aug 25 19:18:38 2015
New Revision: 287139
URL: https://svnweb.freebsd.org/changeset/base/287139

Log:
  MFC:	r286265, r286293, r286328
  
  Always define __va_list for amd64 and restore pre-r232261 behavior for i386.

Modified:
  stable/9/sys/x86/include/_types.h
Directory Properties:
  stable/9/sys/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/x86/include/_types.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/sys/x86/include/_types.h
==============================================================================
--- stable/9/sys/x86/include/_types.h	Tue Aug 25 17:39:03 2015	(r287138)
+++ stable/9/sys/x86/include/_types.h	Tue Aug 25 19:18:38 2015	(r287139)
@@ -148,8 +148,16 @@ typedef	__uint64_t	__vm_pindex_t;
  */
 #ifdef __GNUCLIKE_BUILTIN_VARARGS
 typedef	__builtin_va_list	__va_list;	/* internally known to gcc */
-#elif defined(lint)
-typedef	char *			__va_list;	/* pretend */
+#else
+#ifdef __LP64__
+struct __s_va_list {
+	__uint32_t	_pad1[2];	/* gp_offset, fp_offset */
+	__uint64_t	_pad2[2];	/* overflow_arg_area, reg_save_area */
+};
+typedef	struct __s_va_list	__va_list;
+#else
+typedef	char *			__va_list;
+#endif
 #endif
 #if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \
     && !defined(__NO_GNUC_VA_LIST)