Module Name: src
Committed By: nakayama
Date: Sat Mar 3 03:21:17 UTC 2012
Modified Files:
src/doc: HACKS
src/sys/arch/sparc64/conf: Makefile.sparc64 files.sparc64
Log Message:
The hack has been resolved in the revision 1.340 of
sys/arch/sparc64/sparc64/locore.s.
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/doc/HACKS
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.137 -r1.138 src/sys/arch/sparc64/conf/files.sparc64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.122 src/doc/HACKS:1.123
--- src/doc/HACKS:1.122 Sat Dec 24 05:05:55 2011
+++ src/doc/HACKS Sat Mar 3 03:21:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.122 2011/12/24 05:05:55 tsutsui Exp $
+# $NetBSD: HACKS,v 1.123 2012/03/03 03:21:16 nakayama Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -609,19 +609,6 @@ port sparc
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
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.70 src/sys/arch/sparc64/conf/Makefile.sparc64:1.71
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.70 Mon Jan 17 18:11:10 2011
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Mar 3 03:21:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.70 2011/01/17 18:11:10 joerg Exp $
+# $NetBSD: Makefile.sparc64,v 1.71 2012/03/03 03:21:16 nakayama Exp $
#=========================================================================
#
@@ -57,7 +57,6 @@ CPPFLAGS+= -Dsparc64 -D__sparc64__
# 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 @@ CFLAGS+= -mcmodel=medlow
# 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
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.137 src/sys/arch/sparc64/conf/files.sparc64:1.138
--- src/sys/arch/sparc64/conf/files.sparc64:1.137 Sat Feb 18 15:56:30 2012
+++ src/sys/arch/sparc64/conf/files.sparc64 Sat Mar 3 03:21:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.137 2012/02/18 15:56:30 christos Exp $
+# $NetBSD: files.sparc64,v 1.138 2012/03/03 03:21:16 nakayama Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -295,8 +295,5 @@ file dev/md_root.c memory_disk_hooks
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
