diff options
Diffstat (limited to 'usr/src/lib')
29 files changed, 66 insertions, 120 deletions
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) |