From owner-svn-src-stable@FreeBSD.ORG Fri Dec 30 18:18:06 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8F801065672; Fri, 30 Dec 2011 18:18:06 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9CB998FC14; Fri, 30 Dec 2011 18:18:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBUII6ae024422; Fri, 30 Dec 2011 18:18:06 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBUII6l8024419; Fri, 30 Dec 2011 18:18:06 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201112301818.pBUII6l8024419@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 30 Dec 2011 18:18:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229008 - stable/9/lib/libc/amd64/gen X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Dec 2011 18:18:06 -0000 Author: kib Date: Fri Dec 30 18:18:06 2011 New Revision: 229008 URL: http://svn.freebsd.org/changeset/base/229008 Log: MFC r227023: Make sure that stack is 16-byte aligned before calling a function, as it is required by amd64 ABI. Add a comment for the places were the stack is accidentally properly aligned already. PR: amd64/162214 Modified: stable/9/lib/libc/amd64/gen/setjmp.S stable/9/lib/libc/amd64/gen/sigsetjmp.S Directory Properties: stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/amd64/gen/setjmp.S ============================================================================== --- stable/9/lib/libc/amd64/gen/setjmp.S Fri Dec 30 18:16:15 2011 (r229007) +++ stable/9/lib/libc/amd64/gen/setjmp.S Fri Dec 30 18:18:06 2011 (r229008) @@ -54,6 +54,7 @@ ENTRY(setjmp) movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ leaq 72(%rcx),%rdx /* 9,10; (sigset_t*)oset */ + /* stack is 16-byte aligned */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi movq %rdi,%rcx @@ -81,7 +82,9 @@ ENTRY(__longjmp) movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ movq $0,%rdx /* (sigset_t*)oset */ + subq $0x8,%rsp /* make the stack 16-byte aligned */ call PIC_PLT(CNAME(_sigprocmask)) + addq $0x8,%rsp popq %rsi popq %rdi /* jmpbuf */ movq %rdi,%rdx Modified: stable/9/lib/libc/amd64/gen/sigsetjmp.S ============================================================================== --- stable/9/lib/libc/amd64/gen/sigsetjmp.S Fri Dec 30 18:16:15 2011 (r229007) +++ stable/9/lib/libc/amd64/gen/sigsetjmp.S Fri Dec 30 18:18:06 2011 (r229008) @@ -62,6 +62,7 @@ ENTRY(sigsetjmp) movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ leaq 72(%rcx),%rdx /* 9,10 (sigset_t*)oset */ + /* stack is 16-byte aligned */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi 2: movq %rdi,%rcx @@ -90,7 +91,9 @@ ENTRY(__siglongjmp) movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ movq $0,%rdx /* (sigset_t*)oset */ + subq $0x8,%rsp /* make the stack 16-byte aligned */ call PIC_PLT(CNAME(_sigprocmask)) + addq $0x8,%rsp popq %rsi popq %rdi /* jmpbuf */ 2: movq %rdi,%rdx