From owner-svn-src-all@FreeBSD.ORG  Sat Jan 19 22:08:17 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3EC09F54;
 Sat, 19 Jan 2013 22:08:17 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 315451D9;
 Sat, 19 Jan 2013 22:08:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0JM8HIJ006827;
 Sat, 19 Jan 2013 22:08:17 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0JM8GZa006825;
 Sat, 19 Jan 2013 22:08:16 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201301192208.r0JM8GZa006825@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sat, 19 Jan 2013 22:08:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245675 - head/sys/conf
X-SVN-Group: head
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.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jan 2013 22:08:17 -0000

Author: andrew
Date: Sat Jan 19 22:08:16 2013
New Revision: 245675
URL: http://svnweb.freebsd.org/changeset/base/245675

Log:
  When DDB is enabled and we are building for the ARM EABI include the unwind
  tables in the kernel.

Modified:
  head/sys/conf/Makefile.arm
  head/sys/conf/ldscript.arm

Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm	Sat Jan 19 21:57:25 2013	(r245674)
+++ head/sys/conf/Makefile.arm	Sat Jan 19 22:08:16 2013	(r245675)
@@ -41,6 +41,8 @@ STRIP_FLAGS = -S
 
 .if empty(DDB_ENABLED)
 CFLAGS += -mno-apcs-frame
+.elif defined(WITH_ARM_EABI)
+CFLAGS += -funwind-tables
 .endif
 
 SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader ${LDFLAGS} \

Modified: head/sys/conf/ldscript.arm
==============================================================================
--- head/sys/conf/ldscript.arm	Sat Jan 19 21:57:25 2013	(r245674)
+++ head/sys/conf/ldscript.arm	Sat Jan 19 22:08:16 2013	(r245675)
@@ -56,6 +56,18 @@ SECTIONS
   .init          : { *(.init)	} =0x9090
   .plt      : { *(.plt)	}
 
+  _extab_start = .;
+  PROVIDE(extab_start = .);
+  .ARM.extab : { *(.ARM.extab) }
+  _extab.end = .;
+  PROVIDE(extab_end = .);
+
+  _exidx_start = .;
+  PROVIDE(exidx_start = .);
+  .ARM.exidx : { *(.ARM.exidx) }
+  _exidx_end = .;
+  PROVIDE(exidx_end = .);
+
   /* Adjust the address for the data segment.  We want to adjust up to
      the same address within the page on the next page up.  */
   . = ALIGN(0x1000) + (. & (0x1000 - 1)) ;