--- distrib/sets/lists/base/md.prep 11 Aug 2013 22:29:02 -0000 1.16 +++ distrib/sets/lists/base/md.prep 29 Aug 2013 03:14:44 -0000 @@ -5,3 +5,104 @@ ./usr/mdec/installboot base-obsolete obsolete ./usr/mdec/mkbootimage base-sysutil-bin ./usr/sbin/eeprom base-sysutil-bin +./usr/lib/libbind9.so.6 +./usr/lib/libbind9.so.6.0 +./usr/lib/libdns.so.6 +./usr/lib/libdns.so.6.0 +./usr/lib/libisc.so.6 +./usr/lib/libisc.so.6.0 +./usr/lib/libisccc.so.6 +./usr/lib/libisccc.so.6.0 +./usr/lib/libisccfg.so.6 +./usr/lib/libisccfg.so.6.0 +./usr/lib/liblwres.so.6 +./usr/lib/liblwres.so.6.0 +./usr/libdata/lint/llib-larchive.ln +./usr/libdata/lint/llib-lasn1.ln +./usr/libdata/lint/llib-lbind9.ln +./usr/libdata/lint/llib-lbluetooth.ln +./usr/libdata/lint/llib-lbsdmalloc.ln +./usr/libdata/lint/llib-lbz2.ln +./usr/libdata/lint/llib-lc.ln +./usr/libdata/lint/llib-lcom_err.ln +./usr/libdata/lint/llib-lcompat.ln +./usr/libdata/lint/llib-lcrypt.ln +./usr/libdata/lint/llib-lcrypto.ln +./usr/libdata/lint/llib-lcurses.ln +./usr/libdata/lint/llib-ldes.ln +./usr/libdata/lint/llib-ldm.ln +./usr/libdata/lint/llib-ldns.ln +./usr/libdata/lint/llib-ldns_sd.ln +./usr/libdata/lint/llib-ldwarf.ln +./usr/libdata/lint/llib-ledit.ln +./usr/libdata/lint/llib-lelf.ln +./usr/libdata/lint/llib-levent.ln +./usr/libdata/lint/llib-levent_openssl.ln +./usr/libdata/lint/llib-levent_pthreads.ln +./usr/libdata/lint/llib-lexecinfo.ln +./usr/libdata/lint/llib-lexpat.ln +./usr/libdata/lint/llib-lfetch.ln +./usr/libdata/lint/llib-lform.ln +./usr/libdata/lint/llib-lgnumalloc.ln +./usr/libdata/lint/llib-lgssapi.ln +./usr/libdata/lint/llib-lheimbase.ln +./usr/libdata/lint/llib-lintl.ln +./usr/libdata/lint/llib-lipsec.ln +./usr/libdata/lint/llib-lisc.ln +./usr/libdata/lint/llib-lisccc.ln +./usr/libdata/lint/llib-lisccfg.ln +./usr/libdata/lint/llib-liscsi.ln +./usr/libdata/lint/llib-lisns.ln +./usr/libdata/lint/llib-lkdc.ln +./usr/libdata/lint/llib-lkvm.ln +./usr/libdata/lint/llib-ll.ln +./usr/libdata/lint/llib-llber.ln +./usr/libdata/lint/llib-lldap.ln +./usr/libdata/lint/llib-lldap_r.ln +./usr/libdata/lint/llib-llua.ln +./usr/libdata/lint/llib-llwres.ln +./usr/libdata/lint/llib-llzf.ln +./usr/libdata/lint/llib-lm.ln +./usr/libdata/lint/llib-lmagic.ln +./usr/libdata/lint/llib-lmenu.ln +./usr/libdata/lint/llib-lmj.ln +./usr/libdata/lint/llib-lnetpgp.ln +./usr/libdata/lint/llib-lnetpgpverify.ln +./usr/libdata/lint/llib-lnpf.ln +./usr/libdata/lint/llib-lossaudio.ln +./usr/libdata/lint/llib-lp2k.ln +./usr/libdata/lint/llib-lpam.ln +./usr/libdata/lint/llib-lpcap.ln +./usr/libdata/lint/llib-lpci.ln +./usr/libdata/lint/llib-lperfuse.ln +./usr/libdata/lint/llib-lposix.ln +./usr/libdata/lint/llib-lppath.ln +./usr/libdata/lint/llib-lprop.ln +./usr/libdata/lint/llib-lpthread.ln +./usr/libdata/lint/llib-lpthread_dbg.ln +./usr/libdata/lint/llib-lpuffs.ln +./usr/libdata/lint/llib-lquota.ln +./usr/libdata/lint/llib-lradius.ln +./usr/libdata/lint/llib-lrefuse.ln +./usr/libdata/lint/llib-lresolv.ln +./usr/libdata/lint/llib-lrmt.ln +./usr/libdata/lint/llib-lroken.ln +./usr/libdata/lint/llib-lrpcsvc.ln +./usr/libdata/lint/llib-lrt.ln +./usr/libdata/lint/llib-lrumpclient.ln +./usr/libdata/lint/llib-lrumphijack.ln +./usr/libdata/lint/llib-lrumpuser.ln +./usr/libdata/lint/llib-lsaslc.ln +./usr/libdata/lint/llib-lskey.ln +./usr/libdata/lint/llib-lsqlite3.ln +./usr/libdata/lint/llib-lssh.ln +./usr/libdata/lint/llib-lssl.ln +./usr/libdata/lint/llib-lstdc.ln +./usr/libdata/lint/llib-lterminfo.ln +./usr/libdata/lint/llib-ltre.ln +./usr/libdata/lint/llib-lukfs.ln +./usr/libdata/lint/llib-lusbhid.ln +./usr/libdata/lint/llib-lutil.ln +./usr/libdata/lint/llib-lwrap.ln +./usr/libdata/lint/llib-ly.ln +./usr/libdata/lint/llib-lz.ln Index: distrib/sets/lists/man/mi =================================================================== RCS file: /cvs/cvsroot/src/distrib/sets/lists/man/mi,v retrieving revision 1.1435 diff -u -r1.1435 mi --- distrib/sets/lists/man/mi 11 Aug 2013 22:29:03 -0000 1.1435 +++ distrib/sets/lists/man/mi 29 Aug 2013 03:14:44 -0000 @@ -8818,3 +8818,15 @@ ./usr/share/man/man8/zzz.8 man-sysutil-man .man ./usr/share/man/man9/boot.9 man-obsolete obsolete ./usr/share/man/style.css man-mdocml-htmlman html +./usr/share/man/html8/amd64/boot_console.html +./usr/share/man/html8/amd64/bootselect.html +./usr/share/man/html8/amd64/dosboot.html +./usr/share/man/html8/amd64/mbr.html +./usr/share/man/html8/amd64/multiboot.html +./usr/share/man/html8/amd64/pxeboot.html +./usr/share/man/man8/amd64/boot_console.8 +./usr/share/man/man8/amd64/bootselect.8 +./usr/share/man/man8/amd64/dosboot.8 +./usr/share/man/man8/amd64/mbr.8 +./usr/share/man/man8/amd64/multiboot.8 +./usr/share/man/man8/amd64/pxeboot.8 Index: etc/etc.prep/Makefile.inc =================================================================== RCS file: /cvs/cvsroot/src/etc/etc.prep/Makefile.inc,v retrieving revision 1.9 diff -u -r1.9 Makefile.inc --- etc/etc.prep/Makefile.inc 18 Mar 2008 04:20:37 -0000 1.9 +++ etc/etc.prep/Makefile.inc 29 Aug 2013 03:14:45 -0000 @@ -8,7 +8,7 @@ KERNEL_SETS= GENERIC -BUILD_KERNELS= INSTALL INSTALL_SMALL +BUILD_KERNELS= INSTALL INSTALL_SMALL PREP INSTALLATION_DIRS+= installation/floppy Index: lib/libc/arch/powerpc/string/bzero.S =================================================================== RCS file: /cvs/cvsroot/src/lib/libc/arch/powerpc/string/bzero.S,v retrieving revision 1.12 diff -u -r1.12 bzero.S --- lib/libc/arch/powerpc/string/bzero.S 18 Jul 2013 12:20:41 -0000 1.12 +++ lib/libc/arch/powerpc/string/bzero.S 29 Aug 2013 03:14:57 -0000 @@ -1,4 +1,4 @@ -/* $NetBSD: bzero.S,v 1.12 2013/07/18 12:20:41 matt Exp $ */ +/* $NetBSD: bzero.S,v 1.11 2011/01/29 02:21:20 matt Exp $ */ /*- * Copyright (C) 2001 Martin J. Laubach @@ -32,7 +32,7 @@ #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: bzero.S,v 1.12 2013/07/18 12:20:41 matt Exp $") +__RCSID("$NetBSD: bzero.S,v 1.11 2011/01/29 02:21:20 matt Exp $") #endif /* LIBC_SCCS && !lint */ #ifdef _KERNEL @@ -76,21 +76,17 @@ /* First find out cache line size */ mflr %r9 #ifdef PIC - bcl 20,31,1f -1: mflr %r5 + PIC_GOTSETUP(%r10) mtlr %r9 - addis %r5,%r5,cache_info+4-1b@ha - lwzu %r9,cache_info+4-1b@l(%r5) + lwz %r5,cache_info@got(%r10) #else - lis %r5,cache_info+4@ha - lwzu %r9,cache_info+4@l(%r5) + lis %r5,cache_info@h + ori %r5,%r5,cache_info@l #endif - lwz %r10,cache_sh-(cache_info+4)(%r5) - cmpwi %r9, -1 + lwz %r6, 4(%r5) + cmpwi %r6, -1 bne+ cb_cacheline_known - addi %r5, %r5, -4 /* point r5 @ beginning of cache_info */ - /*----------------------------------------------------------------------*/ #define CTL_MACHDEP 7 #define CPU_CACHELINE 1 @@ -176,25 +172,33 @@ cntlzw %r6, %r9 /* compute shift value */ li %r5, 31 - subf %r10, %r6, %r5 + subf %r5, %r6, %r5 #ifdef PIC mflr %r9 - bcl 20,31,1f -1: mflr %r5 + PIC_GOTSETUP(%r10) mtlr %r9 - - addis %r5, %r5, cache_info+4-1b@ha - lwzu %r9, cache_info+4-1b@l(%r5) + lwz %r6, cache_sh@got(%r10) + stw %r5, 0(%r6) #else - lis %r5, cache_info+4@ha - lwzu %r9, cache_info+4@l(%r5) + lis %r6, cache_sh@ha + stw %r5, cache_sh@l(%r6) #endif - stw %r10, cache_sh-(cache_info+4)(%r5) - /*----------------------------------------------------------------------*/ /* Okay, we know the cache line size (%r9) and shift value (%r10) */ cb_cacheline_known: +#ifdef PIC + lwz %r5, cache_info@got(%r10) + lwz %r9, 4(%r5) + lwz %r5, cache_sh@got(%r10) + lwz %r10, 0(%r5) +#else + lis %r9, cache_info+4@ha + lwz %r9, cache_info+4@l(%r9) + lis %r10, cache_sh@ha + lwz %r10, cache_sh@l(%r10) +#endif + #else /* _KERNEL */ #ifdef MULTIPROCESSOR mfsprg %r10, 0 /* Get cpu_info pointer */ @@ -367,7 +371,6 @@ /*----------------------------------------------------------------------*/ #ifndef _KERNEL .data - .p2align 2 cache_info: .long -1, -1, -1, -1 cache_sh: .long 0 Index: sys/arch/powerpc/oea/oea_machdep.c =================================================================== RCS file: /cvs/cvsroot/src/sys/arch/powerpc/oea/oea_machdep.c,v retrieving revision 1.65 diff -u -r1.65 oea_machdep.c --- sys/arch/powerpc/oea/oea_machdep.c 4 Jul 2013 22:59:27 -0000 1.65 +++ sys/arch/powerpc/oea/oea_machdep.c 29 Aug 2013 03:14:59 -0000 @@ -95,6 +95,9 @@ */ static void trap0(void *); +/* to align struct battable in x 0000, suggested by kiyohara@ */ +__asm ( " .section .bss\n" + " .align 4\n"); /* XXXSL: The battable is not initialized to non-zero for PPC_OEA64 and PPC_OEA64_BRIDGE */ struct bat battable[BAT_VA2IDX(0xffffffff)+1]; Index: sys/arch/prep/stand/boot/inkernel.c =================================================================== RCS file: /cvs/cvsroot/src/sys/arch/prep/stand/boot/inkernel.c,v retrieving revision 1.9 diff -u -r1.9 inkernel.c --- sys/arch/prep/stand/boot/inkernel.c 28 Apr 2008 20:23:33 -0000 1.9 +++ sys/arch/prep/stand/boot/inkernel.c 29 Aug 2013 03:14:59 -0000 @@ -43,10 +43,22 @@ extern char _start[], _edata[]; char *p = (char *)(ladr + (_edata - _start)); u_int i; + u_long sp; for (i = 0; i < 4096; i++, p++) { if (memcmp(p, prep_magic, PREP_MAGICSIZE) == 0) { kern_len = *(int *)(p + PREP_MAGICSIZE); + /* check compressed kernel size against stack */ + asm("mr %0,%%r1" : "=r"(sp)); + if( (KERNENTRY