From owner-svn-src-all@freebsd.org Tue Aug 25 19:18:39 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 79F8C9C221E; Tue, 25 Aug 2015 19:18:39 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6A25CDF6; Tue, 25 Aug 2015 19:18:39 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7PJIdXO007632; Tue, 25 Aug 2015 19:18:39 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7PJIdud007631; Tue, 25 Aug 2015 19:18:39 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201508251918.t7PJIdud007631@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 25 Aug 2015 19:18:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r287139 - in stable: 10/sys/x86/include 9/sys/x86/include X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Aug 2015 19:18:39 -0000 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)