Date: Tue, 25 Aug 2015 19:18:38 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r287139 - in stable: 10/sys/x86/include 9/sys/x86/include Message-ID: <201508251918.t7PJIcfp007624@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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/10/sys/x86/include/_types.h Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/sys/x86/include/_types.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/10/sys/x86/include/_types.h ============================================================================== --- stable/10/sys/x86/include/_types.h Tue Aug 25 17:39:03 2015 (r287138) +++ stable/10/sys/x86/include/_types.h Tue Aug 25 19:18:38 2015 (r287139) @@ -152,8 +152,16 @@ typedef int ___wchar_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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508251918.t7PJIcfp007624>