[src/netbsd-7]: src Pull up following revision(s) (requested by martin in tic...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/614fb85f6b3d
branches:  netbsd-7
changeset: 799044:614fb85f6b3d
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Mar 04 09:45:27 2015 +0000

description:
Pull up following revision(s) (requested by martin in ticket #556):
        sys/arch/shark/conf/Makefile.shark.inc: revision 1.24
Put -fno-unwind-tables into CFLAGS instead of COPTS - the old version caused
DEFCOPTS not to be propagated into COPTS, which means no optimization
for the kernel - ooops!

diffstat:

 doc/CHANGES-7.0                        |  9 ++++++++-
 sys/arch/shark/conf/Makefile.shark.inc |  4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 6cb43e32f475 -r 614fb85f6b3d doc/CHANGES-7.0
--- a/doc/CHANGES-7.0   Tue Mar 03 08:35:00 2015 +0000
+++ b/doc/CHANGES-7.0   Wed Mar 04 09:45:27 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.217 2015/03/03 08:35:00 snj Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.218 2015/03/04 09:49:16 snj Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -17503,3 +17503,10 @@
        machine_cpu=<xxx> tags.
        [mrg, ticket #559]
 
+sys/arch/shark/conf/Makefile.shark.inc         1.24
+
+       Put -fno-unwind-tables into CFLAGS instead of COPTS - the old
+       version caused DEFCOPTS to not be propagated into COPTS, which
+       meant there was no optimization for the kernel.
+       [martin, ticket #556]
+
diff -r 6cb43e32f475 -r 614fb85f6b3d sys/arch/shark/conf/Makefile.shark.inc
--- a/sys/arch/shark/conf/Makefile.shark.inc    Tue Mar 03 08:35:00 2015 +0000
+++ b/sys/arch/shark/conf/Makefile.shark.inc    Wed Mar 04 09:45:27 2015 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile.shark.inc,v 1.19 2013/08/22 20:03:15 martin Exp $
+#      $NetBSD: Makefile.shark.inc,v 1.19.4.1 2015/03/04 09:45:27 snj Exp $
 
 CPPFLAGS+=             -D${MACHINE}
-COPTS+=                        -fno-unwind-tables
+CFLAGS+=               -fno-unwind-tables
 GENASSYM_EXTRAS+=      ${THISARM}/shark/genassym.cf
 
 # Need to convert the kernel from ELF to a.out so that OpenFirmware