summaryrefslogtreecommitdiff
path: root/usr/src/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd')
-rw-r--r--usr/src/cmd/Makefile.cmd2
-rw-r--r--usr/src/cmd/fps/fptest/Makefile4
-rw-r--r--usr/src/cmd/gcore/sparcv9/Makefile11
-rw-r--r--usr/src/cmd/mdb/demo/Makefile.amd6412
-rw-r--r--usr/src/cmd/mdb/demo/Makefile.sparcv914
-rw-r--r--usr/src/cmd/modload/sparcv9/Makefile11
-rw-r--r--usr/src/cmd/nohup/sparcv9/Makefile13
-rw-r--r--usr/src/cmd/plimit/sparcv9/Makefile11
-rw-r--r--usr/src/cmd/ppgsz/sparcv9/Makefile11
-rw-r--r--usr/src/cmd/ps/sparcv9/Makefile11
-rw-r--r--usr/src/cmd/sgs/Makefile.var4
-rw-r--r--usr/src/cmd/sgs/ar/Makefile.com4
-rw-r--r--usr/src/cmd/sgs/nm/amd64/Makefile4
-rw-r--r--usr/src/cmd/sgs/nm/sparcv9/Makefile4
-rw-r--r--usr/src/cmd/truss/sparcv9/Makefile13
-rw-r--r--usr/src/cmd/w/sparcv9/Makefile11
-rw-r--r--usr/src/cmd/whodo/sparcv9/Makefile11
17 files changed, 55 insertions, 96 deletions
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