[src/netbsd-6]: src Pull up the following revisions(s) (requested by nakayama...

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

details:   https://anonhg.NetBSD.org/src/rev/843e1b205fad
branches:  netbsd-6
changeset: 773882:843e1b205fad
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Mon Mar 05 20:59:25 2012 +0000

description:
Pull up the following revisions(s) (requested by nakayama in ticket #85):
        sys/arch/sparc64/sparc64/locore.s:      revision 1.340
        doc/HACKS:                              revision 1.123
        sys/arch/sparc64/conf/Makefile.sparc64: revision 1.71
        sys/arch/sparc64/conf/files.sparc64:    revision 1.138

Fix the root cause of the hack "disable optimizations for uvm_bio.c
on 32 bit kernels".

diffstat:

 doc/HACKS                              |  15 +--------------
 sys/arch/sparc64/conf/Makefile.sparc64 |   7 +------
 sys/arch/sparc64/conf/files.sparc64    |   5 +----
 sys/arch/sparc64/sparc64/locore.s      |   5 ++++-
 4 files changed, 7 insertions(+), 25 deletions(-)

diffs (94 lines):

diff -r 7e202b4e2c49 -r 843e1b205fad doc/HACKS
--- a/doc/HACKS Mon Mar 05 20:32:53 2012 +0000
+++ b/doc/HACKS Mon Mar 05 20:59:25 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.122 2011/12/24 05:05:55 tsutsui Exp $
+# $NetBSD: HACKS,v 1.122.2.1 2012/03/05 20:59:25 sborrill Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -609,19 +609,6 @@
        kcah
 
 
-port   sparc64
-
-       hack    disable optimzations for uvm_bio.c on 32 bit kernels
-       cdate   Sun Mar 21 14:14:04 MET 2004
-       who     martin
-       file    sys/arch/sparc64/conf/Makefile.sparc64 : 1.53-1.54
-       file    sys/arch/sparc64/conf/files.sparc64 : 1.93
-       descr
-               The sparc compiler miscompiles uvm_bio.c when using
-               any optimization. This results in ubc_release panics.
-       kcah
-
-
 port   mips
 
        hack    mips-shared-linker-load-address
diff -r 7e202b4e2c49 -r 843e1b205fad sys/arch/sparc64/conf/Makefile.sparc64
--- a/sys/arch/sparc64/conf/Makefile.sparc64    Mon Mar 05 20:32:53 2012 +0000
+++ b/sys/arch/sparc64/conf/Makefile.sparc64    Mon Mar 05 20:59:25 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sparc64,v 1.70 2011/01/17 18:11:10 joerg Exp $
+#      $NetBSD: Makefile.sparc64,v 1.70.12.1 2012/03/05 20:59:25 sborrill Exp $
 
 #=========================================================================
 #
@@ -57,7 +57,6 @@
 # 64-bit kernels
 CPPFLAGS+=     -D_LP64 -Wa,-Av9a
 AFLAGS+=       -Wa,-Av9a
-CC_NOOPT=      ${NORMAL_C}
 .if defined(PROF)
 # Profiling is only supported in the medium low memory model.
 CFLAGS+=       -mcmodel=medlow
@@ -69,10 +68,6 @@
 # 32-bit kernels
 CPPFLAGS+=     -m32 -Wa,-Av8plusa -mcpu=ultrasparc
 AFLAGS+=       -Wa,-Av8plusa
-# XXX
-# The sparc gcc version 3.3.3 (NetBSD nb1 20040301) does not compile this
-# file properly with higher optimizations
-CC_NOOPT=      ${NORMAL_C:C/-O./-O0/}
 .endif
 CFLAGS+=       -mno-fpu
 AFLAGS+=       -x assembler-with-cpp
diff -r 7e202b4e2c49 -r 843e1b205fad sys/arch/sparc64/conf/files.sparc64
--- a/sys/arch/sparc64/conf/files.sparc64       Mon Mar 05 20:32:53 2012 +0000
+++ b/sys/arch/sparc64/conf/files.sparc64       Mon Mar 05 20:59:25 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.sparc64,v 1.136 2011/10/04 10:35:33 nakayama Exp $
+#      $NetBSD: files.sparc64,v 1.136.8.1 2012/03/05 20:59:25 sborrill Exp $
 
 # @(#)files.sparc64    8.1 (Berkeley) 7/19/93
 # sparc64-specific configuration info
@@ -294,8 +294,5 @@
 
 include "arch/sparc64/conf/majors.sparc64"
 
-# special compiler settings (no optimization if 32bit kernel)
-file   uvm/uvm_bio.c compile-with "${CC_NOOPT}"
-
 # OpenFirmware convenience stuff
 file  dev/ofw/ofw_subr.c
diff -r 7e202b4e2c49 -r 843e1b205fad sys/arch/sparc64/sparc64/locore.s
--- a/sys/arch/sparc64/sparc64/locore.s Mon Mar 05 20:32:53 2012 +0000
+++ b/sys/arch/sparc64/sparc64/locore.s Mon Mar 05 20:59:25 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.338 2011/09/04 12:17:13 nakayama Exp $    */
+/*     $NetBSD: locore.s,v 1.338.8.1 2012/03/05 20:59:25 sborrill Exp $        */
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -5527,6 +5527,9 @@
  */
 ENTRY(pseg_get_real)
 !      flushw                  ! Make sure we don't have stack probs & lose hibits of %o
+#ifndef _LP64
+       clruw   %o1                                     ! Zero extend
+#endif
        ldx     [%o0 + PM_PHYS], %o2                    ! pmap->pm_segs
 
        srax    %o1, HOLESHIFT, %o3                     ! Check for valid address