6659940 ON makefiles use wrong options for Sun Studio 12 compiler and lint.

6751897 usr/src/tools/cw.c needs to be updated for Sun Studio 12 switchover.

57 files changed, 152 insertions, 264 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index c18554113b..44a608d038 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -23,9 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #
 # Makefile.master, global definitions for system source
 #
@@ -326,10 +323,10 @@ CCUNBOUND	= $($(MACH)_CCUNBOUND)
 #
 # compiler '-xarch' flag. This is here to centralize it and make it
 # overridable for testing.
-sparc_XARCH=		-xarch=v8
-sparcv9_XARCH=		-xarch=v9
+sparc_XARCH=	-m32
+sparcv9_XARCH=	-m64
 i386_XARCH=
-amd64_XARCH=		-xarch=amd64 -Ui386 -U__i386
+amd64_XARCH=	-m64 -Ui386 -U__i386
 
 # assembler '-xarch' flag.  Different from compiler '-xarch' flag.
 sparc_AS_XARCH=		-xarch=v8plus
@@ -347,8 +344,7 @@ amd64_AS_XARCH=		-xarch=amd64 -P -Ui386 -U__i386
 sparc_STAND_FLAGS=	-_gcc=-ffreestanding
 sparcv9_STAND_FLAGS=	-_gcc=-ffreestanding
 i386_STAND_FLAGS=	-_gcc=-ffreestanding
-amd64_STAND_FLAGS=	-Wu,-xmodel=kernel
-$(__SSNEXT)amd64_STAND_FLAGS=	-xmodel=kernel
+amd64_STAND_FLAGS=	-xmodel=kernel
 
 SAVEARGS=		-Wu,-save_args
 amd64_STAND_FLAGS	+= $(SAVEARGS)
@@ -674,7 +670,7 @@ NATIVE_MACH=	$(MACH:amd64=i386)
 # Defined here so it can be overridden by developer.
 #
 SPRO_ROOT=		$(BUILD_TOOLS)/SUNWspro
-SPRO_VROOT=		$(SPRO_ROOT)/SS11
+SPRO_VROOT=		$(SPRO_ROOT)/SS12
 GNU_ROOT=		$(SFW_ROOT)
 
 # Specify platform compiler versions for languages
diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd
index 96620e53b8..610a3ad6e9 100644
--- a/usr/src/cmd/Makefile.cmd
+++ b/usr/src/cmd/Makefile.cmd
@@ -141,7 +141,7 @@ LDFLAGS.cmd = \
 LDFLAGS =	$(LDFLAGS.cmd)
 
 LINTFLAGS=	-axsm
-LINTFLAGS64=	-axsm -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64=	-axsm -m64
 LINTOUT=	lint.out
 
 KRB5PROG=	$(PROG:%=$(KRB5BIN)/%)
diff --git a/usr/src/cmd/fps/fptest/Makefile b/usr/src/cmd/fps/fptest/Makefile
index b234f933a9..e162173500 100644
--- a/usr/src/cmd/fps/fptest/Makefile
+++ b/usr/src/cmd/fps/fptest/Makefile
@@ -20,8 +20,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 include ../../Makefile.cmd
 include ../../Makefile.cmd.64
 
@@ -43,7 +41,7 @@ SUNPERF = $(SPRO_VROOT)/prod/lib
 
 SUNPV9B = $(SUNPERF)/v9b
 SUNPV9  = $(SUNPERF)/v9
-VISARCH = -xarch=v9b
+VISARCH = -m64 -xarch=sparcvis2
 
 CHIP = -xchip=ultra3
 
diff --git a/usr/src/cmd/gcore/sparcv9/Makefile b/usr/src/cmd/gcore/sparcv9/Makefile
index 12aa0a08b7..8b029159c0 100644
--- a/usr/src/cmd/gcore/sparcv9/Makefile
+++ b/usr/src/cmd/gcore/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,9 +19,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # cmd/gcore/sparcv9/Makefile
@@ -41,7 +38,7 @@ CFLAGS64	+= $(CCVERBOSE)
 
 LDLIBS	+= -lproc
 
-lint	:= LINTFLAGS64 = -x -Xarch=v9
+lint	:= LINTFLAGS64 = -x -m64
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/mdb/demo/Makefile.amd64 b/usr/src/cmd/mdb/demo/Makefile.amd64
index e2255e9cc9..ac1f2e51b6 100644
--- a/usr/src/cmd/mdb/demo/Makefile.amd64
+++ b/usr/src/cmd/mdb/demo/Makefile.amd64
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,18 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 CC = cc
 LINT = lint
 
-CFLAGS = -xarch=amd64
+CFLAGS = -m64
 CPPFLAGS =
 LDFLAGS =
 LIBS =
 
-LINTFLAGS = -Xarch=amd64
+LINTFLAGS = -m64
 
 include ../Makefile.common
diff --git a/usr/src/cmd/mdb/demo/Makefile.sparcv9 b/usr/src/cmd/mdb/demo/Makefile.sparcv9
index 8bffe3bf47..ac1f2e51b6 100644
--- a/usr/src/cmd/mdb/demo/Makefile.sparcv9
+++ b/usr/src/cmd/mdb/demo/Makefile.sparcv9
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,18 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 CC = cc
 LINT = lint
 
-CFLAGS = -xarch=v9
+CFLAGS = -m64
 CPPFLAGS =
 LDFLAGS =
 LIBS =
 
-LINTFLAGS = -Xarch=v9
+LINTFLAGS = -m64
 
 include ../Makefile.common
diff --git a/usr/src/cmd/modload/sparcv9/Makefile b/usr/src/cmd/modload/sparcv9/Makefile
index 64972d6537..a3610e0581 100644
--- a/usr/src/cmd/modload/sparcv9/Makefile
+++ b/usr/src/cmd/modload/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../Makefile.cmd.64
 
-lint	:= LINTFLAGS64 = $(LINTFLAGS) -Xarch=v9
+lint	:= LINTFLAGS64 = $(LINTFLAGS) -m64
 
 install: all $(ROOTUSRSBINPROG64)
