From owner-svn-src-head@FreeBSD.ORG  Fri Jun 18 11:10:41 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03EB0106566C;
	Fri, 18 Jun 2010 11:10:41 +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 E78E28FC1A;
	Fri, 18 Jun 2010 11:10:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5IBAeui038766;
	Fri, 18 Jun 2010 11:10:40 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5IBAeSt038734;
	Fri, 18 Jun 2010 11:10:40 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201006181110.o5IBAeSt038734@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 18 Jun 2010 11:10:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209295 - head/lib/csu/i386-elf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jun 2010 11:10:41 -0000

Author: kib
Date: Fri Jun 18 11:10:39 2010
New Revision: 209295
URL: http://svn.freebsd.org/changeset/base/209295

Log:
  Add unwind annotations to the asm part of crt1 on i386. Terminate the
  process with SIGTRAP if _start1() unexpectedly returns.
  
  Reviewed by:	kan
  MFC after:	2 weeks

Modified:
  head/lib/csu/i386-elf/crt1_s.S

Modified: head/lib/csu/i386-elf/crt1_s.S
==============================================================================
--- head/lib/csu/i386-elf/crt1_s.S	Fri Jun 18 11:09:51 2010	(r209294)
+++ head/lib/csu/i386-elf/crt1_s.S	Fri Jun 18 11:10:39 2010	(r209295)
@@ -30,15 +30,22 @@
 	.align	4
 	.globl	_start
 	.type	_start, @function
-_start:	xorl	%ebp,%ebp
+_start:
+	.cfi_startproc
+	xorl	%ebp,%ebp
 	pushl	%ebp
+	.cfi_def_cfa_offset 4
 	movl	%esp,%ebp
+	.cfi_offset %ebp,-8
+	.cfi_def_cfa_register %ebp
 	andl	$0xfffffff0,%esp # align stack
 	leal	8(%ebp),%eax
 	pushl	%eax		# argv
 	pushl	4(%ebp)		# argc
 	pushl	%edx		# rtld cleanup
 	call	_start1
+	int3
+	.cfi_endproc
 	.size	_start, . - _start
 
 	.ident	"$FreeBSD$"