svn commit: r245675 - head/sys/conf

[Andrew Turner]

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)) ;