diff --git a/usr/src/cmd/nohup/sparcv9/Makefile b/usr/src/cmd/nohup/sparcv9/Makefile
index ec26a54026..352466ea48 100644
--- a/usr/src/cmd/nohup/sparcv9/Makefile
+++ b/usr/src/cmd/nohup/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,8 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # cmd/nohup/sparcv9/Makefile
 #
@@ -31,6 +28,6 @@
 include ../Makefile.com
 include ../../Makefile.cmd.64
 
-lint := LINTFLAGS64 = $(LINTFLAGS) -Xarch=v9
+lint := LINTFLAGS64 = $(LINTFLAGS) -m64
 
 install: all $(ROOTPROG64)
diff --git a/usr/src/cmd/plimit/sparcv9/Makefile b/usr/src/cmd/plimit/sparcv9/Makefile
index 69861b1b84..3119a50c4c 100644
--- a/usr/src/cmd/plimit/sparcv9/Makefile
+++ b/usr/src/cmd/plimit/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # cmd/plimit/sparcv9/Makefile
 #
 
@@ -41,7 +38,7 @@ CFLAGS64	+= $(CCVERBOSE)
 
 LDLIBS	+= -lproc
 
-lint	:= LINTFLAGS64 = -x -Xarch=v9
+lint	:= LINTFLAGS64 = -x -m64
 
 CPPFLAGS += -D_LARGEFILE64_SOURCE=1
 
diff --git a/usr/src/cmd/ppgsz/sparcv9/Makefile b/usr/src/cmd/ppgsz/sparcv9/Makefile
index 3c4fd15b95..fd0677f807 100644
--- a/usr/src/cmd/ppgsz/sparcv9/Makefile
+++ b/usr/src/cmd/ppgsz/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # cmd/ppgsz/sparcv9/Makefile
 #
 
@@ -41,7 +38,7 @@ CFLAGS64	+= $(CCVERBOSE) -D_SYSCALL32
 
 LDLIBS	+= -lproc
 
-lint	:= LINTFLAGS64 = -x -Xarch=v9 -D_SYSCALL32
+lint	:= LINTFLAGS64 = -x -m64 -D_SYSCALL32
 
 CPPFLAGS += -D_LARGEFILE64_SOURCE=1
 
diff --git a/usr/src/cmd/ps/sparcv9/Makefile b/usr/src/cmd/ps/sparcv9/Makefile
index f79fcca445..aaa2f3ee7a 100644
--- a/usr/src/cmd/ps/sparcv9/Makefile
+++ b/usr/src/cmd/ps/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # cmd/ps/sparcv9/Makefile
 #
 
@@ -33,7 +30,7 @@ include ../../Makefile.cmd.64
 
 CFLAGS64	+= $(CCVERBOSE)
 
-lint	:= LINTFLAGS64 = -x -Xarch=v9
+lint	:= LINTFLAGS64 = -x -m64
 
 all: $(PROG)
 
diff --git a/usr/src/cmd/sgs/Makefile.var b/usr/src/cmd/sgs/Makefile.var
index 85e3dffdc6..0de498eaa9 100644
--- a/usr/src/cmd/sgs/Makefile.var
+++ b/usr/src/cmd/sgs/Makefile.var
@@ -23,8 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 # The link-editor related source files and Makefile files are normally unified
 # across all presently maintained release gates.  However, some of the compiler
@@ -110,7 +108,7 @@
 #
 VAR_CPPFLAGS=
 
-VAR_LINTFLAGS64=	-Xarch=$(MACH64:sparcv9=v9)
+VAR_LINTFLAGS64=	-m64
 VAR_I386_ARCH=		intel
 
 VAR_PLAT_sparc=		sparc
diff --git a/usr/src/cmd/sgs/ar/Makefile.com b/usr/src/cmd/sgs/ar/Makefile.com
index 3d5a20c05d..150baddead 100644
--- a/usr/src/cmd/sgs/ar/Makefile.com
+++ b/usr/src/cmd/sgs/ar/Makefile.com
@@ -22,8 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 PROG=		ar
 XPG4PROG=	ar
@@ -45,7 +43,7 @@ C99MODE=	$(C99_ENABLE)
 
 LDLIBS +=	-lelf
 LINTFLAGS=	-mx
-LINTFLAGS64=	-mx -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64=	-mx -m64
 
 SED=		sed
 
diff --git a/usr/src/cmd/sgs/nm/amd64/Makefile b/usr/src/cmd/sgs/nm/amd64/Makefile
index b2c3e0d454..129d878c7d 100644
--- a/usr/src/cmd/sgs/nm/amd64/Makefile
+++ b/usr/src/cmd/sgs/nm/amd64/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 PROG=		nm
 
@@ -43,7 +41,7 @@ INCLIST=	-I../../include -I../../include/i386 \
 		-I$(SRCBASE)/uts/$(ARCH)/sys
 CPPFLAGS=	$(INCLIST) $(DEFLIST) $(CPPFLAGS.master)
 LDLIBS +=	$(CONVLIBDIR64) $(CONV_LIB) $(ELFLIBDIR) -lelf
-LINTFLAGS64 +=	-x $(LDLIBS) -Xarch=amd64
+LINTFLAGS64 +=	-x $(LDLIBS) -m64
 LINTSRCS=	$(SRCS)
 CLEANFILES +=	$(LINTOUTS)
 
diff --git a/usr/src/cmd/sgs/nm/sparcv9/Makefile b/usr/src/cmd/sgs/nm/sparcv9/Makefile
index d571df49b3..cfa014abd0 100644
--- a/usr/src/cmd/sgs/nm/sparcv9/Makefile
+++ b/usr/src/cmd/sgs/nm/sparcv9/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # cmd/sgs/nm/sparcv9/Makefile
 #
 
@@ -46,7 +44,7 @@ INCLIST=	-I../../include -I../../include/sparc \
 DEFLIST=	-DTARGET=SPARC -DSPARC=1 -D$(ARFORMAT) -DELF
 CPPFLAGS=	$(INCLIST) $(DEFLIST) $(CPPFLAGS.master)
 LDLIBS +=	$(CONVLIBDIR64) $(CONV_LIB) $(ELFLIBDIR) -lelf
