CVS commit: src/sys/arch/mvmeppc/stand/boot
Module Name:src
Committed By: dholland
Date: Sat Jun 11 06:34:00 UTC 2016
Modified Files:
src/sys/arch/mvmeppc/stand/boot: boot.c
Log Message:
PR 51200 gets in libsa considered harmful: use kgets
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mvmeppc/stand/boot/boot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvmeppc/stand/boot/boot.c
diff -u src/sys/arch/mvmeppc/stand/boot/boot.c:1.6 src/sys/arch/mvmeppc/stand/boot/boot.c:1.7
--- src/sys/arch/mvmeppc/stand/boot/boot.c:1.6 Wed Aug 6 13:55:08 2014
+++ src/sys/arch/mvmeppc/stand/boot/boot.c Sat Jun 11 06:34:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.6 2014/08/06 13:55:08 joerg Exp $ */
+/* $NetBSD: boot.c,v 1.7 2016/06/11 06:34:00 dholland Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@ main(void)
for (;;) {
if (ask) {
printf("boot: ");
- gets(line);
+ kgets(line, sizeof(line));
if (strcmp(line, "halt") == 0)
break;
CVS commit: src/sys/arch/mvmeppc/stand/libsa
Module Name:src Committed By: joerg Date: Thu Aug 7 13:56:57 UTC 2014 Modified Files: src/sys/arch/mvmeppc/stand/libsa: srt0.S Log Message: Use cmpw. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mvmeppc/stand/libsa/srt0.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mvmeppc/stand/libsa/srt0.S diff -u src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.4 src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.5 --- src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.4 Wed Jan 19 09:03:15 2011 +++ src/sys/arch/mvmeppc/stand/libsa/srt0.S Thu Aug 7 13:56:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.S,v 1.4 2011/01/19 09:03:15 he Exp $ */ +/* $NetBSD: srt0.S,v 1.5 2014/08/07 13:56:57 joerg Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -94,7 +94,7 @@ ENTRY(_start) sub %r15,%r14,%r13 /* Our size, in bytes */ mflr %r16 /* Get address we were loaded to */ subi %r16,%r16,0x4 /* Correct for branch */ - cmp %cr0,%r13,%r16 /* Do we need to relocate? */ + cmpw %r13,%r16 /* Do we need to relocate? */ beq _ASM_LABEL(clrbss) /* No relocation necessary */ li %r17,0x4 bgt 1f /* Relocate using forward copy? */
CVS commit: src/sys/arch/mvmeppc/stand/boot
Module Name:src
Committed By: joerg
Date: Wed Aug 6 13:55:08 UTC 2014
Modified Files:
src/sys/arch/mvmeppc/stand/boot: boot.c
Log Message:
Give non-standard main in a freestanding environment a prototype.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvmeppc/stand/boot/boot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvmeppc/stand/boot/boot.c
diff -u src/sys/arch/mvmeppc/stand/boot/boot.c:1.5 src/sys/arch/mvmeppc/stand/boot/boot.c:1.6
--- src/sys/arch/mvmeppc/stand/boot/boot.c:1.5 Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mvmeppc/stand/boot/boot.c Wed Aug 6 13:55:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.5 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: boot.c,v 1.6 2014/08/06 13:55:08 joerg Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -77,6 +77,8 @@ struct mvmeppc_bootinfo bootinfo;
static u_int32_t ioctrl2cflag(u_int32_t);
+void main(void);
+
void
main(void)
{
CVS commit: src/sys/arch/mvmeppc/stand
Module Name:src
Committed By: tsutsui
Date: Sat Sep 21 08:40:37 UTC 2013
Modified Files:
src/sys/arch/mvmeppc/stand: Makefile.booters
src/sys/arch/mvmeppc/stand/libsa: Makefile Makefile.inc
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mvmeppc/stand/Makefile.booters
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvmeppc/stand/libsa/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mvmeppc/stand/libsa/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvmeppc/stand/Makefile.booters
diff -u src/sys/arch/mvmeppc/stand/Makefile.booters:1.12 src/sys/arch/mvmeppc/stand/Makefile.booters:1.13
--- src/sys/arch/mvmeppc/stand/Makefile.booters:1.12 Sat Jan 22 19:19:20 2011
+++ src/sys/arch/mvmeppc/stand/Makefile.booters Sat Sep 21 08:40:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.12 2011/01/22 19:19:20 joerg Exp $
+# $NetBSD: Makefile.booters,v 1.13 2013/09/21 08:40:37 tsutsui Exp $
S?= ${.CURDIR}/../../../..
MDEC_DIR?= /usr/mdec
@@ -56,6 +56,8 @@ LIBSA_DIR!= cd ${LIB_SA_DIR} && ${PRINTO
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
Index: src/sys/arch/mvmeppc/stand/libsa/Makefile
diff -u src/sys/arch/mvmeppc/stand/libsa/Makefile:1.10 src/sys/arch/mvmeppc/stand/libsa/Makefile:1.11
--- src/sys/arch/mvmeppc/stand/libsa/Makefile:1.10 Sun Jan 2 09:40:52 2011
+++ src/sys/arch/mvmeppc/stand/libsa/Makefile Sat Sep 21 08:40:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/01/02 09:40:52 tsutsui Exp $
+# $NetBSD: Makefile,v 1.11 2013/09/21 08:40:37 tsutsui Exp $
S!= cd ${.CURDIR}/../../../..; pwd
@@ -32,7 +32,9 @@ LIBKERN= ${KERNLIB}
LIBS= ${LIBSA} ${LIBKERN}
-all realall: ${LIBS}
+CLEANFILES+= srt0.o
+
+all realall: ${LIBS} srt0.o
cleandir distclean: .WAIT cleanlibdir
Index: src/sys/arch/mvmeppc/stand/libsa/Makefile.inc
diff -u src/sys/arch/mvmeppc/stand/libsa/Makefile.inc:1.1 src/sys/arch/mvmeppc/stand/libsa/Makefile.inc:1.2
--- src/sys/arch/mvmeppc/stand/libsa/Makefile.inc:1.1 Sun Jan 2 09:40:52 2011
+++ src/sys/arch/mvmeppc/stand/libsa/Makefile.inc Sat Sep 21 08:40:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/01/02 09:40:52 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/09/21 08:40:37 tsutsui Exp $
S!= cd ${SA_EXTRADIR}/../../../..; pwd
@@ -7,7 +7,7 @@ S!= cd ${SA_EXTRADIR}/../../../..; pwd
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}
CVS commit: src/sys/arch/mvmeppc/stand/libsa
Module Name:src Committed By: he Date: Wed Jan 19 09:03:15 UTC 2011 Modified Files: src/sys/arch/mvmeppc/stand/libsa: bugsyscalls.S srt0.S Log Message: Prefix register names with %, apparently now required to build. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mvmeppc/stand/libsa/bugsyscalls.S cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mvmeppc/stand/libsa/srt0.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mvmeppc/stand/libsa/bugsyscalls.S diff -u src/sys/arch/mvmeppc/stand/libsa/bugsyscalls.S:1.2 src/sys/arch/mvmeppc/stand/libsa/bugsyscalls.S:1.3 --- src/sys/arch/mvmeppc/stand/libsa/bugsyscalls.S:1.2 Mon Apr 28 20:23:30 2008 +++ src/sys/arch/mvmeppc/stand/libsa/bugsyscalls.S Wed Jan 19 09:03:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bugsyscalls.S,v 1.2 2008/04/28 20:23:30 martin Exp $ */ +/* $NetBSD: bugsyscalls.S,v 1.3 2011/01/19 09:03:15 he Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include -#define BSYS(num) addi r10,0,num ; sc +#define BSYS(num) addi %r10,0,num ; sc /* @@ -60,8 +60,8 @@ */ ENTRY(bugsys_instat) BSYS(0x0002) - li r4,0x8 - and r3,r3,r4 + li %r4,0x8 + and %r3,%r3,%r4 blr /* @@ -74,8 +74,8 @@ */ ENTRY(bugsys_dskrd) BSYS(0x0010) - li r4,0x8 - and r3,r3,r4 + li %r4,0x8 + and %r3,%r3,%r4 blr /* @@ -88,8 +88,8 @@ */ ENTRY(bugsys_dskwr) BSYS(0x0011) - li r4,0x8 - and r3,r3,r4 + li %r4,0x8 + and %r3,%r3,%r4 blr /* @@ -102,8 +102,8 @@ */ ENTRY(bugsys_netio) BSYS(0x001d) - li r4,0x8 - and r3,r3,r4 + li %r4,0x8 + and %r3,%r3,%r4 blr /* Index: src/sys/arch/mvmeppc/stand/libsa/srt0.S diff -u src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.3 src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.4 --- src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.3 Tue Mar 2 21:52:33 2010 +++ src/sys/arch/mvmeppc/stand/libsa/srt0.S Wed Jan 19 09:03:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.S,v 1.3 2010/03/02 21:52:33 matt Exp $ */ +/* $NetBSD: srt0.S,v 1.4 2011/01/19 09:03:15 he Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -46,122 +46,122 @@ * have to relocate ourselves to the appropriate place. * The firmware passes us the following registers: * - *r1 -> Temporary stack - *r3 -> Residual Data - *r4 -> The address we were loaded to - *r5 -> Zero + *%r1 -> Temporary stack + *%r3 -> Residual Data + *%r4 -> The address we were loaded to + *%r5 -> Zero * * 2) We were booted over the network in Non-PReP mode. In this case, * the load address is usually set using PPC-Bug's "niot" command, * but we won't depend on it so relocation may be required. The * firmware passes us the following registers: * - *r1 -> Temporary stack - *r3 -> CLUN of the network device we booted from - *r4 -> DLUN of the network device we booted from - *r5 -> Non-zero - *r6 -> Base address of network device - *r7 -> Execution address of loaded program - *r8 -> Address of IP-address data structure - *r9 -> Pointer to start of filename string - *r10 -> Pointer to end+1 of filename string - *r11 -> Pointer to start of argument string - *r12 -> Pointer to end+1 of argument string + *%r1 -> Temporary stack + *%r3 -> CLUN of the network device we booted from + *%r4 -> DLUN of the network device we booted from + *%r5 -> Non-zero + *%r6 -> Base address of network device + *%r7 -> Execution address of loaded program + *%r8 -> Address of IP-address data structure + *%r9 -> Pointer to start of filename string + *%r10 -> Pointer to end+1 of filename string + *%r11 -> Pointer to start of argument string + *%r12 -> Pointer to end+1 of argument string * * The obvious way to distinguish between the two boot modes is by - * checking the value of r5. + * checking the value of %r5. */ ENTRY(_start) bl 1f -1: xor r0,r0,r0 +1: xor %r0,%r0,%r0 /* First, switch off Instruction and Data caches. */ - mfspr r13,SPR_HID0 - LDCONST(r14, HID0_DCE|HID0_ICE) - andc r13,r13,r14 + mfspr %r13,SPR_HID0 + LDCONST(%r14, HID0_DCE|HID0_ICE) + andc %r13,%r13,%r14 sync - mtspr SPR_HID0,r13 + mtspr SPR_HID0,%r13 /* * All registers now available. Let's see if we need to relocate */ - LDCONST(r13,_C_LABEL(_start)) /* Where we'd like to be */ - LDCONST(r14,_C_LABEL(edata)) /* End of data section */ - LDCONST(r15,0x3) - add r14,r14,r15 - andc r14,r14,r15 /* Rounded up to the nearest 32-bits */ - sub r15,r14,r13 /* Our size, in bytes */ - mflr r16 /* Get address we were loaded to */ - subi r16,r16,0x4 /* Correct for branch */ - cmp cr0,r13,r16 /* Do we need to relocate? */ + LDCONST(%r13,_C_LABEL(_start)) /* Where we'd
CVS commit: src/sys/arch/mvmeppc/stand
Module Name:src
Committed By: tsutsui
Date: Sun Jan 2 09:40:52 UTC 2011
Modified Files:
src/sys/arch/mvmeppc/stand: Makefile.booters
src/sys/arch/mvmeppc/stand/boot: Makefile
src/sys/arch/mvmeppc/stand/libsa: Makefile
Added Files:
src/sys/arch/mvmeppc/stand/libsa: Makefile.inc
Log Message:
Switch mvmeppc bootloader to using MI libsa and libkern for maintainability.
Mostly taken from mvme68k.
Compile test only, but no functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvmeppc/stand/Makefile.booters
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mvmeppc/stand/boot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mvmeppc/stand/libsa/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/mvmeppc/stand/libsa/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvmeppc/stand/Makefile.booters
diff -u src/sys/arch/mvmeppc/stand/Makefile.booters:1.10 src/sys/arch/mvmeppc/stand/Makefile.booters:1.11
--- src/sys/arch/mvmeppc/stand/Makefile.booters:1.10 Thu Dec 24 16:41:01 2009
+++ src/sys/arch/mvmeppc/stand/Makefile.booters Sun Jan 2 09:40:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.10 2009/12/24 16:41:01 tsutsui Exp $
+# $NetBSD: Makefile.booters,v 1.11 2011/01/02 09:40:51 tsutsui Exp $
S?= ${.CURDIR}/../../../..
MDEC_DIR?= /usr/mdec
@@ -53,18 +53,8 @@
LIB_SA_DIR= ${.CURDIR}/../libsa
LIBSA_DIR!= cd ${LIB_SA_DIR} && ${PRINTOBJDIR}
-LIBSA=${LIBSA_DIR}/libsa.a
-
-.PHONY: ${LIBSA}
-${LIBSA}:
- @echo making sure libsa is up to date...
- @cd ${LIB_SA_DIR} && ${MAKE}
-
-SRTOBJ?= ${LIBSA_DIR}/srt0.o
-.PHONY: ${SRTOBJ}
-${SRTOBJ}:
- @echo making sure srt0 is up to date...
- @cd ${LIB_SA_DIR} && ${MAKE} srt0.o
+LIBSA= ${LIBSA_DIR}/lib/sa/libsa.a
+LIBKERN= ${LIBSA_DIR}/lib/kern/libkern.a
#WRTVID_BOOT_DIR= ${.CURDIR}/../wrtvid
#WRTVID_DIR!= cd ${WRTVID_BOOT_DIR} && ${PRINTOBJDIR}
Index: src/sys/arch/mvmeppc/stand/boot/Makefile
diff -u src/sys/arch/mvmeppc/stand/boot/Makefile:1.4 src/sys/arch/mvmeppc/stand/boot/Makefile:1.5
--- src/sys/arch/mvmeppc/stand/boot/Makefile:1.4 Sun Dec 11 12:18:20 2005
+++ src/sys/arch/mvmeppc/stand/boot/Makefile Sun Jan 2 09:40:51 2011
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/12/11 12:18:20 christos Exp $
+# $NetBSD: Makefile,v 1.5 2011/01/02 09:40:51 tsutsui Exp $
SRCS= boot.c conf.c devopen.c
PROG= boot.elf
-LIBS= ${LIBSA}
+LIBS= ${LIBSA} ${LIBKERN}
DPADD= ${LIBS}
CLEANFILES+= boot.bin
Index: src/sys/arch/mvmeppc/stand/libsa/Makefile
diff -u src/sys/arch/mvmeppc/stand/libsa/Makefile:1.9 src/sys/arch/mvmeppc/stand/libsa/Makefile:1.10
--- src/sys/arch/mvmeppc/stand/libsa/Makefile:1.9 Tue Mar 16 01:46:38 2010
+++ src/sys/arch/mvmeppc/stand/libsa/Makefile Sun Jan 2 09:40:52 2011
@@ -1,27 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2010/03/16 01:46:38 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2011/01/02 09:40:52 tsutsui Exp $
-LIB=sa
-
-# Logically src/sys
-DIR_SA=$S/lib/libsa
-DIR_KERN=$S/lib/libkern
-
-SRC_net= nfs.c rpc.c net.c ether.c arp.c ip_cksum.c netif.c \
- bootparam.c rarp.c dev_net.c bootp.c
-
-
-SRC_sa = alloc.c memcpy.c memset.c close.c exit.c files.c getfile.c gets.c \
- open.c printf.c read.c strerror.c ufs.c globals.c lseek.c panic.c \
- closeall.c dev.c dkcksum.c nullfs.c fstat.c twiddle.c sprintf.c \
- subr_prf.c intoa.c udp.c memcmp.c loadfile.c loadfile_aout.c \
- loadfile_elf32.c dev_net.c ether_sprintf.c snprintf.c strncmp.c
-
-SRC_kern= ashldi3.c ashrdi3.c strcmp.c strlen.c strncpy.c inet_addr.c
-
-SRC_here= srt0.S bugsyscalls.S exec_mvme.c parse_args.c getchar.c putchar.c
-SRC_here+= if_bug.c clock.c
-
-SRCS= ${SRC_net} ${SRC_sa} ${SRC_kern} ${SRC_here}
+S!= cd ${.CURDIR}/../../../..; pwd
# DBG= -DDEBUG -DNETIF_DEBUG -DNFS_DEBUG -DRPC_DEBUG \
# -DNET_DEBUG -DRARP_DEBUG -DETHER_DEBUG
@@ -34,15 +13,28 @@
CPPFLAGS+= -DSUPPORT_NFS -DNFS_NOSYMLINK
.include "../Makefile.booters"
-.include "${S}/../common/lib/libc/Makefile.inc"
-
-.PATH: ${DIR_SA} ${DIR_KERN}
# only needed during build
libinstall::
-all realall: lib${LIB}.a
+.include
-.include
-.undef DESTDIR
-.include
+### find out what to use for libsa
+SA_AS= library
+SAMISCMAKEFLAGS= SA_USE_LOADFILE=yes SA_EXTRADIR=${.CURDIR}
+.include "${S}/lib/libsa/Makefile.inc"
+LIBSA= ${SALIB}
+
+### find out what to use for libkern
+KERN_AS= library
+.include "${S}/lib/libkern/Makefile.inc"
+LIBKERN= ${KERNLIB}
+
+LIBS= ${LIBSA} ${LIBKERN}
+
+all realall: ${LIBS}
+
+cleandir distclean: .WAIT cleanlibdir
+
+cleanlibdir:
+ rm -rf lib
Added files:
Index: src/sys/arch/mvmeppc/stand/libsa/Makefile.inc
diff -u /dev/null src/sys/arch/mvmeppc/stand/libsa/Makefile.inc:1.1
--- /dev/null Sun Jan 2 09:40:52 2011
+++ src/sys/arch/mvmeppc/stand/libsa/Makefile.inc Sun Jan 2 09:40:52 2011
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile.inc,v 1.1 2011/01/02 09:40:52 tsutsui Exp $
+
+S!= cd ${SA_EXTRADIR}/../../../..
CVS commit: src/sys/arch/mvmeppc/stand/libsa
Module Name:src Committed By: mrg Date: Tue Mar 16 01:46:39 UTC 2010 Modified Files: src/sys/arch/mvmeppc/stand/libsa: Makefile Log Message: include strncpy.c, like mvme68k libsa/Makefile rev 1.32. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvmeppc/stand/libsa/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mvmeppc/stand/libsa/Makefile diff -u src/sys/arch/mvmeppc/stand/libsa/Makefile:1.8 src/sys/arch/mvmeppc/stand/libsa/Makefile:1.9 --- src/sys/arch/mvmeppc/stand/libsa/Makefile:1.8 Sun Dec 13 08:36:01 2009 +++ src/sys/arch/mvmeppc/stand/libsa/Makefile Tue Mar 16 01:46:38 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2009/12/13 08:36:01 tsutsui Exp $ +# $NetBSD: Makefile,v 1.9 2010/03/16 01:46:38 mrg Exp $ LIB=sa @@ -14,7 +14,7 @@ open.c printf.c read.c strerror.c ufs.c globals.c lseek.c panic.c \ closeall.c dev.c dkcksum.c nullfs.c fstat.c twiddle.c sprintf.c \ subr_prf.c intoa.c udp.c memcmp.c loadfile.c loadfile_aout.c \ - loadfile_elf32.c dev_net.c ether_sprintf.c snprintf.c + loadfile_elf32.c dev_net.c ether_sprintf.c snprintf.c strncmp.c SRC_kern= ashldi3.c ashrdi3.c strcmp.c strlen.c strncpy.c inet_addr.c
CVS commit: src/sys/arch/mvmeppc/stand
Module Name:src
Committed By: tsutsui
Date: Thu Dec 24 16:41:01 UTC 2009
Modified Files:
src/sys/arch/mvmeppc/stand: Makefile.booters
Log Message:
Use to create machine and ${MACHINE_CPU} symlinks.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mvmeppc/stand/Makefile.booters
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvmeppc/stand/Makefile.booters
diff -u src/sys/arch/mvmeppc/stand/Makefile.booters:1.9 src/sys/arch/mvmeppc/stand/Makefile.booters:1.10
--- src/sys/arch/mvmeppc/stand/Makefile.booters:1.9 Sun Dec 13 08:32:57 2009
+++ src/sys/arch/mvmeppc/stand/Makefile.booters Thu Dec 24 16:41:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.9 2009/12/13 08:32:57 tsutsui Exp $
+# $NetBSD: Makefile.booters,v 1.10 2009/12/24 16:41:01 tsutsui Exp $
S?= ${.CURDIR}/../../../..
MDEC_DIR?= /usr/mdec
@@ -35,15 +35,7 @@
${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.CURDIR}/version "mvmeppc"
.endif
-CLEANFILES+= machine powerpc
-
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
- @rm -f machine && \
- ln -s $S/arch/${MACHINE}/include machine
- @rm -f ${MACHINE_CPU} && \
- ln -s $S/arch/${MACHINE_CPU}/include ${MACHINE_CPU}
-.endif
+.include
.if defined(LIB)
CVS commit: src/sys/arch/mvmeppc/stand/libsa
Module Name:src
Committed By: tsutsui
Date: Sun Dec 13 08:36:01 UTC 2009
Modified Files:
src/sys/arch/mvmeppc/stand/libsa: Makefile
Log Message:
Put srt0.S to SRCS, not in dependencies for target all.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mvmeppc/stand/libsa/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvmeppc/stand/libsa/Makefile
diff -u src/sys/arch/mvmeppc/stand/libsa/Makefile:1.7 src/sys/arch/mvmeppc/stand/libsa/Makefile:1.8
--- src/sys/arch/mvmeppc/stand/libsa/Makefile:1.7 Thu Mar 19 10:19:33 2009
+++ src/sys/arch/mvmeppc/stand/libsa/Makefile Sun Dec 13 08:36:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/03/19 10:19:33 tsutsui Exp $
+# $NetBSD: Makefile,v 1.8 2009/12/13 08:36:01 tsutsui Exp $
LIB=sa
@@ -18,7 +18,7 @@
SRC_kern= ashldi3.c ashrdi3.c strcmp.c strlen.c strncpy.c inet_addr.c
-SRC_here= bugsyscalls.S exec_mvme.c parse_args.c getchar.c putchar.c
+SRC_here= srt0.S bugsyscalls.S exec_mvme.c parse_args.c getchar.c putchar.c
SRC_here+= if_bug.c clock.c
SRCS= ${SRC_net} ${SRC_sa} ${SRC_kern} ${SRC_here}
@@ -33,8 +33,6 @@
#CPPFLAGS+= -DSUPPORT_RARP -DSUPPORT_BOOTPARAM
CPPFLAGS+= -DSUPPORT_NFS -DNFS_NOSYMLINK
-CLEANFILES+= srt0.o
-
.include "../Makefile.booters"
.include "${S}/../common/lib/libc/Makefile.inc"
@@ -43,7 +41,7 @@
# only needed during build
libinstall::
-all realall: lib${LIB}.a srt0.o
+all realall: lib${LIB}.a
.include
.undef DESTDIR
CVS commit: src/sys/arch/mvmeppc/stand
Module Name:src
Committed By: tsutsui
Date: Sun Dec 13 08:32:57 UTC 2009
Modified Files:
src/sys/arch/mvmeppc/stand: Makefile.booters
Log Message:
Pull a fix from mvme68k:
Create machine and ${MACHINE_CPU} symlinks properly and
remove unnecessary dependencies so that parallel build works.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvmeppc/stand/Makefile.booters
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvmeppc/stand/Makefile.booters
diff -u src/sys/arch/mvmeppc/stand/Makefile.booters:1.8 src/sys/arch/mvmeppc/stand/Makefile.booters:1.9
--- src/sys/arch/mvmeppc/stand/Makefile.booters:1.8 Fri Apr 3 10:38:13 2009
+++ src/sys/arch/mvmeppc/stand/Makefile.booters Sun Dec 13 08:32:57 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.8 2009/04/03 10:38:13 tsutsui Exp $
+# $NetBSD: Makefile.booters,v 1.9 2009/12/13 08:32:57 tsutsui Exp $
S?= ${.CURDIR}/../../../..
MDEC_DIR?= /usr/mdec
@@ -38,22 +38,16 @@
CLEANFILES+= machine powerpc
.if !make(obj) && !make(clean) && !make(cleandir)
-.NOPATH: machine powerpc
-.BEGIN: machine powerpc
-
-machine :
- -rm -f ${.TARGET}
- ln -s $S/arch/mvmeppc/include machine
-
-powerpc :
- -rm -f ${.TARGET}
- ln -s $S/arch/powerpc/include powerpc
+.BEGIN:
+ @rm -f machine && \
+ ln -s $S/arch/${MACHINE}/include machine
+ @rm -f ${MACHINE_CPU} && \
+ ln -s $S/arch/${MACHINE_CPU}/include ${MACHINE_CPU}
.endif
.if defined(LIB)
-lib${LIB}.a:: machine powerpc ${OBJS}
-beforedepend: machine powerpc
+lib${LIB}.a:: ${OBJS}
.else
