[src/netbsd-6-0]: src/sys/arch/mvmeppc/stand Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/ead8ee2403f7
branches:  netbsd-6-0
changeset: 774864:ead8ee2403f7
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Sep 23 14:27:23 2013 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #955):
        sys/arch/mvmeppc/stand/libsa/Makefile.inc: revision 1.2
        sys/arch/mvmeppc/stand/Makefile.booters: revision 1.13
        sys/arch/mvmeppc/stand/libsa/Makefile: revision 1.11
Explicitly link srt0.o (Standalone RunTime startup code) first.
Taken from the similar fix of mvme68k:
http://mail-index.netbsd.org/source-changes/2013/09/21/msg047819.html
MVME PROM requires raw binaries (by objcopy -O binary) so we have to
make sure the entry point is located at the first address of the binaries.
The original changes to switch to using MI libsa is:
http://mail-index.netbsd.org/source-changes/2011/01/02/msg016563.html
Should be pulled up to netbsd-6 branches.
(though untested since there seems no users of mvmeppc)

diffstat:

 sys/arch/mvmeppc/stand/Makefile.booters   |  4 +++-
 sys/arch/mvmeppc/stand/libsa/Makefile     |  6 ++++--
 sys/arch/mvmeppc/stand/libsa/Makefile.inc |  4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 487d064d93c1 -r ead8ee2403f7 sys/arch/mvmeppc/stand/Makefile.booters
--- a/sys/arch/mvmeppc/stand/Makefile.booters   Mon Sep 23 14:22:25 2013 +0000
+++ b/sys/arch/mvmeppc/stand/Makefile.booters   Mon Sep 23 14:27:23 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.booters,v 1.12 2011/01/22 19:19:20 joerg Exp $
+#      $NetBSD: Makefile.booters,v 1.12.16.1 2013/09/23 14:27:23 riz Exp $
 
 S?=            ${.CURDIR}/../../../..
 MDEC_DIR?=     /usr/mdec
@@ -56,6 +56,8 @@
 LIBSA=         ${LIBSA_DIR}/lib/sa/libsa.a
 LIBKERN=       ${LIBSA_DIR}/lib/kern/libkern.a
 
+SRTOBJ?= ${LIBSA_DIR}/srt0.o
+
 #WRTVID_BOOT_DIR=  ${.CURDIR}/../wrtvid
 #WRTVID_DIR!=  cd ${WRTVID_BOOT_DIR} && ${PRINTOBJDIR}
 #WRTVID=${WRTVID_DIR}/wrtvid
diff -r 487d064d93c1 -r ead8ee2403f7 sys/arch/mvmeppc/stand/libsa/Makefile
--- a/sys/arch/mvmeppc/stand/libsa/Makefile     Mon Sep 23 14:22:25 2013 +0000
+++ b/sys/arch/mvmeppc/stand/libsa/Makefile     Mon Sep 23 14:27:23 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2011/01/02 09:40:52 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.10.20.1 2013/09/23 14:27:23 riz Exp $
 
 S!= cd ${.CURDIR}/../../../..; pwd
 
@@ -32,7 +32,9 @@
 
 LIBS= ${LIBSA} ${LIBKERN}
 
-all realall: ${LIBS}
+CLEANFILES+=   srt0.o
+
+all realall: ${LIBS} srt0.o
 
 cleandir distclean: .WAIT cleanlibdir
  
diff -r 487d064d93c1 -r ead8ee2403f7 sys/arch/mvmeppc/stand/libsa/Makefile.inc
--- a/sys/arch/mvmeppc/stand/libsa/Makefile.inc Mon Sep 23 14:22:25 2013 +0000
+++ b/sys/arch/mvmeppc/stand/libsa/Makefile.inc Mon Sep 23 14:27:23 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2011/01/02 09:40:52 tsutsui Exp $
+#      $NetBSD: Makefile.inc,v 1.1.22.1 2013/09/23 14:27:23 riz Exp $
 
 S!= cd ${SA_EXTRADIR}/../../../..; pwd
 
@@ -7,7 +7,7 @@
 
 SRC_sa= dev_net.c
 
-SRC_here= srt0.S bugsyscalls.S exec_mvme.c parse_args.c getchar.c putchar.c
+SRC_here= bugsyscalls.S exec_mvme.c parse_args.c getchar.c putchar.c
 SRC_here+= if_bug.c clock.c
 
 SRCS+= ${SRC_sa} ${SRC_here}