-LINTFLAGS64=	-x $(LDLIBS) -Xarch=v9
+LINTFLAGS64=	-x $(LDLIBS) -m64
 LINTSRCS=	$(SRCS)
 CLEANFILES +=	$(LINTOUTS)
 
diff --git a/usr/src/cmd/truss/sparcv9/Makefile b/usr/src/cmd/truss/sparcv9/Makefile
index d07471e26a..7b63af1110 100644
--- a/usr/src/cmd/truss/sparcv9/Makefile
+++ b/usr/src/cmd/truss/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,8 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1989-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # cmd/truss/sparcv9/Makefile
 #
@@ -31,6 +28,6 @@
 include ../Makefile.com
 include ../../Makefile.cmd.64
 
-lint	:= LINTFLAGS64 = $(LINTFLAGS) -Xarch=v9
+lint	:= LINTFLAGS64 = $(LINTFLAGS) -m64
 
 install: all $(ROOTPROG64)
diff --git a/usr/src/cmd/w/sparcv9/Makefile b/usr/src/cmd/w/sparcv9/Makefile
index 8c055ba431..a712d32558 100644
--- a/usr/src/cmd/w/sparcv9/Makefile
+++ b/usr/src/cmd/w/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # cmd/w/sparcv9/Makefile
 #
 
@@ -39,7 +36,7 @@ include ../../Makefile.cmd.64
 
 CFLAGS64	+= $(CCVERBOSE)
 
-lint	:= LINTFLAGS64 = -x -Xarch=v9
+lint	:= LINTFLAGS64 = -x -m64
 
 ROOTLINK= $(ROOTBIN64)/uptime
 
diff --git a/usr/src/cmd/whodo/sparcv9/Makefile b/usr/src/cmd/whodo/sparcv9/Makefile
index 9240fd0da8..8835ee9eff 100644
--- a/usr/src/cmd/whodo/sparcv9/Makefile
+++ b/usr/src/cmd/whodo/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # cmd/whodo/sparcv9/Makefile
 #
 
@@ -39,7 +36,7 @@ include ../../Makefile.cmd.64
 
 CFLAGS64	+= $(CCVERBOSE)
 
-lint	:= LINTFLAGS64 = -x -Xarch=v9
+lint	:= LINTFLAGS64 = -x -m64
 
 FILEMODE= 04555
 OWNER= root
diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib
index 7c0c965a3c..58c88eff9c 100644
--- a/usr/src/lib/Makefile.lib
+++ b/usr/src/lib/Makefile.lib
@@ -22,9 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #
 # Definitions common to libraries.
 #
@@ -156,7 +153,7 @@ ROOTSFWMAN7=	$(ROOT)/usr/sfw/share/man/man7
 
 LINTLIB=	llib-l$(LIBNAME).ln
 LINTFLAGS=	-uaxm
-LINTFLAGS64=	-uaxm -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64=	-uaxm -m64
 LINTSRC=	$(LINTLIB:%.ln=%)
 LINTOUT=	lint.out
 ARFLAGS=	r
diff --git a/usr/src/lib/fm/libdiagcode/Makefile.com b/usr/src/lib/fm/libdiagcode/Makefile.com
index edb174cecb..6825f867ae 100644
--- a/usr/src/lib/fm/libdiagcode/Makefile.com
+++ b/usr/src/lib/fm/libdiagcode/Makefile.com
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY =	libdiagcode.a
 VERS =		.1
@@ -44,7 +42,7 @@ CFLAGS +=	$(CCVERBOSE)
 
 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 $(LINTLIB) := LINTFLAGS = -nsvx
-$(LINTLIB) := LINTFLAGS64 = -nsvx -Xarch=$(MACH64:sparcv9=v9)
+$(LINTLIB) := LINTFLAGS64 = -nsvx -m64
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/fm/libfmd_adm/Makefile.com b/usr/src/lib/fm/libfmd_adm/Makefile.com
index 250494f315..51a480a2bd 100644
--- a/usr/src/lib/fm/libfmd_adm/Makefile.com
+++ b/usr/src/lib/fm/libfmd_adm/Makefile.com
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY = libfmd_adm.a
 VERS = .1
@@ -46,11 +44,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 LDLIBS += -lnvpair -lnsl -lc
 
 LINTFLAGS = -msux
-LINTFLAGS64 = -msux -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 = -msux -m64
 
 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 $(LINTLIB) := LINTFLAGS = -nsvx
-$(LINTLIB) := LINTFLAGS64 = -nsvx -Xarch=$(MACH64:sparcv9=v9)
+$(LINTLIB) := LINTFLAGS64 = -nsvx -m64
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/fm/libfmd_agent/Makefile.com b/usr/src/lib/fm/libfmd_agent/Makefile.com
index e57f5c1a9c..e9f8f8bc84 100644
--- a/usr/src/lib/fm/libfmd_agent/Makefile.com
+++ b/usr/src/lib/fm/libfmd_agent/Makefile.com
@@ -43,11 +43,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 LDLIBS += -lnvpair -lumem -lc
 
 LINTFLAGS = -msux
-LINTFLAGS64 = -msux -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 = -msux -m64
 
 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 $(LINTLIB) := LINTFLAGS = -nsvx
-$(LINTLIB) := LINTFLAGS64 = -nsvx -Xarch=$(MACH64:sparcv9=v9)
+$(LINTLIB) := LINTFLAGS64 = -nsvx -m64
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/fm/libfmd_log/Makefile.com b/usr/src/lib/fm/libfmd_log/Makefile.com
index c48aff2a87..730ac39336 100644
--- a/usr/src/lib/fm/libfmd_log/Makefile.com
+++ b/usr/src/lib/fm/libfmd_log/Makefile.com
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY = libfmd_log.a
 VERS = .1
@@ -45,11 +43,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 LDLIBS += -lexacct -lnvpair -lgen -lc
 
 LINTFLAGS = -msux
-LINTFLAGS64 = -msux -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 = -msux -m64
 
 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 $(LINTLIB) := LINTFLAGS = -nsvx
-$(LINTLIB) := LINTFLAGS64 = -nsvx -Xarch=$(MACH64:sparcv9=v9)
+$(LINTLIB) := LINTFLAGS64 = -nsvx -m64
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/fm/libfmd_msg/Makefile.com b/usr/src/lib/fm/libfmd_msg/Makefile.com
index 28f18c29a4..f630deaa32 100644
--- a/usr/src/lib/fm/libfmd_msg/Makefile.com
+++ b/usr/src/lib/fm/libfmd_msg/Makefile.com
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY = libfmd_msg.a
 VERS = .1
@@ -45,11 +43,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 LDLIBS += -lc
 
 LINTFLAGS = -msux
-LINTFLAGS64 = -msux -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 = -msux -m64
 
 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 $(LINTLIB) := LINTFLAGS = -nsvx
-$(LINTLIB) := LINTFLAGS64 = -nsvx -Xarch=$(MACH64:sparcv9=v9)
+$(LINTLIB) := LINTFLAGS64 = -nsvx -m64
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/fm/libfmd_snmp/Makefile.com b/usr/src/lib/fm/libfmd_snmp/Makefile.com
index d6e530ba50..b135cf488f 100644
--- a/usr/src/lib/fm/libfmd_snmp/Makefile.com
+++ b/usr/src/lib/fm/libfmd_snmp/Makefile.com
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY = libfmd_snmp.a
 VERS = .1
@@ -62,14 +60,14 @@ LDLIBS += -lc
 DYNFLAGS += -R$(SFWLIBDIR)
 
 LINTFLAGS = -msux
-LINTFLAGS64 = -msux -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 = -msux -m64
 
 # Net-SNMP's headers use do {} while (0) a lot
 LINTCHECKFLAGS += -erroff=E_CONSTANT_CONDITION
 
 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 $(LINTLIB) := LINTFLAGS = -nsvx
-$(LINTLIB) := LINTFLAGS64 = -nsvx -Xarch=$(MACH64:sparcv9=v9)
+$(LINTLIB) := LINTFLAGS64 = -nsvx -m64
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/fm/libldom/Makefile.com b/usr/src/lib/fm/libldom/Makefile.com
index 0f871a4658..daf82120d6 100644
--- a/usr/src/lib/fm/libldom/Makefile.com
+++ b/usr/src/lib/fm/libldom/Makefile.com
@@ -45,11 +45,11 @@ LDLIBS += $(MACH_LDLIBS)
 LDLIBS += -lfmd_agent -lnvpair -lscf -lmdesc -lc
 
 LINTFLAGS = -msux
-LINTFLAGS64 = -msux -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 = -msux -m64
 
 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 $(LINTLIB) := LINTFLAGS = -nsvx -I$(ROOT)/usr/platform/sun4v/include
-$(LINTLIB) := LINTFLAGS64 = -nsvx -Xarch=$(MACH64:sparcv9=v9) \
+$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 \
 	-I$(ROOT)/usr/platform/sun4v/include
 
 .KEEP_STATE:
diff --git a/usr/src/lib/fm/libmdesc/Makefile.com b/usr/src/lib/fm/libmdesc/Makefile.com
index 60581c993b..a282a11a85 100644
--- a/usr/src/lib/fm/libmdesc/Makefile.com
+++ b/usr/src/lib/fm/libmdesc/Makefile.com
@@ -22,8 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY = libmdesc.a
 VERS = .1
@@ -60,7 +58,7 @@ LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -v
 LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN -v
 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 $(LINTLIB) := LINTFLAGS = -nsvx
-$(LINTLIB) := LINTFLAGS64 = -nsvx -Xarch=$(MACH64:sparcv9=v9)
+$(LINTLIB) := LINTFLAGS64 = -nsvx -m64
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/fm/topo/libtopo/Makefile.com b/usr/src/lib/fm/topo/libtopo/Makefile.com
index dfc7af6ca0..170a67dedf 100644
--- a/usr/src/lib/fm/topo/libtopo/Makefile.com
+++ b/usr/src/lib/fm/topo/libtopo/Makefile.com
@@ -22,8 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY = libtopo.a
 VERS = .1
@@ -81,7 +79,7 @@ CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 
 LINTFLAGS = -msux
-LINTFLAGS64 = -msux -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 = -msux -m64
 
 $(DYNLIB)  := LDLIBS += \
 	-lnvpair -lelf -lumem -lxml2 -lkstat -luuid -ldevinfo \
@@ -89,7 +87,7 @@ $(DYNLIB)  := LDLIBS += \
 
 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 $(LINTLIB) := LINTFLAGS = -nsvx
-$(LINTLIB) := LINTFLAGS64 = -nsvx -Xarch=$(MACH64:sparcv9=v9)
+$(LINTLIB) := LINTFLAGS64 = -nsvx -m64
 $(LINTLIB) := LDLIBS += -lnvpair -lumem -lc
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libbsdmalloc/Makefile.com b/usr/src/lib/libbsdmalloc/Makefile.com
index 8057f220ef..d58fd9e383 100644
--- a/usr/src/lib/libbsdmalloc/Makefile.com
+++ b/usr/src/lib/libbsdmalloc/Makefile.com
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libbsdmalloc.a
 VERS=		.1
@@ -41,7 +39,7 @@ LIBS =          $(DYNLIB) $(LINTLIB)
 # definitions for lint
 
 LINTFLAGS =	-uax
-LINTFLAGS64 =	-uax -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 =	-uax -m64
 LINTOUT=	lint.out
 
 LINTSRC=	$(LINTLIB:%.ln=%)
diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index cfeb5c2597..4c7a7ca0ee 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -1088,7 +1088,7 @@ lint:
 
 $(LINTLIB):= SRCS=../port/llib-lc
 $(LINTLIB):= CPPFLAGS += -D_MSE_INT_H
-$(LINTLIB):= LINTFLAGS64=-nvx -Xarch=amd64
+$(LINTLIB):= LINTFLAGS64=-nvx -m64
 
 # object files that depend on inline template
 $(TIL:%=pics/%): $(LIBCBASE)/threads/amd64.il
diff --git a/usr/src/lib/libc/sparcv9/Makefile b/usr/src/lib/libc/sparcv9/Makefile
index 7b8c695699..65bdaa8d49 100644
--- a/usr/src/lib/libc/sparcv9/Makefile
+++ b/usr/src/lib/libc/sparcv9/Makefile
@@ -1130,7 +1130,7 @@ lint:
 
 $(LINTLIB):= SRCS=../port/llib-lc
 $(LINTLIB):= CPPFLAGS += -D_MSE_INT_H
-$(LINTLIB):= LINTFLAGS64=-nvx -Xarch=v9
+$(LINTLIB):= LINTFLAGS64=-nvx -m64
 
 # object files that depend on inline template
 $(TIL:%=pics/%): $(LIBCBASE)/threads/sparcv9.il
diff --git a/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
index deafd15f65..7079ffd707 100644
--- a/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
+++ b/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
@@ -19,12 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #
 # Platform specific Makefile for libc_psr.
 #
diff --git a/usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile
index ff26cf6552..90f6115090 100644
--- a/usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile
+++ b/usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile
@@ -19,12 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #
 # Platform specific Makefile for libc_psr.
 #
diff --git a/usr/src/lib/libfru/Makefile.flag b/usr/src/lib/libfru/Makefile.flag
index 4354aaa059..7588cd66e6 100644
--- a/usr/src/lib/libfru/Makefile.flag
+++ b/usr/src/lib/libfru/Makefile.flag
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # lib/libfru/Makefile.flag
 #
 
 LINTFLAGS =	-uxn
-LINTFLAGS64 =	$(LINTFLAGS) -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 =	$(LINTFLAGS) -m64
 LINTOUT=	lint.out
 LINTSRC =       $(LINTLIB:%.ln=%)
 ROOTLINTDIR =   $(ROOTLIBDIR)
@@ -48,7 +45,7 @@ CLEANFILES +=	pics/lex.fru.cc pics/y.tab.cc pics/y.tab.h
 
 $(LINTLIB) :=	SRCS = ../llib-lfru
 $(LINTLIB) :=	LINTFLAGS = -nvx -I../include
-$(LINTLIB) :=	LINTFLAGS64 = -nvx -Xarch=$(MACH64:sparcv9=v9) -I../include
+$(LINTLIB) :=	LINTFLAGS64 = -nvx -m64 -I../include
 
 CLOBBERFILES +=	$(DYNLIBCCC) libfru.so
 
diff --git a/usr/src/lib/libfru/libfrupicl/Makefile.com b/usr/src/lib/libfru/libfrupicl/Makefile.com
index 39d304c0ee..4ecacb06af 100644
--- a/usr/src/lib/libfru/libfrupicl/Makefile.com
+++ b/usr/src/lib/libfru/libfrupicl/Makefile.com
@@ -19,12 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 
 LIBRARY=	libfrupicl.a
 VERS=		.1
@@ -42,7 +39,7 @@ LIBS =		$(DYNLIB)
 MAPFILES =
 
 LINTFLAGS =	-mnux
-LINTFLAGS64 =	$(LINTFLAGS) -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 =	$(LINTFLAGS) -m64
 LINTOUT=	lint.out
 LINTSRC =       $(LINTLIB:%.ln=%)
 ROOTLINTDIR =   $(ROOTLIBDIR)
@@ -60,7 +57,7 @@ CPPFLAGS += 	-D_REENTRANT
 CFLAGS +=	$(CCVERBOSE)
 
 $(LINTLIB) :=	LINTFLAGS = -nvx -I..
-$(LINTLIB) :=	LINTFLAGS64 = -nvx -Xarch=$(MACH64:sparcv9=v9) -I..
+$(LINTLIB) :=	LINTFLAGS64 = -nvx -m64 -I..
 
 XGETFLAGS += -a
 POFILE=	picl.po
diff --git a/usr/src/lib/libfru/libfrupicltree/Makefile.com b/usr/src/lib/libfru/libfrupicltree/Makefile.com
index 22ca075446..ea099655a9 100644
--- a/usr/src/lib/libfru/libfrupicltree/Makefile.com
+++ b/usr/src/lib/libfru/libfrupicltree/Makefile.com
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libfrupicltree.a
 VERS=		.1
@@ -40,7 +38,7 @@ LIBS =		$(DYNLIB)
 MAPFILES =
 
 LINTFLAGS =	-mnux
-LINTFLAGS64 =	$(LINTFLAGS) -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 =	$(LINTFLAGS) -m64
 LINTOUT=	lint.out
 LINTSRC =       $(LINTLIB:%.ln=%)
 ROOTLINTDIR =   $(ROOTLIBDIR)
@@ -58,7 +56,7 @@ CPPFLAGS += 	-D_REENTRANT
 CFLAGS +=	$(CCVERBOSE)
 
 $(LINTLIB) :=	LINTFLAGS = -nvx -I..
-$(LINTLIB) :=	LINTFLAGS64 = -nvx -Xarch=$(MACH64:sparcv9=v9) -I..
+$(LINTLIB) :=	LINTFLAGS64 = -nvx -m64 -I..
 
 XGETFLAGS += -a
 POFILE=	picl.po
diff --git a/usr/src/lib/libfru/libfrureg/Makefile.com b/usr/src/lib/libfru/libfrureg/Makefile.com
index 243a16d8d1..b377d791be 100644
--- a/usr/src/lib/libfru/libfrureg/Makefile.com
+++ b/usr/src/lib/libfru/libfrureg/Makefile.com
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libfrureg.a
 VERS=		.1
@@ -41,7 +39,7 @@ LIBS =		$(DYNLIB)
 MAPFILES =
 
 LINTFLAGS =	-uxn
-LINTFLAGS64 =	$(LINTFLAGS) -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 =	$(LINTFLAGS) -m64
 LINTOUT=	lint.out
 LINTSRC =       $(LINTLIB:%.ln=%)
 ROOTLINTDIR =   $(ROOTLIBDIR)
@@ -59,7 +57,7 @@ CPPFLAGS += 	-D_REENTRANT
 CFLAGS +=	$(CCVERBOSE)
 
 $(LINTLIB) :=	LINTFLAGS = -nvx -I..
-$(LINTLIB) :=	LINTFLAGS64 = -nvx -Xarch=$(MACH64:sparcv9=v9) -I..
+$(LINTLIB) :=	LINTFLAGS64 = -nvx -m64 -I..
 
 XGETFLAGS += -a
 POFILE=	picl.po
diff --git a/usr/src/lib/libfru/sparcv9/Makefile b/usr/src/lib/libfru/sparcv9/Makefile
index 3f3bc05bff..00e0af18cc 100644
--- a/usr/src/lib/libfru/sparcv9/Makefile
+++ b/usr/src/lib/libfru/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2000-2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # lib/libfru/sparcv9/Makefile
 #
@@ -32,7 +29,7 @@
 include ../Makefile.obj
 include ../../Makefile.lib.64
 include ../Makefile.flag
-LDLIBS += -lc -xarch=v9
+LDLIBS += -lc -m64
 LDLIBS += -L$(SRC)/lib/libfruutils/$(MACH64) -lfruutils
 LDLIBS += -L$(SRC)/lib/libfru/libfrureg/$(MACH64) -lfrureg
 
diff --git a/usr/src/lib/libfruutils/Makefile.com b/usr/src/lib/libfruutils/Makefile.com
index 57e808d073..63bb8347a3 100644
--- a/usr/src/lib/libfruutils/Makefile.com
+++ b/usr/src/lib/libfruutils/Makefile.com
@@ -22,8 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libfruutils.a
 VERS=		.1
@@ -41,7 +39,7 @@ LIBS =		$(DYNLIB)
 MAPFILES =
 
 LINTFLAGS =	-uxn
-LINTFLAGS64 =	$(LINTFLAGS) -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 =	$(LINTFLAGS) -m64
 LINTOUT=	lint.out
 LINTSRC =       $(LINTLIB:%.ln=%)
 ROOTLINTDIR =   $(ROOTLIBDIR)
@@ -53,7 +51,7 @@ CPPFLAGS +=	-I.. -D_REENTRANT
 CFLAGS +=	$(CCVERBOSE)
 
 $(LINTLIB) :=	LINTFLAGS = -nvx
-$(LINTLIB) :=	LINTFLAGS64 = -nvx -Xarch=$(MACH64:sparcv9=v9)
+$(LINTLIB) :=	LINTFLAGS64 = -nvx -m64
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libmd/sun4u/Makefile.com b/usr/src/lib/libmd/sun4u/Makefile.com
index c483e9b540..9fe1ae7d35 100644
--- a/usr/src/lib/libmd/sun4u/Makefile.com
+++ b/usr/src/lib/libmd/sun4u/Makefile.com
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY= libmd_psr.a
 
@@ -32,7 +31,7 @@ include ../../Makefile.com
 
 LIBS= $(DYNLIB)
 
-CFLAGS += -xarch=v8plusa
+CFLAGS += -m32 -xarch=sparcvis
 CPPFLAGS += -D$(PLATFORM) -DVIS_SHA1
 ASFLAGS	= -P $(ASDEFS)
 
diff --git a/usr/src/lib/libmd/sun4u/sparcv9/Makefile b/usr/src/lib/libmd/sun4u/sparcv9/Makefile
index d553a99f5b..9f94a65cad 100644
--- a/usr/src/lib/libmd/sun4u/sparcv9/Makefile
+++ b/usr/src/lib/libmd/sun4u/sparcv9/Makefile
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 CLASS		= 64
 PLATFORM	= sun4u
@@ -39,7 +37,7 @@ OBJECTS		= md5.o sha1.o sha1_asm.o
 MAPFILES =	mapfile
 
 ASDEFS +=	-D__sparcv9
-ASFLAGS	+=	-xarch=v9a $(AS_BIGPICFLAGS)
+ASFLAGS +=	-xarch=v9a $(AS_BIGPICFLAGS)
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
 # and .fini sections being added).
diff --git a/usr/src/lib/libmd/sun4v/Makefile.com b/usr/src/lib/libmd/sun4v/Makefile.com
index bef660abbc..6cef14c4ed 100644
--- a/usr/src/lib/libmd/sun4v/Makefile.com
+++ b/usr/src/lib/libmd/sun4v/Makefile.com
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY= libmd_psr.a
 
@@ -32,7 +31,7 @@ include ../../Makefile.com
 
 LIBS= $(DYNLIB)
 
-CFLAGS += -xarch=v8plusa
+CFLAGS += -m32 -xarch=sparcvis
 CPPFLAGS += -D$(PLATFORM)
 ASFLAGS	= -P $(ASDEFS)
 
diff --git a/usr/src/lib/libmd/sun4v/sparcv9/Makefile b/usr/src/lib/libmd/sun4v/sparcv9/Makefile
index 4596401691..aaa1f90636 100644
--- a/usr/src/lib/libmd/sun4v/sparcv9/Makefile
+++ b/usr/src/lib/libmd/sun4v/sparcv9/Makefile
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 CLASS		= 64
 PLATFORM	= sun4v
@@ -39,7 +37,7 @@ OBJECTS		= md5.o
 MAPFILES =	mapfile
 
 ASDEFS +=	-D__sparcv9
-ASFLAGS	+=	-xarch=v9a $(AS_PICFLAGS)
+ASFLAGS +=	-xarch=v9a $(AS_PICFLAGS)
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
 # and .fini sections being added).
diff --git a/usr/src/lib/libpri/Makefile.com b/usr/src/lib/libpri/Makefile.com
index 997576cd58..e320501b53 100644
--- a/usr/src/lib/libpri/Makefile.com
+++ b/usr/src/lib/libpri/Makefile.com
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY = libpri.a
 VERS = .1
@@ -45,11 +43,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 LDLIBS += -lc
 
 LINTFLAGS = -msux
-LINTFLAGS64 = -msux -Xarch=$(MACH64:sparcv9=v9)
+LINTFLAGS64 = -msux -m64
 
 $(LINTLIB) := SRCS = $(LINTSRC:%=$(SRCDIR)/%)
 $(LINTLIB) := LINTFLAGS = -nsvx -I$(ROOT)/usr/platform/sun4v/include
-$(LINTLIB) := LINTFLAGS64 = -nsvx -Xarch=$(MACH64:sparcv9=v9) \
+$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 \
 	-I$(ROOT)/usr/platform/sun4v/include
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libtsol/Makefile.com b/usr/src/lib/libtsol/Makefile.com
index 1f600d0e16..7fb0da5610 100644
--- a/usr/src/lib/libtsol/Makefile.com
+++ b/usr/src/lib/libtsol/Makefile.com
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY =	libtsol.a
 VERS =		.2
@@ -53,7 +51,7 @@ COMMONDIR=	$(SRC)/common/tsol
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -I$(SRCDIR) -I$(COMMONDIR)
 
-LINTFLAGS64 +=	-Xarch=v9
+LINTFLAGS64 +=	-m64
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/openssl/libcrypto/sparcv9/Makefile b/usr/src/lib/openssl/libcrypto/sparcv9/Makefile
index 3485574e62..d001469588 100644
--- a/usr/src/lib/openssl/libcrypto/sparcv9/Makefile
+++ b/usr/src/lib/openssl/libcrypto/sparcv9/Makefile
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
@@ -41,7 +39,7 @@ MD5_OBJ_ASM=	md5/asm/md5-sparcv9.o
 #	if (0 != 0)
 #		c = buf[-1];
 #
-$(__SSNEXT)CFLAGS64 += -erroff=E_BAD_VAR_ADDRESS_ARITH
+CFLAGS64 += -erroff=E_BAD_VAR_ADDRESS_ARITH
 
 # lint doesn't like asm files
 lint :=	MD5_OBJ_ASM =
diff --git a/usr/src/lib/sasl_plugins/Makefile.com b/usr/src/lib/sasl_plugins/Makefile.com
index 4311d88ccb..231d20fdca 100644
--- a/usr/src/lib/sasl_plugins/Makefile.com
+++ b/usr/src/lib/sasl_plugins/Makefile.com
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 COMMONOBJS=	plugin_common.o
 OBJECTS=	$(PLUG_OBJS) $(COMMONOBJS)
@@ -43,7 +41,7 @@ ROOTLIBDIR=	$(ROOT)/usr/lib/sasl
 ROOTLIBDIR64=	$(ROOT)/usr/lib/sasl/$(MACH64)
 
 LINTFLAGS=	$(ENC_FLAGS)
-LINTFLAGS64=	-Xarch=$(MACH64:sparcv9=v9) $(ENC_FLAGS)
+LINTFLAGS64=	-m64 $(ENC_FLAGS)
 
 CFLAGS +=	$(CCVERBOSE) $(XSTRCONST) $(ENC_FLAGS)
 CFLAGS64 +=	$(XSTRCONST) $(ENC_FLAGS)
diff --git a/usr/src/psm/Makefile.psm.64 b/usr/src/psm/Makefile.psm.64
index db24cc00c7..e52c638189 100644
--- a/usr/src/psm/Makefile.psm.64
+++ b/usr/src/psm/Makefile.psm.64
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # psm/Makefile.psm.64
 #
 #	This makefile contains the compiler fiddling needed to build
@@ -39,4 +36,4 @@ $(SPARC_BLD)ALWAYS_DEFS	+= -D__sparc -D__sparcv9 -D_SYSCALL32_IMPL
 $(SPARC_BLD)AS_DEFS	+= -D__sparc -D__sparcv9
 $(SPARC_BLD)CPPFLAGS	+= -D__sparc -D__sparcv9 -D_SYSCALL32 
 $(SPARC_BLD)ASFLAGS	+= -D__sparc -D__sparcv9
-$(SPARC_BLD)LINTFLAGS64	+= -errchk=longptr64 -Xarch=v9
+$(SPARC_BLD)LINTFLAGS64	+= -errchk=longptr64 -m64
diff --git a/usr/src/psm/stand/boot/sparcv9/sun4u/Makefile b/usr/src/psm/stand/boot/sparcv9/sun4u/Makefile
index 40ef919950..074c295ca2 100644
--- a/usr/src/psm/stand/boot/sparcv9/sun4u/Makefile
+++ b/usr/src/psm/stand/boot/sparcv9/sun4u/Makefile
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 TOPDIR =	../../../../..
 
@@ -127,7 +125,7 @@ CFLAGS64	+= -xchip=ultra $(CCABS32)
 # XXX this totally sucks since it effectively turns off -errchk=longptr64,
 # which we really should be using.
 #
-LINTFLAGS64 = $(LINTFLAGS) -Xarch=v9
+LINTFLAGS64 = $(LINTFLAGS) -m64
 
 #
 # Cross-reference customization: include all boot-related source files.
diff --git a/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile b/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile
index 49c5c10d2f..56efb6bbad 100644
--- a/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile
+++ b/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile
@@ -106,7 +106,7 @@ CFLAGS64	+= -xchip=ultra $(CCABS32)
 # XXX this totally sucks since it effectively turns off -errchk=longptr64,
 # which we really should be using.
 #
-LINTFLAGS64 = $(LINTFLAGS) -Xarch=v9
+LINTFLAGS64 = $(LINTFLAGS) -m64
 
 #
 # Cross-reference customization: include all boot-related source files.
diff --git a/usr/src/stand/lib/Makefile.sparc b/usr/src/stand/lib/Makefile.sparc
index 814bb21633..ecf73eda5e 100644
--- a/usr/src/stand/lib/Makefile.sparc
+++ b/usr/src/stand/lib/Makefile.sparc
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # We only support 64-bit builds on SPARC, so this is simple.
@@ -38,5 +35,5 @@ include $(SRC)/psm/Makefile.psm.64
 # XXX this totally sucks since it effectively turns off -errchk=longptr64,
 # which we really should be using.
 #
-LINTFLAGS64 = $(LINTFLAGS) -Xarch=v9
+LINTFLAGS64 = $(LINTFLAGS) -m64
 CFLAGS64 += -xchip=ultra $(CCABS32)
diff --git a/usr/src/tools/cw/cw.c b/usr/src/tools/cw/cw.c
index fc63fd5649..6d98c63c27 100644
--- a/usr/src/tools/cw/cw.c
+++ b/usr/src/tools/cw/cw.c
@@ -33,7 +33,7 @@
  */
 
 /* If you modify this file, you must increment CW_VERSION */
-#define	CW_VERSION	"1.25"
+#define	CW_VERSION	"1.26"
 
 /*
  * -#		Verbose mode
@@ -1795,10 +1795,10 @@ main(int argc, char **argv)
 	if ((dir = getenv("SPRO_VROOT")) != NULL) {
 		(void) snprintf(cc_buf, MAXPATHLEN, "%s/bin", dir);
 	} else if ((dir = getenv("SPRO_ROOT")) != NULL) {
-		(void) snprintf(cc_buf, MAXPATHLEN, "%s/SS11/bin", dir);
+		(void) snprintf(cc_buf, MAXPATHLEN, "%s/SS12/bin", dir);
 	} else if ((dir = getenv("BUILD_TOOLS")) != NULL) {
 		(void) snprintf(cc_buf, MAXPATHLEN,
-		    "%s/SUNWspro/SS11/bin", dir);
+		    "%s/SUNWspro/SS12/bin", dir);
 	}
 	if (dir != NULL) {
 		dirs[CIDX(CW_C_CC, 0)] = (const char *)cc_buf;
diff --git a/usr/src/ucbcmd/ps/sparcv9/Makefile b/usr/src/ucbcmd/ps/sparcv9/Makefile
index ff5f86cb75..f95c42e6db 100644
--- a/usr/src/ucbcmd/ps/sparcv9/Makefile
+++ b/usr/src/ucbcmd/ps/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # ucbcmd/ps/sparcv9/Makefile
 #
 
@@ -39,7 +36,7 @@ include ../../Makefile.ucbcmd.64
 
 CFLAGS64	+= $(CCVERBOSE)
 
-lint	:= LINTFLAGS64 = -x -Xarch=v9
+lint	:= LINTFLAGS64 = -x -m64
 
 FILEMODE= 0555
 OWNER= root
diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts
index f73341ab5f..839ae425da 100644
--- a/usr/src/uts/Makefile.uts
+++ b/usr/src/uts/Makefile.uts
@@ -165,9 +165,9 @@ LINTTAGS	= -erroff=E_INCONS_ARG_DECL2
 LINTTAGS	+= -erroff=E_INCONS_VAL_TYPE_DECL2
 
 LINTFLAGS_sparc_32	= $(LINTCCMODE) -nsxmuF -errtags=yes
-LINTFLAGS_sparc_64	= $(LINTFLAGS_sparc_32) -Xarch=v9
+LINTFLAGS_sparc_64	= $(LINTFLAGS_sparc_32) -m64
 LINTFLAGS_i386_32	= $(LINTCCMODE) -nsxmuF -errtags=yes
-LINTFLAGS_i386_64	= $(LINTFLAGS_i386_32) -Xarch=amd64
+LINTFLAGS_i386_64	= $(LINTFLAGS_i386_32) -m64
 
 LINTFLAGS	= $(LINTFLAGS_$(MACH)_$(CLASS)) $(LINTTAGS)
 LINTFLAGS	+= $(C99LMODE)
diff --git a/usr/src/uts/sparc/Makefile.sparc.shared b/usr/src/uts/sparc/Makefile.sparc.shared
index 5dea216629..1ef0190d3f 100644
--- a/usr/src/uts/sparc/Makefile.sparc.shared
+++ b/usr/src/uts/sparc/Makefile.sparc.shared
@@ -110,7 +110,7 @@ include $(UTSBASE)/Makefile.uts
 #	machine specific optimization, override default in Makefile.master
 #
 XARCH_32	= -xarch=v8
-XARCH_64	= -xarch=v9
+XARCH_64	= -m64
 XARCH		= $(XARCH_$(CLASS))
 
 COPTIMIZE_32	= -xO3
@@ -143,7 +143,7 @@ CFLAGS		+= -xstrconst
 ASFLAGS		+= $(XARCH)
 
 LINT_DEFS_32	=
-LINT_DEFS_64	= -Xarch=v9
+LINT_DEFS_64	= -m64
 LINT_DEFS	+= $(LINT_DEFS_$(CLASS))
 
 #
diff --git a/usr/src/uts/sun4u/Makefile.sun4u.shared b/usr/src/uts/sun4u/Makefile.sun4u.shared
index dd4caeaae5..2e99396b1d 100644
--- a/usr/src/uts/sun4u/Makefile.sun4u.shared
+++ b/usr/src/uts/sun4u/Makefile.sun4u.shared
@@ -23,8 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	This makefile contains the common definitions for the sun4u unix
 #	and all sun4u implementation architecture dependent modules.
 #
@@ -194,7 +192,7 @@ $(CLOSED_BUILD)CLOSED_IMPLEMENTATIONS	+= ents
 #
 #	machine specific optimization, override default in Makefile.master
 #
-CC_XARCH	= -xarch=v9a
+CC_XARCH	= -m64 -xarch=sparcvis
 AS_XARCH	= -xarch=v9a
 COPTIMIZE	= -xO3
 CCMODE		= -Xa
@@ -223,7 +221,7 @@ AS_INC_PATH	+= -I$(DSF_DIR)/$(OBJS_DIR)
 
 LINT_KMODS	+= $(GENUNIX_KMODS)
 
-LINT_DEFS	= -Xarch=v9
+LINT_DEFS = -m64
 
 #
 #	The following must be defined for all implementations:
diff --git a/usr/src/uts/sun4v/Makefile.sun4v.shared b/usr/src/uts/sun4v/Makefile.sun4v.shared
index f8bd29cb1f..bf0b0d0daf 100644
--- a/usr/src/uts/sun4v/Makefile.sun4v.shared
+++ b/usr/src/uts/sun4v/Makefile.sun4v.shared
@@ -165,7 +165,7 @@ CTFMERGE_GUDIR	= sun4v
 #
 #	machine specific optimization, override default in Makefile.master
 #
-CC_XARCH	= -xarch=v9a
+CC_XARCH	= -m64 -xarch=sparcvis
 AS_XARCH	= -xarch=v9v
 COPTIMIZE	= -xO3
 CCMODE		= -Xa
@@ -195,7 +195,7 @@ AS_INC_PATH	+= -I$(DSF_DIR)/$(OBJS_DIR)
 
 LINT_KMODS	+= $(GENUNIX_KMODS)
 
-LINT_DEFS	= -Xarch=v9
+LINT_DEFS	= -m64
 
 #
 #	The following must be defined for all implementations: