diff options
| author | Rod Evans <Rod.Evans@Sun.COM> | 2010-06-28 15:32:48 -0700 |
|---|---|---|
| committer | Rod Evans <Rod.Evans@Sun.COM> | 2010-06-28 15:32:48 -0700 |
| commit | 1e49577a7fcde812700ded04431b49d67cc57d6d (patch) | |
| tree | c8f02eda62c4ca17100384b35d90e36d44d29af8 /usr/src/lib | |
| parent | d28831b861181e5df28cac8efd6a92489e6feded (diff) | |
| download | illumos-joyent-1e49577a7fcde812700ded04431b49d67cc57d6d.tar.gz | |
6924858 various OSNet components could be simplified with symbol capabilities
--HG--
rename : usr/src/lib/libc_psr/Makefile => usr/src/lib/libc/capabilities/Makefile
rename : usr/src/lib/libc_psr/Makefile.targ => usr/src/lib/libc/capabilities/Makefile.targ
rename : usr/src/lib/libc_psr/sun4u-opl/Makefile => usr/src/lib/libc/capabilities/sun4u-opl/Makefile
rename : usr/src/lib/libc_psr/sun4u-opl/Makefile.com => usr/src/lib/libc/capabilities/sun4u-opl/Makefile.com
rename : usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s => usr/src/lib/libc/capabilities/sun4u-opl/common/memcpy.s
rename : usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile => usr/src/lib/libc/capabilities/sun4u-opl/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4u-opl/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap1/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap1/Makefile.com => usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile.com
rename : usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap2/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap2/Makefile.com => usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile.com
rename : usr/src/lib/libc_psr/sun4u_hwcap2/mapfile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/common/mapfile-cap
rename : usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4u-us3/common/memcmp.s => usr/src/lib/libc/capabilities/sun4u-us3/common/memcmp.s
rename : usr/src/lib/libc_psr/sun4u-us3/common/memcpy.s => usr/src/lib/libc/capabilities/sun4u-us3/common/memcpy.s
rename : usr/src/lib/libc_psr/sun4u-us3/common/memset.s => usr/src/lib/libc/capabilities/sun4u-us3/common/memset.s
rename : usr/src/lib/libc_psr/sun4u/Makefile => usr/src/lib/libc/capabilities/sun4u/Makefile
rename : usr/src/lib/libc_psr/sun4u/common/memcmp.s => usr/src/lib/libc/capabilities/sun4u/common/memcmp.s
rename : usr/src/lib/libc_psr/sun4u/common/memcpy.s => usr/src/lib/libc/capabilities/sun4u/common/memcpy.s
rename : usr/src/lib/libc_psr/sun4u/common/memset.s => usr/src/lib/libc/capabilities/sun4u/common/memset.s
rename : usr/src/lib/libc_psr/sun4u/sparc/Makefile => usr/src/lib/libc/capabilities/sun4u/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4u/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4u/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap1/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com => usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile.com
rename : usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap2/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap2/Makefile.com => usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile.com
rename : usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap2/sparc/Makefile
rename : usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile => usr/src/lib/libc/capabilities/sun4v-hwcap2/sparcv9/Makefile
rename : usr/src/lib/libc_psr/sun4v/common/memcpy.s => usr/src/lib/libc/capabilities/sun4v/common/memcpy.s
rename : usr/src/lib/libc_psr/sun4v/common/memset.s => usr/src/lib/libc/capabilities/sun4v/common/memset.s
rename : usr/src/lib/libmd/sun4u/Makefile => usr/src/lib/libmd/capabilities/sun4u/Makefile
rename : usr/src/lib/libmd/sun4u/Makefile.com => usr/src/lib/libmd/capabilities/sun4u/Makefile.com
rename : usr/src/lib/libmd/sun4u/sparc/Makefile => usr/src/lib/libmd/capabilities/sun4u/sparc/Makefile
rename : usr/src/lib/libmd/sun4u/sparcv9/Makefile => usr/src/lib/libmd/capabilities/sun4u/sparcv9/Makefile
rename : usr/src/lib/libmd/sun4v/Makefile => usr/src/lib/libmd/capabilities/sun4v/Makefile
rename : usr/src/lib/libmd/sun4v/Makefile.com => usr/src/lib/libmd/capabilities/sun4v/Makefile.com
rename : usr/src/lib/libmd/sun4v/sparc/Makefile => usr/src/lib/libmd/capabilities/sun4v/sparc/Makefile
rename : usr/src/lib/libmd/sun4v/sparcv9/Makefile => usr/src/lib/libmd/capabilities/sun4v/sparcv9/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/i386_hwcap1/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile.com => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.com
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4u/mapfile-vers => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/common/mapfile-cap
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4u/sparc/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/sparc/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4u/sparcv9/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/sparcv9/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile.com => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.com
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4v/mapfile-vers => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/common/mapfile-cap
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4v/sparc/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/sparc/Makefile
rename : usr/src/lib/pkcs11/libsoftcrypto/sun4v/sparcv9/Makefile => usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/sparcv9/Makefile
Diffstat (limited to 'usr/src/lib')
145 files changed, 2897 insertions, 3661 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 53c33825eb..483d528754 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -273,7 +273,6 @@ i386_SUBDIRS= \ sparc_SUBDIRS= .WAIT \ efcode \ - libc_psr .WAIT \ libds \ libdscp \ libprtdiag .WAIT \ diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib index 6d244ae4b3..8abc86c8f8 100644 --- a/usr/src/lib/Makefile.lib +++ b/usr/src/lib/Makefile.lib @@ -155,8 +155,8 @@ SRCS= $(OBJECTS:%.o=$(SRCDIR)/%.c) # default build of an archive and a shared object, # overridden locally when extra processing is needed BUILD.AR= $(AR) $(ARFLAGS) $@ $(AROBJS) -BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(LDLIBS) -BUILDCCC.SO= $(CCC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(LDLIBS) +BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(EXTPICS) $(LDLIBS) +BUILDCCC.SO= $(CCC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(EXTPICS) $(LDLIBS) # default dynamic library symlink # IMPORTANT:: If you change INS.liblink OR INS.liblink64 here, then you diff --git a/usr/src/lib/Makefile.targ b/usr/src/lib/Makefile.targ index 00e1d3946c..4769c64d54 100644 --- a/usr/src/lib/Makefile.targ +++ b/usr/src/lib/Makefile.targ @@ -19,10 +19,7 @@ # CDDL HEADER END # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -93,11 +90,11 @@ $(LIBRARY): objs .WAIT $$(OBJS) $(DYNLIB): $$(MAPFILES) -$(DYNLIB): pics .WAIT $$(PICS) $$(ALTPICS) +$(DYNLIB): pics .WAIT $$(PICS) $$(ALTPICS) $$(EXTPICS) $(BUILD.SO) $(POST_PROCESS_SO) -$(DYNLIBCCC): pics .WAIT $$(PICS) $$(ALTPICS) +$(DYNLIBCCC): pics .WAIT $$(PICS) $$(ALTPICS) $$(EXTPICS) $(BUILDCCC.SO) $(POST_PROCESS_SO) diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile index b4a5cf64b5..2bbe37202f 100644 --- a/usr/src/lib/libc/Makefile +++ b/usr/src/lib/libc/Makefile @@ -19,8 +19,7 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -73,8 +72,13 @@ VAR1_DYNLIB64 = $(LIBRARY:%.a=%_$(VAR1).so$(VERS)) VAR1_BLDDIR64 = $(MACH)_$(VAR1)/$(VARBLD64) i386_VARIANTS= $(VAR1) $(VAR2) $(VAR3) -sparc_VARIANTS= $(VAR1) -sparcv9_VARIANTS= $(VAR1) +sparc_VARIANTS= +sparcv9_VARIANTS= + +i386_COMP= +sparc_COMP= capabilities + +MACH_COMP= $($(MACH)_COMP) i386_ETC= $(MACH)/etc sparc_ETC= @@ -85,7 +89,7 @@ VARIANT_SUBDIRS = $(VARIANTS:%=$(MACH)_%/$(VARBLD)) VARIANTS64= $($(MACH64)_VARIANTS) VARIANT_SUBDIRS64 = $(VARIANTS64:%=$(MACH)_%/$(VARBLD64)) -SUBDIRS= $(MACH) $(MACH_ETC) $(VARIANT_SUBDIRS) +SUBDIRS= $(MACH_CAP) $(MACH) $(MACH_ETC) $(VARIANT_SUBDIRS) $(BUILD64)SUBDIRS += $(MACH64) $(VARIANT_SUBDIRS64) LIBS = $(DYNLIB) $(LINTLIB) @@ -140,7 +144,7 @@ check_i18n: etc: $($(MACH)_ETC) -lib32: $(MACHLIBS) $(MACH)/$(LIB_PIC) $(VARIANTLIBS) +lib32: $(MACH_COMP) $(MACHLIBS) $(MACH)/$(LIB_PIC) $(VARIANTLIBS) mkdir -p $(MACH)/i18n_pics cd $(MACH)/i18n_pics ; $(AR) -x $(ROOTFS_LIBDIR)/libc_i18n.a @if $(ELFDUMP) -r $(MACH)/$(DYNLIB) | $(GREP) -w environ ; then \ @@ -149,7 +153,7 @@ lib32: $(MACHLIBS) $(MACH)/$(LIB_PIC) $(VARIANTLIBS) exit 1; \ fi -lib64: $(MACHLIBS64) $(MACH64)/$(LIB_PIC) $(VARIANTLIBS64) +lib64: $(MACH_COMP) $(MACHLIBS64) $(MACH64)/$(LIB_PIC) $(VARIANTLIBS64) mkdir -p $(MACH64)/i18n_pics cd $(MACH64)/i18n_pics ; $(AR) -x $(ROOTFS_LIBDIR64)/libc_i18n.a @if $(ELFDUMP) -r $(MACH64)/$(DYNLIB) | $(GREP) -w environ ; then \ @@ -167,6 +171,9 @@ $(VARIANTLIBS64): FRC $($(MACH)_ETC): FRC @cd $(@); pwd; $(MAKE) $(TARGET) +$($(MACH)_COMP): FRC + @cd $(@); pwd; $(MAKE) $(TARGET) + install: all \ etc \ inslib32 \ diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile index 73e3475822..2176c1da01 100644 --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -23,12 +23,12 @@ # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # -LIBCBASE=. - -LIBRARY= libc.a -LIB_PIC= libc_pic.a -VERS= .1 -CPP= /usr/lib/cpp +LIBCBASE= . +LIBCDIR= $(SRC)/lib/libc +LIBRARY= libc.a +LIB_PIC= libc_pic.a +VERS= .1 +CPP= /usr/lib/cpp TARGET_ARCH= amd64 # objects are grouped by source directory @@ -297,7 +297,7 @@ SYSOBJS= \ # This macro should ALWAYS be empty; native APIs are already 'large file'. PORTGEN64= -# objects from source under ../port +# objects from source under $(LIBCDIR)/port PORTFP= \ __flt_decim.o \ __flt_rounds.o \ @@ -909,12 +909,12 @@ CFLAGS64 += $(XSTRCONST) ALTPICS= $(TRACEOBJS:%=pics/%) $(DYNLIB) := PICS += $(ROOTFS_LIBDIR64)/libc_i18n.a -$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) +$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS) -MAPFILES = ../port/mapfile-vers +MAPFILES = $(LIBCDIR)/port/mapfile-vers CPPFLAGS= -D_REENTRANT -D$(MACH64) -D__$(MACH64) $(THREAD_DEBUG) \ - -I. -I$(LIBCBASE)/inc -I../inc $(CPPFLAGS.master) -I/usr/include + -I. -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc $(CPPFLAGS.master) ASFLAGS= $(AS_PICFLAGS) -P -D__STDC__ -D_ASM $(CPPFLAGS) \ $(amd64_AS_XARCH) @@ -948,8 +948,8 @@ BUILD.AR= $(RM) $@ ; \ # extra files for the clean target CLEANFILES= \ - ../port/gen/errlst.c \ - ../port/gen/new_list.c \ + $(LIBCDIR)/port/gen/errlst.c \ + $(LIBCDIR)/port/gen/new_list.c \ assym.h \ genassym \ crt/_rtld.s \ @@ -964,22 +964,22 @@ SRCS= \ $(ATOMICOBJS:%.o=$(SRC)/common/atomic/%.c) \ $(XATTROBJS:%.o=$(SRC)/common/xattr/%.c) \ $(COMOBJS:%.o=$(SRC)/common/util/%.c) \ - $(PORTFP:%.o=../port/fp/%.c) \ - $(PORTGEN:%.o=../port/gen/%.c) \ - $(PORTI18N:%.o=../port/i18n/%.c) \ - $(PORTPRINT:%.o=../port/print/%.c) \ - $(PORTREGEX:%.o=../port/regex/%.c) \ - $(PORTSTDIO:%.o=../port/stdio/%.c) \ - $(PORTSYS:%.o=../port/sys/%.c) \ - $(AIOOBJS:%.o=../port/aio/%.c) \ - $(RTOBJS:%.o=../port/rt/%.c) \ - $(TPOOLOBJS:%.o=../port/tpool/%.c) \ - $(THREADSOBJS:%.o=../port/threads/%.c) \ + $(PORTFP:%.o=$(LIBCDIR)/port/fp/%.c) \ + $(PORTGEN:%.o=$(LIBCDIR)/port/gen/%.c) \ + $(PORTI18N:%.o=$(LIBCDIR)/port/i18n/%.c) \ + $(PORTPRINT:%.o=$(LIBCDIR)/port/print/%.c) \ + $(PORTREGEX:%.o=$(LIBCDIR)/port/regex/%.c) \ + $(PORTSTDIO:%.o=$(LIBCDIR)/port/stdio/%.c) \ + $(PORTSYS:%.o=$(LIBCDIR)/port/sys/%.c) \ + $(AIOOBJS:%.o=$(LIBCDIR)/port/aio/%.c) \ + $(RTOBJS:%.o=$(LIBCDIR)/port/rt/%.c) \ + $(TPOOLOBJS:%.o=$(LIBCDIR)/port/tpool/%.c) \ + $(THREADSOBJS:%.o=$(LIBCDIR)/port/threads/%.c) \ $(THREADSMACHOBJS:%.o=threads/%.c) \ $(UNICODEOBJS:%.o=$(SRC)/common/unicode/%.c) \ $(UNWINDMACHOBJS:%.o=unwind/%.c) \ $(FPOBJS:%.o=fp/%.c) \ - $(I386FPOBJS:%.o=../i386/fp/%.c) \ + $(I386FPOBJS:%.o=$(LIBCDIR)/i386/fp/%.c) \ $(LIBCBASE)/gen/ecvt.c \ $(LIBCBASE)/gen/makectxt.c \ $(LIBCBASE)/gen/siginfolst.c \ @@ -1070,7 +1070,7 @@ $(PORTI18N_COND:%=pics/%) := \ all: $(LIBS) $(LIB_PIC) -lint := CPPFLAGS += -I../$(MACH)/fp +lint := CPPFLAGS += -I$(LIBCDIR)/$(MACH)/fp lint := CPPFLAGS += -D_MSE_INT_H -D_LCONV_C99 lint := LINTFLAGS64 += -mn -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED @@ -1078,7 +1078,7 @@ lint: @echo $(LINT.c) ... $(LDLIBS) @$(LINT.c) $(SRCS) $(LDLIBS) -$(LINTLIB):= SRCS=../port/llib-lc +$(LINTLIB):= SRCS=$(LIBCDIR)/port/llib-lc $(LINTLIB):= CPPFLAGS += -D_MSE_INT_H $(LINTLIB):= LINTFLAGS64=-nvx -m64 @@ -1119,19 +1119,19 @@ CPPFLAGS.genassym = \ $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) genassym: $(GENASSYM_C) - $(NATIVECC) -Iinc -I../inc $(CPPFLAGS.genassym) -o $@ $(GENASSYM_C) + $(NATIVECC) -Iinc -I$(LIBCDIR)/inc $(CPPFLAGS.genassym) -o $@ $(GENASSYM_C) -OFFSETS = ../$(MACH)/offsets.in +OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in assym.h: $(OFFSETS) genassym $(OFFSETS_CREATE) <$(OFFSETS) >$@ ./genassym >>$@ # derived C source and related explicit dependencies -../port/gen/errlst.c + \ -../port/gen/new_list.c: ../port/gen/errlist ../port/gen/errlist.awk - cd ../port/gen; pwd; $(AWK) -f errlist.awk < errlist +$(LIBCDIR)/port/gen/errlst.c + \ +$(LIBCDIR)/port/gen/new_list.c: $(LIBCDIR)/port/gen/errlist $(LIBCDIR)/port/gen/errlist.awk + cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist -pics/errlst.o: ../port/gen/errlst.c +pics/errlst.o: $(LIBCDIR)/port/gen/errlst.c -pics/new_list.o: ../port/gen/new_list.c +pics/new_list.o: $(LIBCDIR)/port/gen/new_list.c diff --git a/usr/src/lib/libc/capabilities/Makefile b/usr/src/lib/libc/capabilities/Makefile new file mode 100644 index 0000000000..ab390454fd --- /dev/null +++ b/usr/src/lib/libc/capabilities/Makefile @@ -0,0 +1,55 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include $(SRC)/Makefile.master + +# Each target directory is responsible for making a symbol capabilities object. +$(SPARC_BLD)SUBDIRS = \ + sun4u \ + sun4u-opl \ + sun4u-us3-hwcap1 \ + sun4u-us3-hwcap2 \ + sun4v-hwcap1 \ + sun4v-hwcap2 +$(INTEL_BLD)SUBDIRS = + +all := TARGET= all +clean := TARGET= clean +clobber := TARGET= clobber +install := TARGET= install + +.KEEP_STATE: + +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) + +lint: + +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + +FRC: diff --git a/usr/src/lib/libc/capabilities/Makefile.com b/usr/src/lib/libc/capabilities/Makefile.com new file mode 100644 index 0000000000..76f6d38661 --- /dev/null +++ b/usr/src/lib/libc/capabilities/Makefile.com @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include $(SRC)/lib/Makefile.lib + +MAPFILE-CAP = ../common/mapfile-cap +MAPOPT-CAP = $(MAPFILE-CAP:%=-M%) + +OBJCAP = pics/objcap.o +SYMCAP = pics/symcap.o + +CLOBBERFILES += $(OBJCAP) $(SYMCAP) diff --git a/usr/src/lib/libc_psr/sun4u/Makefile b/usr/src/lib/libc/capabilities/Makefile.targ index 05f1d1ad94..c2c6951f0d 100644 --- a/usr/src/lib/libc_psr/sun4u/Makefile +++ b/usr/src/lib/libc/capabilities/Makefile.targ @@ -18,38 +18,36 @@ # # CDDL HEADER END # + # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -include ../../Makefile.lib - -PLATFORM= sun4u - -SUBDIRS= $(MACH) -SUBDIRS64= $(MACH64) +$(SYMCAP): $(OBJCAP) +$(OBJCAP): $(PICS) +$(PICS): pics -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber +# Assemble the original source file. -.KEEP_STATE: +pics/%.o: ../../$(TRG_PLATFORM)/common/%.s + $(COMPILE.s) $< -o $@ + $(POST_PROCESS_O) -all install clean clobber : lib32 \ - $(BUILD64) lib64 +pics/%.o: ../../$(ALT_PLATFORM)/common/%.s + $(COMPILE.s) $< -o $@ + $(POST_PROCESS_O) -lint: - @ $(ECHO) "Nothing to lint here: skipping" +# Combine all pic objects into one relocatable object. Assign any capabilities +# to this object, and define the interface. -lib32: $(SUBDIRS) +pics/objcap.o: $(PICS) $(MAPFILE-CAP) + $(LD) -r -o $@ $(MAPOPT-CAP) -Breduce $(PICS) + $(POST_PROCESS_OBJCAP_O) -lib64: $(SUBDIRS64) +# Convert the combined object capabilities object into a symbol capabilities +# object. -$(SUBDIRS) $(SUBDIRS64): FRC - @cd $@; pwd; $(MAKE) $(TARGET) +pics/symcap.o: $(OBJCAP) + $(LD) -r -o $@ -z symbolcap $(OBJCAP) -FRC: +include ../../../Makefile.targ diff --git a/usr/src/lib/libmd/sun4u/Makefile b/usr/src/lib/libc/capabilities/sun4u-opl/Makefile index b65f30de75..247f7c3456 100644 --- a/usr/src/lib/libmd/sun4u/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u-opl/Makefile @@ -18,29 +18,28 @@ # # CDDL HEADER END # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -include $(SRC)/Makefile.master +include $(SRC)/lib/Makefile.lib -SUBDIRS= $(MACH) -$(BUILD64)SUBDIRS += $(MACH64) +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint install := TARGET= install .KEEP_STATE: -.PARALLEL: $(MACH) $(MACH64) +all clean clobber install: \ + $(SUBDIRS) -all clean clobber lint install: $(SUBDIRS) +lint: -$(MACH) $(MACH64): FRC - @cd $@; pwd; $(MAKE) $(TARGET) +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/lib/libc/capabilities/sun4u-opl/Makefile.com b/usr/src/lib/libc/capabilities/sun4u-opl/Makefile.com new file mode 100644 index 0000000000..0080c16a0e --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u-opl/Makefile.com @@ -0,0 +1,40 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +TRG_PLATFORM = sun4u-opl +ALT_PLATFORM = sun4u-us3 +GEN_PLATFORM = sun4u + +include ../../Makefile.com + +OBJECTS = memcpy.o memset.o memcmp.o + +include $(SRC)/lib/Makefile.lib + +IFLAGS = -I$(SRC)/uts/$(GEN_PLATFORM) \ + -I$(ROOT)/usr/platform/$(GEN_PLATFORM)/include + +AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH) $(IFLAGS) +ASFLAGS = -P -K pic diff --git a/usr/src/lib/libc/capabilities/sun4u-opl/common/mapfile-cap b/usr/src/lib/libc/capabilities/sun4u-opl/common/mapfile-cap new file mode 100644 index 0000000000..56e55edf0a --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u-opl/common/mapfile-cap @@ -0,0 +1,42 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +$mapfile_version 2 + +CAPABILITY sun4u-opl { + PLATFORM = "SUNW,SPARC-Enterprise"; +}; + +SYMBOL_SCOPE { + global: + _memcmp; + _memcpy; + _memmove; + _memset; + memcmp; + memcpy; + memmove; + memset; + local: + *; +}; diff --git a/usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s b/usr/src/lib/libc/capabilities/sun4u-opl/common/memcpy.s index 868d21f845..d7fe66ef94 100644 --- a/usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s +++ b/usr/src/lib/libc/capabilities/sun4u-opl/common/memcpy.s @@ -20,8 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. */ .file "memcpy.s" diff --git a/usr/src/lib/libmd/sun4v/Makefile.links b/usr/src/lib/libc/capabilities/sun4u-opl/sparc/Makefile index e03b1e1b15..24e4b7974f 100644 --- a/usr/src/lib/libmd/sun4v/Makefile.links +++ b/usr/src/lib/libc/capabilities/sun4u-opl/sparc/Makefile @@ -18,15 +18,17 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# lib/libmd/Makefile.sun4v.links -# -# -# Used when building links in /platform/sun4v/lib -# -LINKED_PLATFORMS = SUNW,Sun-Fire-T200 + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com + +ASFLAGS += -xarch=v8plusb + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libc/capabilities/sun4u-opl/sparcv9/Makefile b/usr/src/lib/libc/capabilities/sun4u-opl/sparcv9/Makefile new file mode 100644 index 0000000000..f63ba3e06c --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u-opl/sparcv9/Makefile @@ -0,0 +1,36 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com +include $(SRC)/lib/Makefile.lib.64 + +.KEEP_STATE: + +AS_CPPFLAGS += -D__sparcv9 +ASFLAGS += -xarch=v9b + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libmd/sun4v/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile index b65f30de75..77aed04fa7 100644 --- a/usr/src/lib/libmd/sun4v/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile @@ -18,29 +18,30 @@ # # CDDL HEADER END # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -include $(SRC)/Makefile.master +include $(SRC)/lib/Makefile.lib -SUBDIRS= $(MACH) -$(BUILD64)SUBDIRS += $(MACH64) +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint install := TARGET= install .KEEP_STATE: -.PARALLEL: $(MACH) $(MACH64) +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) -all clean clobber lint install: $(SUBDIRS) +lint: -$(MACH) $(MACH64): FRC - @cd $@; pwd; $(MAKE) $(TARGET) +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/sparc/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile.com index a3d0363d6d..b459a6ac2d 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/sparc/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile.com @@ -20,24 +20,23 @@ # # -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -# -# lib/pkcs11/libsoftcrypto/sun4u/sparc/Makefile -# +TRG_PLATFORM = sun4u-us3 +GEN_PLATFORM = sun4u -CLASS = 32 +include ../../Makefile.com -include ../Makefile.com +OBJECTS = memcpy.o memset.o memcmp.o -ASFLAGS += -xarch=v8plus -LINTFLAGS += -D$(PLATFORM) -erroff=E_STATIC_UNUSED +include $(SRC)/lib/Makefile.lib -install: all $(SOFT_PSR_LINKS) $(USR_PSM_LIBS) +IFLAGS = -I$(SRC)/uts/$(GEN_PLATFORM) \ + -I$(ROOT)/usr/platform/$(GEN_PLATFORM)/include -include $(SRC)/Makefile.psm.targ +MAPFILE-CAP += ../../$(TRG_PLATFORM)/common/mapfile-cap -pics/mont_mulf_asm.o: $(BIGNUM_DIR)/sun4u/mont_mulf_v8plus.s - $(COMPILE.s) -o $@ $(BIGNUM_DIR)/sun4u/mont_mulf_v8plus.s - $(POST_PROCESS_O) +AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH) $(IFLAGS) \ + -DBSTORE_SIZE=256 +ASFLAGS = -P -K pic diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/common/mapfile-cap b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/common/mapfile-cap new file mode 100644 index 0000000000..1504f5aa3e --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/common/mapfile-cap @@ -0,0 +1,40 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +$mapfile_version 2 + +CAPABILITY sun4u-us3-hwcap1; + +SYMBOL_SCOPE { + global: + _memcmp; + _memcpy; + _memmove; + _memset; + memcmp; + memmove; + memcpy; + memset; + local: + *; +}; diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/sparc/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/sparc/Makefile new file mode 100644 index 0000000000..24e4b7974f --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/sparc/Makefile @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com + +ASFLAGS += -xarch=v8plusb + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/sparcv9/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/sparcv9/Makefile new file mode 100644 index 0000000000..f63ba3e06c --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/sparcv9/Makefile @@ -0,0 +1,36 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com +include $(SRC)/lib/Makefile.lib.64 + +.KEEP_STATE: + +AS_CPPFLAGS += -D__sparcv9 +ASFLAGS += -xarch=v9b + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile index df9739cb24..77aed04fa7 100644 --- a/usr/src/lib/libc_psr/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile @@ -18,29 +18,30 @@ # # CDDL HEADER END # + # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -include ../Makefile.lib +include $(SRC)/lib/Makefile.lib -SUBDIRS = etc sun4u sun4u-opl sun4u-us3 sun4u_hwcap1 sun4u_hwcap2 \ - sun4v sun4v_hwcap1 sun4v_hwcap2 +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) all := TARGET= all -install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint +install := TARGET= install .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) + +lint: -$(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(TARGET) +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile.com b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile.com new file mode 100644 index 0000000000..039b50259c --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile.com @@ -0,0 +1,42 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +TRG_PLATFORM = sun4u-us3 +GEN_PLATFORM = sun4u + +include ../../Makefile.com + +OBJECTS = memcpy.o memset.o memcmp.o + +include $(SRC)/lib/Makefile.lib + +IFLAGS = -I$(SRC)/uts/$(GEN_PLATFORM) \ + -I$(ROOT)/usr/platform/$(GEN_PLATFORM)/include + +MAPFILE-CAP += ../../$(TRG_PLATFORM)/common/mapfile-cap + +AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH) $(IFLAGS) \ + -DBSTORE_SIZE=65536 -DPANTHER_ONLY +ASFLAGS = -P -K pic diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/common/mapfile-cap b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/common/mapfile-cap new file mode 100644 index 0000000000..ab216cd660 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/common/mapfile-cap @@ -0,0 +1,42 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +$mapfile_version 2 + +CAPABILITY sun4u-us3-hwcap2 { + HW += POPC; +}; + +SYMBOL_SCOPE { + global: + _memcmp; + _memcpy; + _memmove; + _memset; + memcmp; + memcpy; + memmove; + memset; + local: + *; +}; diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/sparc/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/sparc/Makefile new file mode 100644 index 0000000000..24e4b7974f --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/sparc/Makefile @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com + +ASFLAGS += -xarch=v8plusb + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/sparcv9/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/sparcv9/Makefile new file mode 100644 index 0000000000..a9f2809937 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/sparcv9/Makefile @@ -0,0 +1,36 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com +include $(SRC)/lib/Makefile.lib.64 + +.KEEPS_STATE: + +AS_CPPFLAGS += -D__sparcv9 +ASFLAGS += -xarch=v9b + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libc/capabilities/sun4u-us3/common/mapfile-cap b/usr/src/lib/libc/capabilities/sun4u-us3/common/mapfile-cap new file mode 100644 index 0000000000..987347dd94 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u-us3/common/mapfile-cap @@ -0,0 +1,66 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +$mapfile_version 2 + +CAPABILITY { + PLATFORM = "SUNW,A70"; + PLATFORM += "SUNW,Netra-210"; + PLATFORM += "SUNW,Netra-240"; + PLATFORM += "SUNW,Netra-440"; + PLATFORM += "SUNW,Netra-CP3010"; + PLATFORM += "SUNW,Netra-T12"; + PLATFORM += "SUNW,Netra-T4"; + PLATFORM += "SUNW,Sun-Blade-1000"; + PLATFORM += "SUNW,Sun-Blade-1500"; + PLATFORM += "SUNW,Sun-Blade-2500"; + PLATFORM += "SUNW,Sun-Fire-15000"; + PLATFORM += "SUNW,Sun-Fire-280R"; + PLATFORM += "SUNW,Sun-Fire-480R"; + PLATFORM += "SUNW,Sun-Fire-880"; + PLATFORM += "SUNW,Sun-Fire-V210"; + PLATFORM += "SUNW,Sun-Fire-V215"; + PLATFORM += "SUNW,Sun-Fire-V240"; + PLATFORM += "SUNW,Sun-Fire-V245"; + PLATFORM += "SUNW,Sun-Fire-V250"; + PLATFORM += "SUNW,Sun-Fire-V440"; + PLATFORM += "SUNW,Sun-Fire-V445"; + PLATFORM += "SUNW,Sun-Fire-V490"; + PLATFORM += "SUNW,Sun-Fire-V890"; + PLATFORM += "SUNW,Sun-Fire"; + MACHINE = sun4u; +}; + +SYMBOL_SCOPE { + global: + _memcmp; + _memcpy; + _memmove; + _memset; + memcmp; + memcpy; + memmove; + memset; + local: + *; +}; diff --git a/usr/src/lib/libc_psr/sun4u-us3/common/memcmp.s b/usr/src/lib/libc/capabilities/sun4u-us3/common/memcmp.s index 96c92e922a..fbbb3d6fb8 100644 --- a/usr/src/lib/libc_psr/sun4u-us3/common/memcmp.s +++ b/usr/src/lib/libc/capabilities/sun4u-us3/common/memcmp.s @@ -20,8 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. */ .file "memcmp.s" diff --git a/usr/src/lib/libc_psr/sun4u-us3/common/memcpy.s b/usr/src/lib/libc/capabilities/sun4u-us3/common/memcpy.s index 83206bf1dc..5b8bbff7cc 100644 --- a/usr/src/lib/libc_psr/sun4u-us3/common/memcpy.s +++ b/usr/src/lib/libc/capabilities/sun4u-us3/common/memcpy.s @@ -20,8 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. */ .file "memcpy.s" diff --git a/usr/src/lib/libc_psr/sun4u-us3/common/memset.s b/usr/src/lib/libc/capabilities/sun4u-us3/common/memset.s index c154528dd0..50139ee067 100644 --- a/usr/src/lib/libc_psr/sun4u-us3/common/memset.s +++ b/usr/src/lib/libc/capabilities/sun4u-us3/common/memset.s @@ -20,8 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. */ .file "memset.s" diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile b/usr/src/lib/libc/capabilities/sun4u/Makefile index 3415b4dee3..77aed04fa7 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u/Makefile @@ -18,29 +18,30 @@ # # CDDL HEADER END # + # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# lib/pkcs11/libsoftcrypto/sun4u/Makefile +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.lib -SUBDIRS = sparc sparcv9 +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) all := TARGET= all -check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -.PARALLEL: $(SUBDIRS) +.KEEP_STATE: + +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) -all check clean clobber install lint: $(SUBDIRS) +lint: -$(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(TARGET) +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile b/usr/src/lib/libc/capabilities/sun4u/Makefile.com index 5e5962bf76..0d8a28bfa1 100644 --- a/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile +++ b/usr/src/lib/libc/capabilities/sun4u/Makefile.com @@ -18,44 +18,29 @@ # # CDDL HEADER END # -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - # -# Platform specific Makefile for libc_psr. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -PLATFORM = sun4u-opl -COMPAT_PLAT = sun4u-us3 -CLASS = 32 - -OBJECTS = memcpy.o memset.o memcmp.o - -include ../Makefile.com - -MAPFILES = ../../sun4u/mapfile-vers $(MAPFILE.FLT) - -ASFLAGS += -xarch=v8plusb - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). +TRG_PLATFORM = sun4u +GEN_PLATFORM = sun4u -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) +include ../../Makefile.com -.KEEP_STATE: +OBJECTS = memcpy.o memset.o memcmp.o -MODULE = libc_psr.so.1 -LIBC_PSR_DIR = $(ROOT_PSM_LIB_DIR) -LIBC_PSR_LIB = $(LIBC_PSR_DIR)/$(MODULE) +include $(SRC)/lib/Makefile.lib -$(LIBC_PSR_DIRS): - -$(INS.dir) +IFLAGS = -I$(SRC)/uts/$(GEN_PLATFORM) \ + -I$(ROOT)/usr/platform/$(GEN_PLATFORM)/include -all: $(LIBS) +AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH) $(IFLAGS) +ASFLAGS = -P -K pic -install: all $(LIBC_PSR_DIR) $(ROOT_PSM_LIBS) +# memcpy.s provides __align_cpy_1 as an alias for memcpy. However, this isn't +# a WEAK symbol, and hence ld(1)'s ability to cull duplicate local symbols with +# the same address is compromised. The result is .SUNW_dynsymsort: duplicate +# symbol errors from check_rtime. Use elfedit to assign a weak binding. -include ../../Makefile.targ +POST_PROCESS_OBJCAP_O = elfedit -e "sym:st_bind __align_cpy_1 STB_WEAK" $@ diff --git a/usr/src/lib/libc/capabilities/sun4u/common/mapfile-cap b/usr/src/lib/libc/capabilities/sun4u/common/mapfile-cap new file mode 100644 index 0000000000..e2f6a94efc --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u/common/mapfile-cap @@ -0,0 +1,43 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +$mapfile_version 2 + +CAPABILITY sun4u { + MACHINE = sun4u; +}; + +SYMBOL_SCOPE { + global: + __align_cpy_1; + _memcmp; + _memcpy; + _memmove; + _memset; + memcmp; + memcpy; + memmove; + memset; + local: + *; +}; diff --git a/usr/src/lib/libc_psr/sun4u/common/memcmp.s b/usr/src/lib/libc/capabilities/sun4u/common/memcmp.s index e7691174ae..77b1d294cc 100644 --- a/usr/src/lib/libc_psr/sun4u/common/memcmp.s +++ b/usr/src/lib/libc/capabilities/sun4u/common/memcmp.s @@ -20,8 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. */ .file "memcmp.s" diff --git a/usr/src/lib/libc_psr/sun4u/common/memcpy.s b/usr/src/lib/libc/capabilities/sun4u/common/memcpy.s index 54f812696a..42cd4ce658 100644 --- a/usr/src/lib/libc_psr/sun4u/common/memcpy.s +++ b/usr/src/lib/libc/capabilities/sun4u/common/memcpy.s @@ -20,8 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. */ .file "memcpy.s" diff --git a/usr/src/lib/libc_psr/sun4u/common/memset.s b/usr/src/lib/libc/capabilities/sun4u/common/memset.s index 5a99e6bf96..eaf39a72f6 100644 --- a/usr/src/lib/libc_psr/sun4u/common/memset.s +++ b/usr/src/lib/libc/capabilities/sun4u/common/memset.s @@ -20,8 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. */ .file "memset.s" diff --git a/usr/src/lib/libc/capabilities/sun4u/sparc/Makefile b/usr/src/lib/libc/capabilities/sun4u/sparc/Makefile new file mode 100644 index 0000000000..9fa9433eac --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u/sparc/Makefile @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com + +ASFLAGS += -xarch=v8plusa -warn + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libc/capabilities/sun4u/sparcv9/Makefile b/usr/src/lib/libc/capabilities/sun4u/sparcv9/Makefile new file mode 100644 index 0000000000..f989107e59 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4u/sparcv9/Makefile @@ -0,0 +1,36 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com +include $(SRC)/lib/Makefile.lib.64 + +.KEEP_STATE: + +AS_CPPFLAGS += -D__sparcv9 +ASFLAGS += -xarch=v9a + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile new file mode 100644 index 0000000000..a23938e6d9 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile @@ -0,0 +1,46 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include $(SRC)/lib/Makefile.lib + +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) + +all := TARGET= all +clean := TARGET= clean +clobber := TARGET= clobber +install := TARGET= install + +.KEEP_STATE: + +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) + +lint: + +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + +FRC: diff --git a/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile.com index 564c1050ce..858fd7dda5 100644 --- a/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile.com @@ -18,39 +18,30 @@ # # CDDL HEADER END # + # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -include ../../Makefile.lib - -PLATFORM= sun4u-us3 -ALT_PLAT= sun4u_hwcap2 - -SUBDIRS= $(MACH) -SUBDIRS64= $(MACH64) - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber +TRG_PLATFORM = sun4v +GEN_PLATFORM = sun4v -.KEEP_STATE: +include ../../Makefile.com -all install clean clobber : lib32 \ - $(BUILD64) lib64 +OBJECTS = memcpy.o memset.o -lint: - @ $(ECHO) "Nothing to lint here: skipping" +include $(SRC)/lib/Makefile.lib -lib32: $(SUBDIRS) +IFLAGS = -I$(SRC)/uts/$(GEN_PLATFORM) \ + -I$(ROOT)/usr/include/v9 -lib64: $(SUBDIRS64) +AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH) $(IFLAGS) \ + -DNIAGARA_IMPL +ASFLAGS = -P -K pic -$(SUBDIRS) $(SUBDIRS64): FRC - @cd $@; pwd; $(MAKE) $(TARGET) +# memcpy.s provides __align_cpy_1 as an alias for memcpy. However, this isn't +# a WEAK symbol, and hence ld(1)'s ability to cull duplicate local symbols with +# the same address is compromised. The result is .SUNW_dynsymsort: duplicate +# symbol errors from check_rtime. Use elfedit to assign a weak binding. -FRC: +POST_PROCESS_OBJCAP_O = elfedit -e "sym:st_bind __align_cpy_1 STB_WEAK" $@ diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap1/common/mapfile-cap b/usr/src/lib/libc/capabilities/sun4v-hwcap1/common/mapfile-cap new file mode 100644 index 0000000000..b4dc200a22 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/common/mapfile-cap @@ -0,0 +1,42 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +$mapfile_version 2 + +CAPABILITY sun4v-hwcap1 { + MACHINE = sun4v; + HW += ASI_BLK_INIT; +}; + +SYMBOL_SCOPE { + global: + __align_cpy_1; + _memcpy; + _memmove; + _memset; + memcpy; + memmove; + memset; + local: + *; +}; diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile new file mode 100644 index 0000000000..b96dc6ffc0 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com + +ASFLAGS += -xarch=v8plus + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile new file mode 100644 index 0000000000..16234a0700 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com +include $(SRC)/lib/Makefile.lib.64 + +AS_CPPFLAGS += -D__sparcv9 +ASFLAGS += -xarch=v9 + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile new file mode 100644 index 0000000000..77aed04fa7 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile @@ -0,0 +1,47 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include $(SRC)/lib/Makefile.lib + +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) + +all := TARGET= all +clean := TARGET= clean +clobber := TARGET= clobber +install := TARGET= install + +.KEEP_STATE: + +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) + +lint: + +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + +FRC: diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile.com b/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile.com new file mode 100644 index 0000000000..de1d0a297d --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile.com @@ -0,0 +1,48 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +TRG_PLATFORM = sun4v +GEN_PLATFORM = sun4v + +include ../../Makefile.com + +OBJECTS = memcpy.o + +include $(SRC)/lib/Makefile.lib + +IFLAGS = -I$(SRC)/uts/$(GEN_PLATFORM) \ + -I$(ROOT)/usr/platform/sun4v/include \ + -I$(ROOT)/usr/include/v9 + +AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH) $(IFLAGS) \ + -DNIAGARA2_IMPL +ASFLAGS = -P -K pic + +# memcpy.s provides __align_cpy_1 as an alias for memcpy. However, this isn't +# a WEAK symbol, and hence ld(1)'s ability to cull duplicate local symbols with +# the same address is compromised. The result is .SUNW_dynsymsort: duplicate +# symbol errors from check_rtime. Use elfedit to assign a weak binding. + +POST_PROCESS_OBJCAP_O = elfedit -e "sym:st_bind __align_cpy_1 STB_WEAK" $@ diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap2/common/mapfile-cap b/usr/src/lib/libc/capabilities/sun4v-hwcap2/common/mapfile-cap new file mode 100644 index 0000000000..9b7d9fa961 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap2/common/mapfile-cap @@ -0,0 +1,40 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +$mapfile_version 2 + +CAPABILITY sun4v-hwcap2 { + MACHINE = sun4v; + HW += ASI_BLK_INIT VIS; +}; + +SYMBOL_SCOPE { + global: + __align_cpy_1; + _memcpy; + _memmove; + memcpy; + memmove; + local: + *; +}; diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap2/sparc/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap2/sparc/Makefile new file mode 100644 index 0000000000..9e81c99669 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap2/sparc/Makefile @@ -0,0 +1,32 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com + +ASFLAGS += -xarch=v8plusa + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap2/sparcv9/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap2/sparcv9/Makefile new file mode 100644 index 0000000000..b6b9819fe8 --- /dev/null +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap2/sparcv9/Makefile @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com +include $(SRC)/lib/Makefile.lib.64 + +AS_CPPFLAGS += -D__sparcv9 +ASFLAGS += -xarch=v9a + +all install: $(SYMCAP) + +include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/sun4v/common/memcpy.s b/usr/src/lib/libc/capabilities/sun4v/common/memcpy.s index 7b516dac1d..75a2b3fbdb 100644 --- a/usr/src/lib/libc_psr/sun4v/common/memcpy.s +++ b/usr/src/lib/libc/capabilities/sun4v/common/memcpy.s @@ -20,8 +20,7 @@ */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. */ .file "memcpy.s" diff --git a/usr/src/lib/libc_psr/sun4v/common/memset.s b/usr/src/lib/libc/capabilities/sun4v/common/memset.s index bf46b9e130..1c23e6ed4b 100644 --- a/usr/src/lib/libc_psr/sun4v/common/memset.s +++ b/usr/src/lib/libc/capabilities/sun4v/common/memset.s @@ -20,8 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. */ .file "memset.s" diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com index f2cf98b304..50d06a4e4f 100644 --- a/usr/src/lib/libc/i386/Makefile.com +++ b/usr/src/lib/libc/i386/Makefile.com @@ -23,12 +23,13 @@ # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # -LIB_PIC= libc_pic.a -VERS= .1 -CPP= /usr/lib/cpp +LIBCDIR= $(SRC)/lib/libc +LIB_PIC= libc_pic.a +VERS= .1 +CPP= /usr/lib/cpp TARGET_ARCH= i386 -VALUES= values-Xa.o +VALUES= values-Xa.o # objects are grouped by source directory @@ -316,7 +317,7 @@ SYSOBJS= \ vforkx.o \ xstat.o -# objects under ../port which contain transitional large file interfaces +# objects under $(LIBCDIR)/port which contain transitional large file interfaces PORTGEN64= \ _xftw64.o \ attropen64.o \ @@ -326,7 +327,7 @@ PORTGEN64= \ tell64.o \ truncate64.o -# objects from source under ../port +# objects from source under $(LIBCDIR)/port PORTFP= \ __flt_decim.o \ __flt_rounds.o \ @@ -951,16 +952,17 @@ CFLAGS += $(XSTRCONST) ALTPICS= $(TRACEOBJS:%=pics/%) $(DYNLIB) := PICS += $(ROOTFS_LIBDIR)/libc_i18n.a -$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(LDLIBS) +$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) \ + $(EXTPICS) $(LDLIBS) -MAPFILES = ../port/mapfile-vers +MAPFILES = $(LIBCDIR)/port/mapfile-vers # # EXTN_CPPFLAGS and EXTN_CFLAGS set in enclosing Makefile # CFLAGS += $(EXTN_CFLAGS) CPPFLAGS= -D_REENTRANT -Di386 $(EXTN_CPPFLAGS) $(THREAD_DEBUG) \ - -I$(LIBCBASE)/inc -I../inc $(CPPFLAGS.master) + -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc $(CPPFLAGS.master) ASFLAGS= $(AS_PICFLAGS) -P -D__STDC__ -D_ASM $(CPPFLAGS) $(i386_AS_XARCH) # As a favor to the dtrace syscall provider, libc still calls the @@ -1001,8 +1003,8 @@ BUILD.AR= $(RM) $@ ; \ # extra files for the clean target CLEANFILES= \ - ../port/gen/errlst.c \ - ../port/gen/new_list.c \ + $(LIBCDIR)/port/gen/errlst.c \ + $(LIBCDIR)/port/gen/new_list.c \ assym.h \ genassym \ crt/_rtld.s \ @@ -1020,21 +1022,21 @@ SRCS= \ $(XATTROBJS:%.o=$(SRC)/common/xattr/%.c) \ $(COMOBJS:%.o=$(SRC)/common/util/%.c) \ $(DTRACEOBJS:%.o=$(SRC)/common/dtrace/%.c) \ - $(PORTFP:%.o=../port/fp/%.c) \ - $(PORTGEN:%.o=../port/gen/%.c) \ - $(PORTI18N:%.o=../port/i18n/%.c) \ - $(PORTPRINT:%.o=../port/print/%.c) \ - $(PORTREGEX:%.o=../port/regex/%.c) \ - $(PORTSTDIO:%.o=../port/stdio/%.c) \ - $(PORTSYS:%.o=../port/sys/%.c) \ - $(AIOOBJS:%.o=../port/aio/%.c) \ - $(RTOBJS:%.o=../port/rt/%.c) \ - $(TPOOLOBJS:%.o=../port/tpool/%.c) \ - $(THREADSOBJS:%.o=../port/threads/%.c) \ - $(THREADSMACHOBJS:%.o=../$(MACH)/threads/%.c) \ + $(PORTFP:%.o=$(LIBCDIR)/port/fp/%.c) \ + $(PORTGEN:%.o=$(LIBCDIR)/port/gen/%.c) \ + $(PORTI18N:%.o=$(LIBCDIR)/port/i18n/%.c) \ + $(PORTPRINT:%.o=$(LIBCDIR)/port/print/%.c) \ + $(PORTREGEX:%.o=$(LIBCDIR)/port/regex/%.c) \ + $(PORTSTDIO:%.o=$(LIBCDIR)/port/stdio/%.c) \ + $(PORTSYS:%.o=$(LIBCDIR)/port/sys/%.c) \ + $(AIOOBJS:%.o=$(LIBCDIR)/port/aio/%.c) \ + $(RTOBJS:%.o=$(LIBCDIR)/port/rt/%.c) \ + $(TPOOLOBJS:%.o=$(LIBCDIR)/port/tpool/%.c) \ + $(THREADSOBJS:%.o=$(LIBCDIR)/port/threads/%.c) \ + $(THREADSMACHOBJS:%.o=$(LIBCDIR)/$(MACH)/threads/%.c) \ $(UNICODEOBJS:%.o=$(SRC)/common/unicode/%.c) \ - $(UNWINDMACHOBJS:%.o=../port/unwind/%.c) \ - $(FPOBJS:%.o=../$(MACH)/fp/%.c) \ + $(UNWINDMACHOBJS:%.o=$(LIBCDIR)/port/unwind/%.c) \ + $(FPOBJS:%.o=$(LIBCDIR)/$(MACH)/fp/%.c) \ $(LIBCBASE)/gen/ecvt.c \ $(LIBCBASE)/gen/makectxt.c \ $(LIBCBASE)/gen/siginfolst.c \ @@ -1127,7 +1129,7 @@ $(PORTI18N_COND:%=pics/%) := \ all: $(LIBS) $(LIB_PIC) -lint := CPPFLAGS += -I../$(MACH)/fp +lint := CPPFLAGS += -I$(LIBCDIR)/$(MACH)/fp lint := CPPFLAGS += -D_MSE_INT_H -D_LCONV_C99 lint := LINTFLAGS += -mn -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED @@ -1135,7 +1137,7 @@ lint: @echo $(LINT.c) ... @$(LINT.c) $(SRCS) $(LDLIBS) -$(LINTLIB):= SRCS=../port/llib-lc +$(LINTLIB):= SRCS=$(LIBCDIR)/port/llib-lc $(LINTLIB):= CPPFLAGS += -D_MSE_INT_H $(LINTLIB):= LINTFLAGS=-nvx @@ -1144,7 +1146,7 @@ $(TIL:%=pics/%): $(LIBCBASE)/threads/i386.il # pics/mul64.o: $(LIBCBASE)/crt/mul64.il # include common libc targets -include ../Makefile.targ +include $(LIBCDIR)/Makefile.targ # We need to strip out all CTF and DOF data from the static library $(LIB_PIC) := DIR = pics @@ -1180,7 +1182,7 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h # assym.h build rules -GENASSYM_C = ../$(MACH)/genassym.c +GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c # XXX A hack. Perhaps this should be 'CPPFLAGS.native' and # live in Makefile.master @@ -1189,20 +1191,20 @@ CPPFLAGS.genassym = \ $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) genassym: $(GENASSYM_C) - $(NATIVECC) -I$(LIBCBASE)/inc -I../inc \ + $(NATIVECC) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \ -D__EXTENSIONS__ $(CPPFLAGS.genassym) -o $@ $(GENASSYM_C) -OFFSETS = ../$(MACH)/offsets.in +OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in assym.h: $(OFFSETS) genassym $(OFFSETS_CREATE) <$(OFFSETS) >$@ ./genassym >>$@ # derived C source and related explicit dependencies -../port/gen/errlst.c + \ -../port/gen/new_list.c: ../port/gen/errlist ../port/gen/errlist.awk - cd ../port/gen; pwd; $(AWK) -f errlist.awk < errlist +$(LIBCDIR)/port/gen/errlst.c + \ +$(LIBCDIR)/port/gen/new_list.c: $(LIBCDIR)/port/gen/errlist $(LIBCDIR)/port/gen/errlist.awk + cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist -pics/errlst.o: ../port/gen/errlst.c +pics/errlst.o: $(LIBCDIR)/port/gen/errlst.c -pics/new_list.o: ../port/gen/new_list.c +pics/new_list.o: $(LIBCDIR)/port/gen/new_list.c diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers index f557f958b6..a3dae49082 100644 --- a/usr/src/lib/libc/port/mapfile-vers +++ b/usr/src/lib/libc/port/mapfile-vers @@ -101,6 +101,11 @@ $error unknown platform $endif protected: + +$if sparc32 + __align_cpy_1; +$endif + addrtosymstr; aio_cancel; aiocancel; @@ -1794,6 +1799,10 @@ $endif ldexp { TYPE = FUNCTION; FILTER = libm.so.2 }; logb { TYPE = FUNCTION; FILTER = libm.so.2 }; malloc { FLAGS = NODIRECT }; + memcmp; + memcpy; + memmove; + memset; modf { TYPE = FUNCTION; FILTER = libm.so.2 }; _modf { TYPE = FUNCTION; FILTER = libm.so.2 }; nextafter { TYPE = FUNCTION; FILTER = libm.so.2 }; @@ -1810,14 +1819,6 @@ $endif _timezone; tzname; _tzname; - -$if _x86 - memcmp; - memcpy; - memmove; - memset; -$endif - $if i386 _fp_hw; $endif @@ -2507,6 +2508,10 @@ SYMBOL_VERSION SUNWprivate_1.1 { _lten { FLAGS = NODYNSORT }; _lzero { FLAGS = NODYNSORT }; __malloc_lock; + _memcmp; + _memcpy { FLAGS = NODYNSORT }; + _memmove; + _memset; _modff { TYPE = FUNCTION; FILTER = libm.so.2 }; __nan_read; __nan_written; @@ -2576,14 +2581,6 @@ $if _sparc __mon_lengths; __yday_to_month; $endif - -$if _x86 - _memcmp; - _memcpy; - _memmove; - _memset; -$endif - $if i386 _sse_hw; $endif diff --git a/usr/src/lib/libc/sparc/Makefile b/usr/src/lib/libc/sparc/Makefile index 455c908a1e..592fcef514 100644 --- a/usr/src/lib/libc/sparc/Makefile +++ b/usr/src/lib/libc/sparc/Makefile @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. # LIBCBASE=. @@ -35,6 +34,4 @@ PRFOBJS= \ strlen.o \ strcpy.o -MAPFILE_AUX = mapfile-vers-aux - include Makefile.com diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com index ff779c4d07..b03c067933 100644 --- a/usr/src/lib/libc/sparc/Makefile.com +++ b/usr/src/lib/libc/sparc/Makefile.com @@ -24,13 +24,22 @@ # LIBCDIR= $(SRC)/lib/libc -LIB_PIC= libc_pic.a -VERS= .1 -CPP= /usr/lib/cpp +LIB_PIC= libc_pic.a +VERS= .1 +CPP= /usr/lib/cpp TARGET_ARCH= sparc # objects are grouped by source directory +# Symbol capabilities objects. +EXTPICS= \ + $(LIBCDIR)/capabilities/sun4u/sparc/pics/symcap.o \ + $(LIBCDIR)/capabilities/sun4u-opl/sparc/pics/symcap.o \ + $(LIBCDIR)/capabilities/sun4u-us3-hwcap1/sparc/pics/symcap.o \ + $(LIBCDIR)/capabilities/sun4u-us3-hwcap2/sparc/pics/symcap.o \ + $(LIBCDIR)/capabilities/sun4v-hwcap1/sparc/pics/symcap.o \ + $(LIBCDIR)/capabilities/sun4v-hwcap2/sparc/pics/symcap.o + # local objects STRETS= \ stret1.o \ @@ -973,9 +982,9 @@ CFLAGS += $(XSTRCONST) ALTPICS= $(TRACEOBJS:%=pics/%) $(DYNLIB) := PICS += $(ROOTFS_LIBDIR)/libc_i18n.a -$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) +$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS) -MAPFILES = $(LIBCDIR)/port/mapfile-vers $(MAPFILE_AUX) +MAPFILES = $(LIBCDIR)/port/mapfile-vers CFLAGS += $(EXTN_CFLAGS) CPPFLAGS= -D_REENTRANT -Dsparc $(EXTN_CPPFLAGS) $(THREAD_DEBUG) \ diff --git a/usr/src/lib/libc/sparc/gen/memcpy.s b/usr/src/lib/libc/sparc/gen/memcpy.s index c24b290db6..d0e18cfeac 100644 --- a/usr/src/lib/libc/sparc/gen/memcpy.s +++ b/usr/src/lib/libc/sparc/gen/memcpy.s @@ -20,8 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved. */ .file "memcpy.s" @@ -54,6 +53,7 @@ ANSI_PRAGMA_WEAK(memcpy,function) ENTRY(memcpy) + ENTRY(__align_cpy_1) st %o0, [%sp + 68] ! save des address for return val cmp %o2, 17 ! for small counts copy bytes bleu .dbytecp diff --git a/usr/src/lib/libc/sparc/mapfile-vers-aux b/usr/src/lib/libc/sparc/mapfile-vers-aux deleted file mode 100644 index 96e77f95be..0000000000 --- a/usr/src/lib/libc/sparc/mapfile-vers-aux +++ /dev/null @@ -1,58 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# MAPFILE HEADER START -# -# WARNING: STOP NOW. DO NOT MODIFY THIS FILE. -# Object versioning must comply with the rules detailed in -# -# usr/src/lib/README.mapfiles -# -# You should not be making modifications here until you've read the most current -# copy of that file. If you need help, contact a gatekeeper for guidance. -# -# MAPFILE HEADER END -# - -$mapfile_version 2 - -SYMBOL_VERSION SYSVABI_1.3 { - global: - memcmp { AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 }; - memcpy { AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 }; - memmove { AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 }; - memset { AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 }; -}; - -SYMBOL_VERSION SUNWprivate_1.1 { - global: - _memcmp { AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 }; - _memcpy { - AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1; - FLAGS = NODYNSORT; - }; - _memmove { AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 }; - _memset { AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 }; -}; diff --git a/usr/src/lib/libc/sparc_hwcap1/sparc/Makefile b/usr/src/lib/libc/sparc_hwcap1/sparc/Makefile deleted file mode 100644 index d648203adc..0000000000 --- a/usr/src/lib/libc/sparc_hwcap1/sparc/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -LIBCBASE= $(SRC)/lib/libc/sparc - -LIBRARY= libc_hwcap1.a - -EXTN_CPPFLAGS= -I$(SRC)/uts/sun4v -I$(ROOT)/usr/platform/sun4v/include -EXTN_ASFLAGS= -xarch=v8plusd -EXTN_DYNFLAGS= -M mapfile - -# Defining this means build targets will first try to use source from this -# directory before falling back to unoptimized sun4v source. -# -OPTIMIZED_LIBCBASE=../common - -PRFOBJS= \ - memcpy.o \ - memmove.o \ - memset.o \ - strlen.o \ - strcpy.o \ - -MAPFILE_AUX = mapfile-vers-aux - -include $(SRC)/lib/libc/sparc/Makefile.com diff --git a/usr/src/lib/libc/sparcv9/Makefile b/usr/src/lib/libc/sparcv9/Makefile index 455c908a1e..4a76730bb8 100644 --- a/usr/src/lib/libc/sparcv9/Makefile +++ b/usr/src/lib/libc/sparcv9/Makefile @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. # LIBCBASE=. @@ -35,6 +34,4 @@ PRFOBJS= \ strlen.o \ strcpy.o -MAPFILE_AUX = mapfile-vers-aux - include Makefile.com diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com index e932c01dc1..2144a07e17 100644 --- a/usr/src/lib/libc/sparcv9/Makefile.com +++ b/usr/src/lib/libc/sparcv9/Makefile.com @@ -24,13 +24,22 @@ # LIBCDIR= $(SRC)/lib/libc -LIB_PIC= libc_pic.a -VERS= .1 -CPP= /usr/lib/cpp +LIB_PIC= libc_pic.a +VERS= .1 +CPP= /usr/lib/cpp TARGET_ARCH= sparc # objects are grouped by source directory +# Symbol capabilities objects. +EXTPICS= \ + $(LIBCDIR)/capabilities/sun4u/sparcv9/pics/symcap.o \ + $(LIBCDIR)/capabilities/sun4u-opl/sparcv9/pics/symcap.o \ + $(LIBCDIR)/capabilities/sun4u-us3-hwcap1/sparcv9/pics/symcap.o \ + $(LIBCDIR)/capabilities/sun4u-us3-hwcap2/sparcv9/pics/symcap.o \ + $(LIBCDIR)/capabilities/sun4v-hwcap1/sparcv9/pics/symcap.o \ + $(LIBCDIR)/capabilities/sun4v-hwcap2/sparcv9/pics/symcap.o + # local objects STRETS= @@ -922,9 +931,9 @@ CFLAGS64 += $(XSTRCONST) ALTPICS= $(TRACEOBJS:%=pics/%) $(DYNLIB) := PICS += $(ROOTFS_LIBDIR64)/libc_i18n.a -$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) +$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS) -MAPFILES = $(LIBCDIR)/port/mapfile-vers $(MAPFILE_AUX) +MAPFILES = $(LIBCDIR)/port/mapfile-vers sparcv9_C_PICFLAGS= -K PIC CFLAGS64 += $(EXTN_CFLAGS) diff --git a/usr/src/lib/libc/sparcv9/mapfile-vers-aux b/usr/src/lib/libc/sparcv9/mapfile-vers-aux deleted file mode 100644 index 2f00ec63be..0000000000 --- a/usr/src/lib/libc/sparcv9/mapfile-vers-aux +++ /dev/null @@ -1,58 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# MAPFILE HEADER START -# -# WARNING: STOP NOW. DO NOT MODIFY THIS FILE. -# Object versioning must comply with the rules detailed in -# -# usr/src/lib/README.mapfiles -# -# You should not be making modifications here until you've read the most current -# copy of that file. If you need help, contact a gatekeeper for guidance. -# -# MAPFILE HEADER END -# - -$mapfile_version 2 - -SYMBOL_VERSION SUNW_0.7 { # SunOS 5.3 (Solaris 2.3) - global: - memcmp { AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 }; - memcpy { AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 }; - memmove { AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 }; - memset { AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 }; -}; - -SYMBOL_VERSION SUNWprivate_1.1 { - global: - _memcmp { AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 }; - _memcpy { - AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1; - FLAGS = NODYNSORT; - }; - _memmove { AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 }; - _memset { AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 }; -}; diff --git a/usr/src/lib/libc_psr/Makefile.targ b/usr/src/lib/libc_psr/Makefile.targ deleted file mode 100644 index 6e25007ffc..0000000000 --- a/usr/src/lib/libc_psr/Makefile.targ +++ /dev/null @@ -1,32 +0,0 @@ -# -# 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. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -include $(SRC)/lib/Makefile.targ -include $(SRC)/Makefile.psm.targ - -pics/%.o := ASFLAGS += $(AS_PICFLAGS) diff --git a/usr/src/lib/libc_psr/etc/Makefile b/usr/src/lib/libc_psr/etc/Makefile deleted file mode 100644 index 4fae2758ed..0000000000 --- a/usr/src/lib/libc_psr/etc/Makefile +++ /dev/null @@ -1,85 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# Makefile for libc_psr (hwcap) flarcreate precreation scripts -# -# -# usr/src/lib/libc_psr/etc/Makefile - -include ../../../Makefile.master - -FLASHPRESRC= caplib.ksh -FLASHPREPROG= $(FLASHPRESRC:%.ksh=%) - -all:= TARGET= all -install:= TARGET= install -clean:= TARGET= clean -clobber:= TARGET= clobber -lint:= TARGET= lint - -ROOTETC= $(ROOT)/etc -ETCFLASHD= $(ROOTETC)/flash -ETCFLASHPREC= $(ROOTETC)/flash/precreation -ETCFLASHPREE= $(ROOTETC)/flash/preexit -ETCFLASHPOSTC= $(ROOTETC)/flash/postcreation - -DIRS= $(ETCFLASHPREC) $(ETCFLASHPREE) $(ETCFLASHPOSTC) - -ETCFLASHPREPROG= $(FLASHPREPROG:%=$(ETCFLASHPREC)/%) - -$(ETCFLASHD) := DIRMODE= 755 -$(ETCFLASHPREC) := DIRMODE= 700 -$(ETCFLASHPREE) := DIRMODE= 700 -$(ETCFLASHPOSTC) := DIRMODE= 700 -$(ETCFLASHPREPROG) := FILEMODE= 0500 - -.KEEP_STATE: - -all: $(FLASHPREPROG) - -install: all .WAIT $(DIRS) .WAIT $(ETCFLASHPREPROG) - -cstyle: - -lint: - -$(FLASHPREPROG): $(FLASHPRESRC) - $(CP) $@.ksh $@ - -$(DIRS): - $(INS.dir) - -$(ETCFLASHPREC)/% : % - $(INS.file) - -$(ETCFLASHPREE)/% : % - $(INS.file) - -$(ETCFLASHPOSTC)/% : % - $(INS.file) - -clean: - $(RM) $(FLASHPREPROG) - -clobber: clean - $(RM) $(ETCFLASHPREPROG) diff --git a/usr/src/lib/libc_psr/etc/caplib.ksh b/usr/src/lib/libc_psr/etc/caplib.ksh deleted file mode 100755 index fc7f5eed65..0000000000 --- a/usr/src/lib/libc_psr/etc/caplib.ksh +++ /dev/null @@ -1,136 +0,0 @@ -#!/bin/ksh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# This script is called by flarcreate.sh -# -# Unmount any hwcap libraries (like /usr/lib/libc_psr/libc_psr_hwcap2.so.1) -# and store commands needed to remount them in preexit/remount_hwcap.xxxx -# scripts, which remounts them in the preexit phase. -# - -if [ -z "$FLASH_PID" ]; then - echo "$0: ERROR: FLASH_PID not set in execution environment, exiting..." - exit 1 -fi -if [ -z "$FLASH_DIR" ]; then - echo "$0: ERROR: FLASH_DIR not set in execution environment, exiting..." - exit 1 -fi - -CHMOD=/usr/bin/chmod -MOUNT=/usr/sbin/mount -UMOUNT=/usr/sbin/umount -EGREP=/usr/bin/egrep -SED=/usr/bin/sed -CMD_LIST="$CHMOD $MOUNT $UMOUNT $EGREP $SED" - -for cmd in $CMD_LIST -do - if [ ! -x $cmd ]; then - echo "$0: ERROR: $cmd not found or not executable, exiting..." - exit 1 - fi -done - -# -# Fill "LIBS" with a list of mounted libraries in the form: -# MOUNTPOUNT:FILE -# e.g.: -# /lib/libc.so.1:/usr/lib/libc/libc_hwcap2.so.1 -# -LIBS=`$MOUNT | $EGREP "^/platform.*hwcap" | \ - $SED -e 's:^\(/[^ ]*\) on \([^ ]*\).*$:\1@\2:'` - -if [ -z "$LIBS" ]; then - exit 0 -fi - -REMOUNT_DIR=${FLASH_DIR}/preexit -REMOUNT=${REMOUNT_DIR}/remount_hwcap.${FLASH_PID} - -# -# Create the flash preexit script directory for the remount scripts if it -# doesn't already exist. -# -if [ ! -d $REMOUNT_DIR ]; then - umask 077 - /usr/bin/mkdir $REMOUNT_DIR - if [ $? -ne 0 ]; then - echo "$0: ERROR: could not mkdir $REMOUNT_DIR, exiting..." - exit 1 - fi -fi - -# -# If an old remount script by this name exists, delete it -# -if [ -f $REMOUNT ]; then - /bin/rm -f $REMOUNT -fi - -umask 477 - -cat > $REMOUNT << EOF -#!/bin/sh -if [ \"\$FLASH_PID\" != \"$FLASH_PID\" ]; then - /bin/rm -f $REMOUNT - exit 0 -fi -EOF - -if [ $? -ne 0 ]; then - echo "$0: ERROR: could not create $REMOUNT, exiting..." - exit 1 -fi - -# -# Now process each of the libraries that are mounted. For each, find out if -# it's a hwcap library; if it is, unmount it and write instructions to the -# preexit script as to how to remount it. -# -for entry in $LIBS -do - echo $entry | IFS=@ read MOUNTPOINT MOUNTLIB - $UMOUNT $MOUNTPOINT || $UMOUNT -f $MOUNTPOINT || \ - { echo "$0: ERROR: Could not unmount" \ - "$MOUNTPOINT, exiting..."; \ - /bin/sh $REMOUNT; /bin/rm -f $REMOUNT; exit 1; } - - MOUNTOPTS="-O -F lofs" - echo "$MOUNT $MOUNTOPTS $MOUNTLIB $MOUNTPOINT" >> $REMOUNT -done - -# -# Write final cleanup instructions to the flash preexit remount script and make -# it executable. -# -echo "/bin/rm -f $REMOUNT" >> $REMOUNT -echo "exit 0" >> $REMOUNT -$CHMOD 0500 $REMOUNT -exit 0 diff --git a/usr/src/lib/libc_psr/sun4u-opl/Makefile b/usr/src/lib/libc_psr/sun4u-opl/Makefile deleted file mode 100644 index d42f5eae13..0000000000 --- a/usr/src/lib/libc_psr/sun4u-opl/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -include $(SRC)/lib/Makefile.lib -include $(SRC)/Makefile.psm - -PLATFORM= sun4u-opl - -SUBDIRS= $(MACH) -SUBDIRS64= $(MACH64) - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber - -MODULE = libc_psr.so.1 -LIBC_PSR_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib) -LIBC_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE)) -INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ -LIBC_PSR64_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)) -LIBC_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE)) -INS.slink7 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ - -# -# Used when building links in /platform/$(PLATFORM)/lib -# -LINKED_PLATFORMS = SUNW,SPARC-Enterprise - -all install: lib32 $(BUILD64) lib64 $(LIBC_PSR_LINKS) $(LIBC_PSR64_LINKS) - -clean clobber: lib32 $(BUILD64) lib64 - -$(LIBC_PSR_DIRS): - -$(INS.dir) - -$(LIBC_PSR_LINKS): $(LIBC_PSR_DIRS) - -$(INS.slink6) - -$(LIBC_PSR64_DIRS): - -$(INS.dir) - -$(LIBC_PSR64_LINKS): $(LIBC_PSR64_DIRS) - -$(INS.slink7) - -lint: - @ $(ECHO) "Nothing to lint here: skipping" - -lib32: $(SUBDIRS) - -lib64: $(SUBDIRS64) - -$(SUBDIRS) $(SUBDIRS64): FRC - @cd $@; pwd; $(MAKE) $(TARGET) - -FRC: diff --git a/usr/src/lib/libc_psr/sun4u-opl/Makefile.com b/usr/src/lib/libc_psr/sun4u-opl/Makefile.com deleted file mode 100644 index 107550d626..0000000000 --- a/usr/src/lib/libc_psr/sun4u-opl/Makefile.com +++ /dev/null @@ -1,67 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -# -# Create default so empty rules don't -# confuse make -# - -LIBRARY = libc_psr.a -VERS = .1 - -include $(SRC)/lib/Makefile.lib -include $(SRC)/Makefile.psm - -# -# Since libc_psr is strictly assembly, deactivate the CTF build logic. -# -CTFCONVERT_POST = : -CTFMERGE_LIB = : - -LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/uts/sun4u \ - -I$(ROOT)/usr/platform/sun4u/include -CPPFLAGS = -D_REENTRANT -D$(MACH) $(IFLAGS) $(CPPFLAGS.master) -ASDEFS = -D__STDC__ -D_ASM $(CPPFLAGS) -ASFLAGS = -P $(ASDEFS) - -# -# install rule -# -$(ROOT_PSM_LIB_DIR)/%: % $(ROOT_PSM_LIB_DIR) - $(INS.file) - -# -# build rules -# -pics/%.o: ../../$(PLATFORM)/common/%.s - $(AS) $(ASFLAGS) $< -o $@ - $(POST_PROCESS_O) - -pics/%.o: ../../$(COMPAT_PLAT)/common/%.s - $(AS) $(ASFLAGS) $< -o $@ - $(POST_PROCESS_O) diff --git a/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile deleted file mode 100644 index 7b6318a413..0000000000 --- a/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - - -# -# Platform specific Makefile for libc_psr. -# - -PLATFORM = sun4u-opl -COMPAT_PLAT = sun4u-us3 -CLASS = 64 - -OBJECTS = memcpy.o memset.o memcmp.o - -include ../Makefile.com - -MAPFILES = ../../sun4u/mapfile-vers $(MAPFILE.FLT) - -ASDEFS += -D__sparcv9 -ASFLAGS += -xarch=v9b - -include $(SRC)/Makefile.master.64 - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -MODULE = libc_psr.so.1 -LIBC_PSR64_DIR = $(ROOT_PSM_LIB_DIR)/$(MACH64) -LIBC_PSR64_LIB = $(LIBC_PSR64_DIR)/$(MODULE) - -$(LIBC_PSR64_DIRS): - -$(INS.dir) - -all: $(LIBS) - -install: all $(LIBC_PSR64_DIR) $(ROOT_PSM_LIB64_DIR)/$(LIBS) - -include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/sun4u-us3/Makefile b/usr/src/lib/libc_psr/sun4u-us3/Makefile deleted file mode 100644 index ee1ea7bb7f..0000000000 --- a/usr/src/lib/libc_psr/sun4u-us3/Makefile +++ /dev/null @@ -1,102 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -include $(SRC)/lib/Makefile.lib -include $(SRC)/Makefile.psm - -PLATFORM = sun4u-us3 - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber - -TOUCH = /usr/bin/touch - -MODULE = libc_psr.so.1 -LIBC_PSR_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib) -LIBC_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE)) -INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ -LIBC_PSR64_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)) -LIBC_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE)) -INS.slink7 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ - -# -# Used when building links in /platform/$(PLATFORM)/lib -# -LINKED_PLATFORMS = SUNW,Sun-Blade-1000 -LINKED_PLATFORMS += SUNW,Sun-Blade-1500 -LINKED_PLATFORMS += SUNW,Sun-Blade-2500 -LINKED_PLATFORMS += SUNW,A70 -LINKED_PLATFORMS += SUNW,Sun-Fire -LINKED_PLATFORMS += SUNW,Sun-Fire-V240 -LINKED_PLATFORMS += SUNW,Sun-Fire-V250 -LINKED_PLATFORMS += SUNW,Sun-Fire-V440 -LINKED_PLATFORMS += SUNW,Sun-Fire-280R -LINKED_PLATFORMS += SUNW,Sun-Fire-15000 -LINKED_PLATFORMS += SUNW,Sun-Fire-880 -LINKED_PLATFORMS += SUNW,Sun-Fire-480R -LINKED_PLATFORMS += SUNW,Netra-T12 -LINKED_PLATFORMS += SUNW,Netra-T4 -LINKED_PLATFORMS += SUNW,Netra-CP3010 -LINKED_PLATFORMS += SUNW,Sun-Fire-V215 -LINKED_PLATFORMS += SUNW,Sun-Fire-V445 - -$(ROOT_PSM_LIB_DIR): - -$(INS.dir) - -$(ROOT_PSM_LIB_DIR)/$(MODULE): $(ROOT_PSM_LIB_DIR) $(MODULE) - $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE) - -$(ROOT_PSM_LIB64_DIR): - -$(INS.dir) - -$(ROOT_PSM_LIB64_DIR)/$(MODULE): $(ROOT_PSM_LIB64_DIR) $(MODULE) - $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE) - -$(LIBC_PSR_DIRS): - -$(INS.dir) - -$(LIBC_PSR_LINKS): $(LIBC_PSR_DIRS) - -$(INS.slink6) - -$(LIBC_PSR64_DIRS): - -$(INS.dir) - -$(LIBC_PSR64_LINKS): $(LIBC_PSR64_DIRS) - -$(INS.slink7) - -all: FRC - @$(TOUCH) $(MODULE) - -install: all $(ROOT_PSM_LIB_DIR)/$(MODULE) $(ROOT_PSM_LIB64_DIR)/$(MODULE) $(LIBC_PSR_LINKS) $(LIBC_PSR64_LINKS) - -clean clobber : FRC - $(RM) $(MODULE) - -lint: - @ $(ECHO) "Nothing to lint here: skipping" - -FRC: diff --git a/usr/src/lib/libc_psr/sun4u/Makefile.com b/usr/src/lib/libc_psr/sun4u/Makefile.com deleted file mode 100644 index 4df215f817..0000000000 --- a/usr/src/lib/libc_psr/sun4u/Makefile.com +++ /dev/null @@ -1,85 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# Create default so empty rules don't -# confuse make -# - -LIBRARY = libc_psr.a -VERS = .1 - -include $(SRC)/lib/Makefile.lib -include $(SRC)/Makefile.psm - -# -# Since libc_psr is strictly assembly, deactivate the CTF build logic. -# -CTFCONVERT_POST = : -CTFMERGE_LIB = : - -LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/uts/$(PLATFORM) \ - -I$(ROOT)/usr/platform/$(PLATFORM)/include -CPPFLAGS = -D_REENTRANT -D$(MACH) $(IFLAGS) $(CPPFLAGS.master) -ASDEFS = -D__STDC__ -D_ASM $(CPPFLAGS) -ASFLAGS = -P $(ASDEFS) - -MAPFILES = ../../sun4u/mapfile-vers ../../sun4u/mapfile-memcpy \ - $(MAPFILE.FLT) - -# -# Used when building links in /platform/$(PLATFORM)/lib -# -LINKED_PLATFORMS = SUNW,Ultra-2 -LINKED_PLATFORMS += SUNW,Ultra-4 -LINKED_PLATFORMS += SUNW,Ultra-5_10 -LINKED_PLATFORMS += SUNW,Ultra-30 -LINKED_PLATFORMS += SUNW,Ultra-60 -LINKED_PLATFORMS += SUNW,Ultra-80 -LINKED_PLATFORMS += SUNW,Ultra-250 -LINKED_PLATFORMS += SUNW,Ultra-Enterprise -LINKED_PLATFORMS += SUNW,Ultra-Enterprise-10000 -LINKED_PLATFORMS += SUNW,UltraAX-i2 -LINKED_PLATFORMS += SUNW,UltraSPARC-IIi-Netract -LINKED_PLATFORMS += SUNW,UltraSPARC-IIe-NetraCT-40 -LINKED_PLATFORMS += SUNW,UltraSPARC-IIe-NetraCT-60 -LINKED_PLATFORMS += SUNW,Sun-Blade-100 -LINKED_PLATFORMS += SUNW,Serverblade1 -LINKED_PLATFORMS += SUNW,Netra-CP2300 - -# -# install rule -# -$(ROOT_PSM_LIB_DIR)/%: % $(ROOT_PSM_LIB_DIR) - $(INS.file) - -# -# build rules -# -pics/%.o: ../../$(PLATFORM)/common/%.s - $(AS) $(ASFLAGS) $< -o $@ - $(POST_PROCESS_O) diff --git a/usr/src/lib/libc_psr/sun4u/sparc/Makefile b/usr/src/lib/libc_psr/sun4u/sparc/Makefile deleted file mode 100644 index aef22af9ec..0000000000 --- a/usr/src/lib/libc_psr/sun4u/sparc/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# Platform specific Makefile for libc_psr. -# - -CLASS = 32 -PLATFORM = sun4u - -OBJECTS = memcpy.o memset.o memcmp.o - -include ../Makefile.com - -ASFLAGS += -xarch=v8plusa -warn - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -MODULE = libc_psr.so.1 -LIBC_PSR_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib) -LIBC_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE)) -INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ - -$(LIBC_PSR_DIRS): - -$(INS.dir) - -$(LIBC_PSR_LINKS): $(LIBC_PSR_DIRS) - -$(INS.slink6) - -all: $(LIBS) - -install: all $(LIBC_PSR_LINKS) $(ROOT_PSM_LIBS) - -include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile deleted file mode 100644 index d00fc7070e..0000000000 --- a/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# -# Platform specific Makefile for libc_psr. -# - -PLATFORM = sun4u -CLASS = 64 - -OBJECTS = memcpy.o memset.o memcmp.o - -include ../Makefile.com - -ASDEFS += -D__sparcv9 -ASFLAGS += -xarch=v9a - -include $(SRC)/Makefile.master.64 - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -MODULE = libc_psr.so.1 -LIBC_PSR64_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)) -LIBC_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE)) -INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ - -$(LIBC_PSR64_DIRS): - -$(INS.dir) - -$(LIBC_PSR64_LINKS): $(LIBC_PSR64_DIRS) - -$(INS.slink6) - -all: $(LIBS) - -install: all $(LIBC_PSR64_LINKS) $(ROOT_PSM_LIB64_DIR)/$(LIBS) - -include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile.com b/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile.com deleted file mode 100644 index 40f0cae3e9..0000000000 --- a/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile.com +++ /dev/null @@ -1,67 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -# -# Create default so empty rules don't -# confuse make -# - -LIBRARY = libc_psr_hwcap1.a -VERS = .1 - -include $(SRC)/lib/Makefile.lib -include $(SRC)/Makefile.psm - -# -# Since libc_psr is strictly assembly, deactivate the CTF build logic. -# -CTFCONVERT_POST = : -CTFMERGE_LIB = : - -LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/uts/sun4u \ - -I$(ROOT)/usr/platform/sun4u/include -# See note in memcpy.s for use of bst threshold. -CPPFLAGS = -DBSTORE_SIZE=256 \ - -D_REENTRANT -D$(MACH) $(IFLAGS) $(CPPFLAGS.master) -ASDEFS = -D__STDC__ -D_ASM $(CPPFLAGS) -ASFLAGS = -P $(ASDEFS) - -MAPFILES = ../../sun4u/mapfile-vers $(MAPFILE.FLT) - -# -# build rules -# -pics/%.o: ../../$(PLATFORM)/common/%.s - $(AS) $(ASFLAGS) $< -o $@ - $(POST_PROCESS_O) - -pics/%.o: ../../$(COMPAT_PLAT)/common/%.s - $(AS) $(ASFLAGS) $< -o $@ - $(POST_PROCESS_O) - diff --git a/usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile deleted file mode 100644 index b3b1b1a96f..0000000000 --- a/usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# Platform specific Makefile for libc_psr_hwcap1. -# - -PLATFORM = sun4u-us3 -ALT_PLAT = sun4u_hwcap1 -COMPAT_PLAT = sun4u -CLASS = 32 - -OBJECTS = memcpy.o memset.o memcmp.o - -include ../Makefile.com - -ASFLAGS += -xarch=v8plusb - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -MODULE = libc_psr_hwcap1.so.1 -LIBC_PSR_DIR = $(ROOT_PSM_LIB_DIR)/libc_psr -LIBC_PSR_LIB = $(LIBC_PSR_DIR)/$(MODULE) -INS.libc = $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE) - -$(LIBC_PSR_DIR): - -$(INS.dir) - -$(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE) - -$(INS.libc) - -all: $(LIBS) - -install: all $(LIBC_PSR_LIB) - -include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile deleted file mode 100644 index 0b6bf3fd01..0000000000 --- a/usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# Platform specific Makefile for libc_psr_hwcap1. -# - -PLATFORM = sun4u-us3 -ALT_PLAT = sun4u_hwcap1 -COMPAT_PLAT = sun4u -CLASS = 64 - -OBJECTS = memcpy.o memset.o memcmp.o - -include ../Makefile.com - -ASDEFS += -D__sparcv9 -ASFLAGS += -xarch=v9b - -include $(SRC)/Makefile.master.64 - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -MODULE = libc_psr_hwcap1.so.1 -LIBC_PSR64_DIR = $(ROOT_PSM_LIB_DIR)/$(MACH64)/libc_psr -LIBC_PSR64_LIB = $(LIBC_PSR64_DIR)/$(MODULE) -INS.libc.64 = $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE) - -$(LIBC_PSR64_DIR): - -$(INS.dir) - -$(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE) - -$(INS.libc.64) - -all: $(LIBS) - -install: all $(LIBC_PSR64_LIB) - -include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile.com b/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile.com deleted file mode 100644 index 0a625fe91f..0000000000 --- a/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile.com +++ /dev/null @@ -1,67 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -# -# Create default so empty rules don't -# confuse make -# - -LIBRARY = libc_psr_hwcap2.a -VERS = .1 - -include $(SRC)/lib/Makefile.lib -include $(SRC)/Makefile.psm - -# -# Since libc_psr is strictly assembly, deactivate the CTF build logic. -# -CTFCONVERT_POST = : -CTFMERGE_LIB = : - -LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/uts/sun4u \ - -I$(ROOT)/usr/platform/sun4u/include -# See note in memcpy.s for use of bst threshold. -CPPFLAGS = -DBSTORE_SIZE=65536 -DPANTHER_ONLY \ - -D_REENTRANT -D$(MACH) $(IFLAGS) $(CPPFLAGS.master) -ASDEFS = -D__STDC__ -D_ASM $(CPPFLAGS) -ASFLAGS = -P $(ASDEFS) - -MAPFILES = ../../sun4u/mapfile-vers ../mapfile $(MAPFILE.FLT) - -# -# build rules -# -pics/%.o: ../../$(PLATFORM)/common/%.s - $(AS) $(ASFLAGS) $< -o $@ - $(POST_PROCESS_O) - -pics/%.o: ../../$(COMPAT_PLAT)/common/%.s - $(AS) $(ASFLAGS) $< -o $@ - $(POST_PROCESS_O) - diff --git a/usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile deleted file mode 100644 index 3b143c6846..0000000000 --- a/usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# Platform specific Makefile for libc_psr_hwcap2. -# - -PLATFORM = sun4u-us3 -ALT_PLAT = sun4u_hwcap2 -COMPAT_PLAT = sun4u -CLASS = 32 - -OBJECTS = memcpy.o memset.o memcmp.o - -include ../Makefile.com - -ASFLAGS += -xarch=v8plusb - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -MODULE = libc_psr_hwcap2.so.1 -LIBC_PSR_DIR = $(ROOT_PSM_LIB_DIR)/libc_psr -LIBC_PSR_LIB = $(LIBC_PSR_DIR)/$(MODULE) -INS.libc = $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE) - -$(LIBC_PSR_DIR): - -$(INS.dir) - -$(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE) - -$(INS.libc) - -all: $(LIBS) - -install: all $(LIBC_PSR_LIB) - -include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile deleted file mode 100644 index ff80420951..0000000000 --- a/usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# Platform specific Makefile for libc_psr_hwcap2. -# - -PLATFORM = sun4u-us3 -ALT_PLAT = sun4u_hwcap2 -COMPAT_PLAT = sun4u -CLASS = 64 - -OBJECTS = memcpy.o memset.o memcmp.o - -include ../Makefile.com - -ASDEFS += -D__sparcv9 -ASFLAGS += -xarch=v9b - -include $(SRC)/Makefile.master.64 - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -MODULE = libc_psr_hwcap2.so.1 -LIBC_PSR64_DIR = $(ROOT_PSM_LIB_DIR)/$(MACH64)/libc_psr -LIBC_PSR64_LIB = $(LIBC_PSR64_DIR)/$(MODULE) -INS.libc.64 = $(RM) -r $@; $(INS) -f $(@D) $(MODULE) - -$(LIBC_PSR64_DIR): - -$(INS.dir) - -$(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE) - -$(INS.libc.64) - -all: $(LIBS) - -install: all $(LIBC_PSR64_LIB) - -include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/sun4v/Makefile b/usr/src/lib/libc_psr/sun4v/Makefile deleted file mode 100644 index 15d8ac8231..0000000000 --- a/usr/src/lib/libc_psr/sun4v/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -include $(SRC)/lib/Makefile.lib -include $(SRC)/Makefile.psm - -PLATFORM = sun4v - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber - -TOUCH = /usr/bin/touch - -MODULE = libc_psr.so.1 - -$(ROOT_PSM_LIB_DIR): - -$(INS.dir) - -$(ROOT_PSM_LIB_DIR)/$(MODULE): $(ROOT_PSM_LIB_DIR) $(MODULE) - $(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE) - -$(ROOT_PSM_LIB64_DIR): - -$(INS.dir) - -$(ROOT_PSM_LIB64_DIR)/$(MODULE): $(ROOT_PSM_LIB64_DIR) $(MODULE) - $(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE) - -all: FRC - @$(TOUCH) $(MODULE) - -install: all $(ROOT_PSM_LIB_DIR)/$(MODULE) $(ROOT_PSM_LIB64_DIR)/$(MODULE) - -clean clobber : FRC - $(RM) $(MODULE) - -lint: - @ $(ECHO) "Nothing to lint here: skipping" - -FRC: diff --git a/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile deleted file mode 100644 index 0ffd0fe46b..0000000000 --- a/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../../Makefile.lib - -PLATFORM= sun4v -ALT_PLAT= sun4v_hwcap1 - -SUBDIRS= $(MACH) -SUBDIRS64= $(MACH64) - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber - -.KEEP_STATE: - -all install clean clobber : lib32 \ - $(BUILD64) lib64 - -lint: - @ $(ECHO) "Nothing to lint here: skipping" - -lib32: $(SUBDIRS) - -lib64: $(SUBDIRS64) - -$(SUBDIRS) $(SUBDIRS64): FRC - @cd $@; pwd; $(MAKE) $(TARGET) - -FRC: diff --git a/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com b/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com deleted file mode 100644 index 6d3709577a..0000000000 --- a/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com +++ /dev/null @@ -1,53 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -LIBRARY = libc_psr_hwcap1.a -VERS = .1 - -include $(SRC)/lib/Makefile.lib -include $(SRC)/Makefile.psm - -# -# Since libc_psr is strictly assembly, deactivate the CTF build logic. -# -CTFCONVERT_POST = : -CTFMERGE_LIB = : - -LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/uts/sun4v -I$(ROOT)/usr/include/v9 -CPPFLAGS = -D_REENTRANT -D$(MACH) -DNIAGARA_IMPL $(IFLAGS) $(CPPFLAGS.master) -ASDEFS = -D__STDC__ -D_ASM $(CPPFLAGS) -ASFLAGS = -P $(ASDEFS) - -MAPFILES = ../../sun4v/mapfile-vers ../mapfile $(MAPFILE.FLT) - -# -# build rules -# -pics/%.o: ../../$(PLATFORM)/common/%.s - $(AS) $(ASFLAGS) $< -o $@ - $(POST_PROCESS_O) diff --git a/usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile deleted file mode 100644 index af88210a82..0000000000 --- a/usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# Platform specific Makefile for libc_psr. -# - -PLATFORM = sun4v -ALT_PLAT = sun4v_hwcap1 -CLASS = 32 - -OBJECTS = memcpy.o memset.o - -include ../Makefile.com - -ASFLAGS += -xarch=v8plus - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -MODULE = libc_psr_hwcap1.so.1 -LIBC_PSR_DIR = $(ROOT_PSM_LIB_DIR)/libc_psr -LIBC_PSR_LIB = $(LIBC_PSR_DIR)/$(MODULE) -INS.libc = $(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE) - -$(LIBC_PSR_LIB) := FILEMODE= 0755 - -$(LIBC_PSR_DIR): - -$(INS.dir) - -$(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE) - -$(INS.libc) - -all: $(LIBS) - -install: all $(LIBC_PSR_LIB) - -include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile deleted file mode 100644 index c2f495bea0..0000000000 --- a/usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# Platform specific Makefile for libc_psr. -# - -PLATFORM = sun4v -ALT_PLAT = sun4v_hwcap1 - -CLASS = 64 - -OBJECTS = memcpy.o memset.o - -include ../Makefile.com - -ASDEFS += -D__sparcv9 -ASFLAGS += -xarch=v9 - -include $(SRC)/Makefile.master.64 - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -MODULE = libc_psr_hwcap1.so.1 -LIBC_PSR64_DIR = $(ROOT_PSM_LIB_DIR)/$(MACH64)/libc_psr -LIBC_PSR64_LIB = $(LIBC_PSR64_DIR)/$(MODULE) -INS.libc.64 = $(RM) -r $@; $(INS) -m $(FILEMODE) -f $(@D) $(MODULE) - -$(LIBC_PSR64_LIB) := FILEMODE= 0755 - -$(LIBC_PSR64_DIR): - -$(INS.dir) - -$(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE) - -$(INS.libc.64) - -all: $(LIBS) - -install: all $(LIBC_PSR64_LIB) - -include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/sun4v_hwcap2/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap2/Makefile deleted file mode 100644 index a3a7cdb544..0000000000 --- a/usr/src/lib/libc_psr/sun4v_hwcap2/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../../Makefile.lib - -PLATFORM= sun4v - -SUBDIRS= $(MACH) -SUBDIRS64= $(MACH64) - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber - -.KEEP_STATE: - -all install clean clobber : lib32 \ - $(BUILD64) lib64 - -lint: - @ $(ECHO) "Nothing to lint here: skipping" - -lib32: $(SUBDIRS) - -lib64: $(SUBDIRS64) - -$(SUBDIRS) $(SUBDIRS64): FRC - @cd $@; pwd; $(MAKE) $(TARGET) - -FRC: diff --git a/usr/src/lib/libc_psr/sun4v_hwcap2/Makefile.com b/usr/src/lib/libc_psr/sun4v_hwcap2/Makefile.com deleted file mode 100644 index 846d33737f..0000000000 --- a/usr/src/lib/libc_psr/sun4v_hwcap2/Makefile.com +++ /dev/null @@ -1,54 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -LIBRARY = libc_psr_hwcap2.a -VERS = .1 - -include $(SRC)/lib/Makefile.lib -include $(SRC)/Makefile.psm - -# -# Since libc_psr is strictly assembly, deactivate the CTF build logic. -# -CTFCONVERT_POST = : -CTFMERGE_LIB = : - -LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/uts/sun4v \ - -I$(ROOT)/usr/platform/sun4v/include -I$(ROOT)/usr/include/v9 -CPPFLAGS = -D_REENTRANT -D$(MACH) -DNIAGARA2_IMPL $(IFLAGS) $(CPPFLAGS.master) -ASDEFS = -D__STDC__ -D_ASM $(CPPFLAGS) -ASFLAGS = -P $(ASDEFS) - -MAPFILES = ../../sun4v/mapfile-vers ../mapfile $(MAPFILE.FLT) - -# -# build rules -# -pics/%.o: ../../$(PLATFORM)/common/%.s - $(AS) $(ASFLAGS) $< -o $@ - $(POST_PROCESS_O) diff --git a/usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile deleted file mode 100644 index d0074ac473..0000000000 --- a/usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# Platform specific Makefile for libc_psr. -# - -PLATFORM = sun4v -CLASS = 32 - -OBJECTS = memcpy.o memset.o - -include ../Makefile.com - -ASFLAGS += -xarch=v8plusa - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -MODULE = libc_psr_hwcap2.so.1 -LIBC_PSR_DIR = $(ROOT_PSM_LIB_DIR)/libc_psr -LIBC_PSR_LIB = $(LIBC_PSR_DIR)/$(MODULE) -INS.libc = $(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE) - -$(LIBC_PSR_LIB) := FILEMODE= 0755 - -$(LIBC_PSR_DIR): - -$(INS.dir) - -$(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE) - -$(INS.libc) - -all: $(LIBS) - -install: all $(LIBC_PSR_LIB) - -include ../../Makefile.targ diff --git a/usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile deleted file mode 100644 index 356e58462e..0000000000 --- a/usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# -# Platform specific Makefile for libc_psr. -# - -PLATFORM = sun4v -CLASS = 64 - -OBJECTS = memcpy.o memset.o - -include ../Makefile.com - -ASDEFS += -D__sparcv9 -ASFLAGS += -xarch=v9a - -include $(SRC)/Makefile.master.64 - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -MODULE = libc_psr_hwcap2.so.1 -LIBC_PSR64_DIR = $(ROOT_PSM_LIB_DIR)/$(MACH64)/libc_psr -LIBC_PSR64_LIB = $(LIBC_PSR64_DIR)/$(MODULE) -INS.libc.64 = $(RM) -r $@; $(INS) -m $(FILEMODE) -f $(@D) $(MODULE) - -$(LIBC_PSR64_LIB) := FILEMODE= 0755 - -$(LIBC_PSR64_DIR): - -$(INS.dir) - -$(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE) - -$(INS.libc.64) - -all: $(LIBS) - -install: all $(LIBC_PSR64_LIB) - -include ../../Makefile.targ diff --git a/usr/src/lib/libmd/Makefile b/usr/src/lib/libmd/Makefile index 16ca733489..ddd89d7382 100644 --- a/usr/src/lib/libmd/Makefile +++ b/usr/src/lib/libmd/Makefile @@ -18,19 +18,16 @@ # # CDDL HEADER END # + # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # -include ../Makefile.lib +include $(SRC)/lib/Makefile.lib -$(SPARC_BLD)PLATFORMS= sun4u sun4v +$(SPARC_BLD)CAPDIR = capabilities -SUBDIRS= $(MACH) $(PLATFORMS) -$(BUILD64)SUBDIRS += $(MACH64) +SUBDIRS= $(MACH) $(BUILD64) $(MACH64) HDRS = md4.h md5.h sha1.h sha2.h HDRDIR = common @@ -43,16 +40,19 @@ lint := TARGET= lint .KEEP_STATE: -.PARALLEL: $(SUBDIRS) +.PARALLEL: $(SUBDIRS) -all clean clobber install lint: $(SUBDIRS) +all clean clobber install lint: \ + $(CAPDIR) .WAIT $(SUBDIRS) install_h: $(ROOTHDRS) check: $(CHECKHDRS) -$(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(TARGET) +$(CAPDIR) \ +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + FRC: -include ../Makefile.targ +include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libmd/Makefile.com b/usr/src/lib/libmd/Makefile.com index 1b79026d0e..af8cac390b 100644 --- a/usr/src/lib/libmd/Makefile.com +++ b/usr/src/lib/libmd/Makefile.com @@ -18,96 +18,23 @@ # # CDDL HEADER END # + # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # -# $LIBRARY is set in lower makefiles so we can have platform and -# processor optimised versions of this library via libmd_psr and libmd_hwcapN - -#LIBRARY= libmd.a -VERS= .1 - -OBJECTS= md4.o md5.o $(MD5_PSR_OBJECTS) sha1.o $(SHA1_PSR_OBJECTS) \ - sha2.o $(SHA2_PSR_OBJECTS) - -# Use $(SRC) to include makefiles rather than ../../ because the -# platform subdirs are one level deeper so it would be ../../../ for them -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.rootfs - LIBS = $(DYNLIB) $(LINTLIB) -SRCS = \ - $(COMDIR)/md4/md4.c \ - $(COMDIR)/md5/md5.c \ - $(COMDIR)/sha1/sha1.c \ - $(COMDIR)/sha2/sha2.c - -COMDIR= $(SRC)/common/crypto - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -LDLIBS += -lc +SRCS = $(COMDIR)/md4/md4.c \ + $(COMDIR)/md5/md5.c \ + $(COMDIR)/sha1/sha1.c \ + $(COMDIR)/sha2/sha2.c -SRCDIR = ../common COMDIR = $(SRC)/common/crypto +SRCDIR = ../common +MAPFILEDIR = $(SRCDIR) -CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) -CFLAGS64 += $(C_BIGPICFLAGS) -CPPFLAGS += -I$(SRCDIR) - -ROOTLINT= $(LINTSRC:%=$(ROOTLIBDIR)/%) - -.KEEP_STATE: - -all: $(LIBS) - -lint: lintcheck - -pics/%.o: $(COMDIR)/md4/%.c - $(COMPILE.c) -I$(COMDIR)/md4 -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(COMDIR)/md5/%.c - $(COMPILE.c) -I$(COMDIR)/md5 $(INLINES) -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(COMDIR)/sha1/%.c - $(COMPILE.c) -I$(COMDIR)/sha1 -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(COMDIR)/sha1/sparc/$(PLATFORM)/sha1_asm.s - $(COMPILE.s) -P -DPIC -D_ASM -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(COMDIR)/sha2/%.c - $(COMPILE.c) -I$(COMDIR)/sha2 -o $@ $< - $(POST_PROCESS_O) - -# -# Used when building links in /platform/$(PLATFORM)/lib for libmd_psr.so.1 -# - -LIBMD_PSR_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib) -LIBMD_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE)) - -LIBMD_PSR64_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)) -LIBMD_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE)) - -INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ - -INS.slink64 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ - -$(LIBMD_PSR_DIRS): - -$(INS.dir) - -$(LIBMD_PSR_LINKS): $(LIBMD_PSR_DIRS) - -$(INS.slink6) - -$(LIBMD_PSR64_DIRS): - -$(INS.dir) - -$(LIBMD_PSR64_LINKS): $(LIBMD_PSR64_DIRS) - -$(INS.slink64) +CFLAGS += $(CCVERBOSE) +CPPFLAGS += -I$(SRCDIR) +LDLIBS += -lc -include $(SRC)/lib/Makefile.targ +$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) diff --git a/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile b/usr/src/lib/libmd/Makefile.targ index 90ff898954..58ec7b30e5 100644 --- a/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile +++ b/usr/src/lib/libmd/Makefile.targ @@ -18,39 +18,32 @@ # # CDDL HEADER END # + # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -include ../../Makefile.lib - -PLATFORM= sun4u-us3 -ALT_PLAT= sun4u_hwcap1 - -SUBDIRS= $(MACH) -SUBDIRS64= $(MACH64) - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber - -.KEEP_STATE: +COMDIR = $(SRC)/common/crypto -all install clean clobber : lib32 \ - $(BUILD64) lib64 +pics/%.o: $(COMDIR)/md4/%.c + $(COMPILE.c) -I$(COMDIR)/md4 -o $@ $< + $(POST_PROCESS_O) -lint: - @ $(ECHO) "Nothing to lint here: skipping" +pics/%.o: $(COMDIR)/md5/%.c + $(COMPILE.c) -I$(COMDIR)/md5 $(INLINES) -o $@ $< + $(POST_PROCESS_O) -lib32: $(SUBDIRS) +pics/%.o: $(COMDIR)/sha1/%.c + $(COMPILE.c) -I$(COMDIR)/sha1 -o $@ $< + $(POST_PROCESS_O) -lib64: $(SUBDIRS64) +pics/sha1_asm.o: $(COMDIR)/sha1/sparc/$(PLATFORM)/sha1_asm.s + $(COMPILE.s) -o pics/sha1_asm.o \ + $(COMDIR)/sha1/sparc/$(PLATFORM)/sha1_asm.s + $(POST_PROCESS_O) -$(SUBDIRS) $(SUBDIRS64): FRC - @cd $@; pwd; $(MAKE) $(TARGET) +pics/%.o: $(COMDIR)/sha2/%.c + $(COMPILE.c) -I$(COMDIR)/sha2 -o $@ $< + $(POST_PROCESS_O) -FRC: +include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libmd/amd64/Makefile b/usr/src/lib/libmd/amd64/Makefile index be5476ac90..3872749fbb 100644 --- a/usr/src/lib/libmd/amd64/Makefile +++ b/usr/src/lib/libmd/amd64/Makefile @@ -19,40 +19,52 @@ # CDDL HEADER END # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # -LIBRARY= libmd.a +LIBRARY = libmd.a +VERS = .1 + +OBJECTS = md4.o md5.o sha1.o sha2.o -MD5_PSR_OBJECTS = md5_amd64.o -SHA1_PSR_OBJECTS = sha1-x86_64.o -SHA2_PSR_OBJECTS = sha512-x86_64.o sha256-x86_64.o +include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs +include $(SRC)/lib/Makefile.lib.64 +include ../Makefile.com -include ../Makefile.com -include $(SRC)/lib/Makefile.lib.64 +EXTPICS = pics/md5_amd64.o \ + pics/sha1-x86_64.o \ + pics/sha512-x86_64.o \ + pics/sha256-x86_64.o -CLEANFILES += md5_amd64.s sha1-x86_64.s sha512-x86_64.s sha256-x86_64.s +CLEANFILES += $(EXTPICS) \ + $(EXTPICS:pics/%.o=%.s) # This prevents <sys/asm_linkage.h> from including C source: AS_CPPFLAGS += -D_ASM -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +.KEPP_STATE: + +all: $(LIBS) + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) + +lint: lintcheck pics/%.o: %.s - $(COMPILE.s) -o $@ ${@F:.o=.s} - $(POST_PROCESS_O) + $(COMPILE.s) -o $@ ${@F:.o=.s} + $(POST_PROCESS_O) md5_amd64.s: $(COMDIR)/md5/amd64/md5_amd64.pl - $(PERL) $? $@ + $(PERL) $? $@ sha1-x86_64.s: $(COMDIR)/sha1/amd64/sha1-x86_64.pl - $(PERL) $? $@ + $(PERL) $? $@ sha512-x86_64.s: $(COMDIR)/sha2/amd64/sha512-x86_64.pl - $(PERL) $? $@ + $(PERL) $? $@ sha256-x86_64.s: $(COMDIR)/sha2/amd64/sha512-x86_64.pl - $(PERL) $? $@ + $(PERL) $? $@ + +include ../Makefile.targ diff --git a/usr/src/lib/libmd/capabilities/Makefile b/usr/src/lib/libmd/capabilities/Makefile new file mode 100644 index 0000000000..51c8921240 --- /dev/null +++ b/usr/src/lib/libmd/capabilities/Makefile @@ -0,0 +1,49 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include $(SRC)/lib/Makefile.lib + +# Each target directory is responsible for making a symbol capabilities object. +$(SPARC_BLD)SUBDIRS = sun4u sun4v +$(INTEL_BLD)SUBDIRS = + +all := TARGET= all +clean := TARGET= clean +clobber := TARGET= clobber +install := TARGET= install + +.KEEP_STATE: + +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) + +lint: + +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + +FRC: diff --git a/usr/src/lib/libmd/capabilities/Makefile.com b/usr/src/lib/libmd/capabilities/Makefile.com new file mode 100644 index 0000000000..7c550fb533 --- /dev/null +++ b/usr/src/lib/libmd/capabilities/Makefile.com @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +#include ../../../Makefile.com + +MAPFILE-CAP = ../common/mapfile-cap +MAPOPT-CAP = $(MAPFILE-CAP:%=-M%) + +OBJCAP = pics/objcap.o +SYMCAP = pics/symcap.o + +CLOBBERFILES += $(OBJCAP) $(SYMCAP) diff --git a/usr/src/lib/libmd/capabilities/Makefile.targ b/usr/src/lib/libmd/capabilities/Makefile.targ new file mode 100644 index 0000000000..86815a1987 --- /dev/null +++ b/usr/src/lib/libmd/capabilities/Makefile.targ @@ -0,0 +1,71 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# libmd provides two families of optimized functions for SPARC platforms, +# one for sun4u, and one for sun4v. Previous implementations provided +# these families as libmd_psr.so.1 libraries, triggered by tagging libmd.so.1 +# as an auxiliary filter. These psr filtees were installed under +# /usr/platform/sun4u/lib, and numerous symlinks were established to provide +# the necessary $PLATFORM names, ie: +# +# /usr/platform/SUNW,Ultra-2/lib/libmd_psr.so.1 -> ../../../sun4u +# /usr/platform/SUNW,Ultra-4/lib/libmd_psr.so.1 -> ../../../sun4u +# .... +# +# and: +# +# /usr/platform/SUNW,Netra-CP3060/lib/libmd_psr.so.1 -> ../../sun4v +# /usr/platform/SUNW,Netra-CP3260/lib/libmd_psr.so.1 -> ../../sun4v/ +# .... +# +# The objects that made up these filtees are now combined into one relocatable +# object, pics/objcap.o, using ../common/mapfile-cap. This mapfile identifies +# the machine hardware name, together with establishing the global symbols that +# should be exported to define each family. +# +# This object capabilities relocatable object is then translated into a symbol +# capabilities relocatable object, pics/symcap.o. +# +# The sun4u and sun4v families of symbol capabilities object are eventually +# included in the final build of libmd.so.1. + +$(SYMCAP): $(OBJCAP) +$(OBJCAP): $(PICS) +$(PICS): pics + +# Combine all pic objects into one relocatable object. Assign any capabilities +# to this object, and define the interface. + +pics/objcap.o: $(PICS) $(MAPFILE-CAP) + $(LD) -r -o $@ $(MAPOPT-CAP) -Breduce $(PICS) + +# Convert the combined object capabilities object into a symbol capabilities +# object. + +pics/symcap.o: $(OBJCAP) + $(LD) -r -o $@ -z symbolcap $(OBJCAP) + +include ../../../Makefile.targ diff --git a/usr/src/lib/libmd/capabilities/sun4u/Makefile b/usr/src/lib/libmd/capabilities/sun4u/Makefile new file mode 100644 index 0000000000..77aed04fa7 --- /dev/null +++ b/usr/src/lib/libmd/capabilities/sun4u/Makefile @@ -0,0 +1,47 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include $(SRC)/lib/Makefile.lib + +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) + +all := TARGET= all +clean := TARGET= clean +clobber := TARGET= clobber +install := TARGET= install + +.KEEP_STATE: + +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) + +lint: + +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + +FRC: diff --git a/usr/src/lib/libmd/capabilities/sun4u/Makefile.com b/usr/src/lib/libmd/capabilities/sun4u/Makefile.com new file mode 100644 index 0000000000..8622e03cb4 --- /dev/null +++ b/usr/src/lib/libmd/capabilities/sun4u/Makefile.com @@ -0,0 +1,39 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +PLATFORM = sun4u + +include ../../Makefile.com + +OBJECTS = md5.o sha1.o sha1_asm.o + +include $(SRC)/lib/Makefile.lib + +INLINES = $(COMDIR)/md5/$(MACH)/$(PLATFORM)/byteswap.il + +AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH) +ASFLAGS += $(AS_PICFLAGS) -P +CFLAGS += $(CCVERBOSE) -xarch=sparcvis +CPPFLAGS += -D$(PLATFORM) -DVIS_SHA1 diff --git a/usr/src/lib/libc/sparc_hwcap1/sparc/mapfile b/usr/src/lib/libmd/capabilities/sun4u/Makefile.targ index 0ee5bb382b..63e36816cc 100644 --- a/usr/src/lib/libc/sparc_hwcap1/sparc/mapfile +++ b/usr/src/lib/libmd/capabilities/sun4u/Makefile.targ @@ -19,11 +19,7 @@ # CDDL HEADER END # # -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -$mapfile_version 2 - -CAPABILITY { - hw_1 += 0x10000; -}; +include ../../Makefile.targ diff --git a/usr/src/lib/libmd/capabilities/sun4u/common/mapfile-cap b/usr/src/lib/libmd/capabilities/sun4u/common/mapfile-cap new file mode 100644 index 0000000000..1e7c55abca --- /dev/null +++ b/usr/src/lib/libmd/capabilities/sun4u/common/mapfile-cap @@ -0,0 +1,40 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +$mapfile_version 2 + +CAPABILITY sun4u { + MACHINE = sun4u; +}; + +SYMBOL_SCOPE { + global: + MD5Init; + MD5Update; + MD5Final; + SHA1Init; + SHA1Update; + SHA1Final; + local: + *; +}; diff --git a/usr/src/lib/libmd/capabilities/sun4u/sparc/Makefile b/usr/src/lib/libmd/capabilities/sun4u/sparc/Makefile new file mode 100644 index 0000000000..99651943ca --- /dev/null +++ b/usr/src/lib/libmd/capabilities/sun4u/sparc/Makefile @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com + +ASFLAGS += -xarch=v8plusa -warn + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../Makefile.targ diff --git a/usr/src/lib/libmd/capabilities/sun4u/sparcv9/Makefile b/usr/src/lib/libmd/capabilities/sun4u/sparcv9/Makefile new file mode 100644 index 0000000000..183da1f33f --- /dev/null +++ b/usr/src/lib/libmd/capabilities/sun4u/sparcv9/Makefile @@ -0,0 +1,36 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com +include $(SRC)/lib/Makefile.lib.64 + +.KEEP_STATE: + +AS_CPPFLAGS += -D__sparcv9 +ASFLAGS += -xarch=v9a + +all install: $(SYMCAP) + +include ../Makefile.targ diff --git a/usr/src/lib/libmd/capabilities/sun4v/Makefile b/usr/src/lib/libmd/capabilities/sun4v/Makefile new file mode 100644 index 0000000000..77aed04fa7 --- /dev/null +++ b/usr/src/lib/libmd/capabilities/sun4v/Makefile @@ -0,0 +1,47 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include $(SRC)/lib/Makefile.lib + +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) + +all := TARGET= all +clean := TARGET= clean +clobber := TARGET= clobber +install := TARGET= install + +.KEEP_STATE: + +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) + +lint: + +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + +FRC: diff --git a/usr/src/lib/libmd/capabilities/sun4v/Makefile.com b/usr/src/lib/libmd/capabilities/sun4v/Makefile.com new file mode 100644 index 0000000000..2b1b457197 --- /dev/null +++ b/usr/src/lib/libmd/capabilities/sun4v/Makefile.com @@ -0,0 +1,38 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +PLATFORM = sun4v + +include ../../Makefile.com + +OBJECTS = md5.o + +include $(SRC)/lib/Makefile.lib + +INLINES = $(COMDIR)/md5/$(MACH)/$(PLATFORM)/byteswap.il + +AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH) +ASFLAGS += $(AS_PICFLAGS) -P +CFLAGS += $(CCVERBOSE) -xarch=sparcvis +CPPFLAGS += -D$(PLATFORM) diff --git a/usr/src/lib/libc/sparc_hwcap1/sparcv9/mapfile b/usr/src/lib/libmd/capabilities/sun4v/Makefile.targ index 0ee5bb382b..63e36816cc 100644 --- a/usr/src/lib/libc/sparc_hwcap1/sparcv9/mapfile +++ b/usr/src/lib/libmd/capabilities/sun4v/Makefile.targ @@ -19,11 +19,7 @@ # CDDL HEADER END # # -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -$mapfile_version 2 - -CAPABILITY { - hw_1 += 0x10000; -}; +include ../../Makefile.targ diff --git a/usr/src/lib/libmd/capabilities/sun4v/common/mapfile-cap b/usr/src/lib/libmd/capabilities/sun4v/common/mapfile-cap new file mode 100644 index 0000000000..72b5738c25 --- /dev/null +++ b/usr/src/lib/libmd/capabilities/sun4v/common/mapfile-cap @@ -0,0 +1,37 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +$mapfile_version 2 + +CAPABILITY sun4v { + MACHINE = sun4v; +}; + +SYMBOL_SCOPE { + global: + MD5Init; + MD5Update; + MD5Final; + local: + *; +}; diff --git a/usr/src/lib/libmd/capabilities/sun4v/sparc/Makefile b/usr/src/lib/libmd/capabilities/sun4v/sparc/Makefile new file mode 100644 index 0000000000..99651943ca --- /dev/null +++ b/usr/src/lib/libmd/capabilities/sun4v/sparc/Makefile @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com + +ASFLAGS += -xarch=v8plusa -warn + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../Makefile.targ diff --git a/usr/src/lib/libmd/capabilities/sun4v/sparcv9/Makefile b/usr/src/lib/libmd/capabilities/sun4v/sparcv9/Makefile new file mode 100644 index 0000000000..65cdc485a4 --- /dev/null +++ b/usr/src/lib/libmd/capabilities/sun4v/sparcv9/Makefile @@ -0,0 +1,36 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com +include $(SRC)/lib/Makefile.lib.64 + +AS_CPPFLAGS += -D__sparcv9 +ASFLAGS += -xarch=v9a + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../Makefile.targ diff --git a/usr/src/lib/libmd/i386/Makefile b/usr/src/lib/libmd/i386/Makefile index 2b05624aa1..3e6fe00e17 100644 --- a/usr/src/lib/libmd/i386/Makefile +++ b/usr/src/lib/libmd/i386/Makefile @@ -18,14 +18,26 @@ # # CDDL HEADER END # + # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -LIBRARY= libmd.a +LIBRARY = libmd.a +VERS = .1 + +OBJECTS = md4.o md5.o sha1.o sha2.o + +include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs +include ../Makefile.com + +.KEEP_STATE: + +all: $(LIBS) + +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) -include ../Makefile.com +lint: lintcheck -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +include ../Makefile.targ diff --git a/usr/src/lib/libmd/sparc/Makefile b/usr/src/lib/libmd/sparc/Makefile index ccce8c78b2..5f491cc9af 100644 --- a/usr/src/lib/libmd/sparc/Makefile +++ b/usr/src/lib/libmd/sparc/Makefile @@ -18,15 +18,29 @@ # # CDDL HEADER END # -# ident "%Z%%M% %I% %E% SMI" # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# + +LIBRARY = libmd.a +VERS = .1 + +OBJECTS = md4.o md5.o sha1.o sha2.o + +include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs +include ../Makefile.com + +# Symbol capabilities objects are added for sun4u and sun4v. +EXTPICS = ../capabilities/sun4u/sparc/pics/symcap.o \ + ../capabilities/sun4v/sparc/pics/symcap.o + +.KEEP_STATE: -LIBRARY= libmd.a +all: $(LIBS) -include ../Makefile.com +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) -DYNFLAGS += -Wl,-f/platform/\$$PLATFORM/lib/$(DYNLIBPSR) +lint: lintcheck -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +include ../Makefile.targ diff --git a/usr/src/lib/libmd/sparcv9/Makefile b/usr/src/lib/libmd/sparcv9/Makefile index 6b3d51b1ea..5dd3f2eac3 100644 --- a/usr/src/lib/libmd/sparcv9/Makefile +++ b/usr/src/lib/libmd/sparcv9/Makefile @@ -18,16 +18,30 @@ # # CDDL HEADER END # -# ident "%Z%%M% %I% %E% SMI" # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# + +LIBRARY = libmd.a +VERS = .1 + +OBJECTS = md4.o md5.o sha1.o sha2.o + +include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs +include $(SRC)/lib/Makefile.lib.64 +include ../Makefile.com + +# Symbol capabilities objects are added for sun4u and sun4v. +EXTPICS = ../capabilities/sun4u/sparcv9/pics/symcap.o \ + ../capabilities/sun4v/sparcv9/pics/symcap.o + +.KEEP_STATE: -LIBRARY= libmd.a +all: $(LIBS) -include ../Makefile.com -include $(SRC)/lib/Makefile.lib.64 +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) -DYNFLAGS += -Wl,-f/platform/\$$PLATFORM/lib/$(MACH64)/$(DYNLIBPSR) +lint: lintcheck -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +include ../Makefile.targ diff --git a/usr/src/lib/libmd/sun4u/Makefile.links b/usr/src/lib/libmd/sun4u/Makefile.links deleted file mode 100644 index 3c85fd6acd..0000000000 --- a/usr/src/lib/libmd/sun4u/Makefile.links +++ /dev/null @@ -1,61 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# lib/libmd/Makefile.sun4u.links -# -# -# Used when building links in /platform/sun4u/lib -# -LINKED_PLATFORMS = SUNW,Ultra-2 -LINKED_PLATFORMS += SUNW,Ultra-4 -LINKED_PLATFORMS += SUNW,Ultra-5_10 -LINKED_PLATFORMS += SUNW,Ultra-30 -LINKED_PLATFORMS += SUNW,Ultra-60 -LINKED_PLATFORMS += SUNW,Ultra-80 -LINKED_PLATFORMS += SUNW,Ultra-250 -LINKED_PLATFORMS += SUNW,Ultra-Enterprise -LINKED_PLATFORMS += SUNW,Ultra-Enterprise-10000 -LINKED_PLATFORMS += SUNW,UltraAX-i2 -LINKED_PLATFORMS += SUNW,UltraSPARC-IIi-Netract -LINKED_PLATFORMS += SUNW,UltraSPARC-IIe-NetraCT-40 -LINKED_PLATFORMS += SUNW,UltraSPARC-IIe-NetraCT-60 -LINKED_PLATFORMS += SUNW,Sun-Blade-100 -LINKED_PLATFORMS += SUNW,Sun-Blade-1000 -LINKED_PLATFORMS += SUNW,Sun-Blade-1500 -LINKED_PLATFORMS += SUNW,Sun-Blade-2500 -LINKED_PLATFORMS += SUNW,A70 -LINKED_PLATFORMS += SUNW,Sun-Fire -LINKED_PLATFORMS += SUNW,Sun-Fire-V215 -LINKED_PLATFORMS += SUNW,Sun-Fire-V240 -LINKED_PLATFORMS += SUNW,Sun-Fire-V250 -LINKED_PLATFORMS += SUNW,Sun-Fire-V440 -LINKED_PLATFORMS += SUNW,Sun-Fire-V445 -LINKED_PLATFORMS += SUNW,Sun-Fire-280R -LINKED_PLATFORMS += SUNW,Sun-Fire-15000 -LINKED_PLATFORMS += SUNW,Sun-Fire-880 -LINKED_PLATFORMS += SUNW,Sun-Fire-480R -LINKED_PLATFORMS += SUNW,Serverblade1 -LINKED_PLATFORMS += SUNW,Netra-T12 -LINKED_PLATFORMS += SUNW,Netra-T4 -LINKED_PLATFORMS += SUNW,Netra-CP2300 -LINKED_PLATFORMS += SUNW,Netra-CP3010 diff --git a/usr/src/lib/libmd/sun4u/sparc/Makefile b/usr/src/lib/libmd/sun4u/sparc/Makefile deleted file mode 100644 index 426b732d4e..0000000000 --- a/usr/src/lib/libmd/sun4u/sparc/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -CLASS = 32 -PLATFORM = sun4u -MODULE = libmd_psr.so.1 - -include ../Makefile.com - -# Override OBJECTS here because each $MACH/$PLATFORM can have a different -# set of algortithm optimisations and thus different source and object files. -OBJECTS = md5.o sha1.o sha1_asm.o - -MAPFILES = mapfile - -ASFLAGS += -xarch=v8plusa -warn - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -all: $(LIBS) - -$(ROOT_PSM_LIB_DIR)/% := FILEMODE = 755 - -install: all $(LIBMD_PSR_LINKS) $(ROOT_PSM_LIBS) - -include $(SRC)/Makefile.psm.targ diff --git a/usr/src/lib/libmd/sun4u/sparcv9/Makefile b/usr/src/lib/libmd/sun4u/sparcv9/Makefile deleted file mode 100644 index 9f94a65cad..0000000000 --- a/usr/src/lib/libmd/sun4u/sparcv9/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -CLASS = 64 -PLATFORM = sun4u -MODULE = libmd_psr.so.1 - -include ../Makefile.com -include $(SRC)/lib/Makefile.lib.64 - -# Override OBJECTS here because each $MACH/$PLATFORM can have a different -# set of algortithm optimisations and thus different source and object files. -OBJECTS = md5.o sha1.o sha1_asm.o - -MAPFILES = mapfile - -ASDEFS += -D__sparcv9 -ASFLAGS += -xarch=v9a $(AS_BIGPICFLAGS) - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -all: $(LIBS) - -$(ROOT_PSM_LIB64_DIR)/% := FILEMODE = 755 - -install: all $(LIBMD_PSR64_LINKS) $(ROOT_PSM_LIB64_DIR)/$(LIBS) - -include $(SRC)/Makefile.psm.targ diff --git a/usr/src/lib/libmd/sun4v/sparc/Makefile b/usr/src/lib/libmd/sun4v/sparc/Makefile deleted file mode 100644 index e0754a7da3..0000000000 --- a/usr/src/lib/libmd/sun4v/sparc/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -CLASS = 32 -PLATFORM = sun4v -MODULE = libmd_psr.so.1 - -include ../Makefile.com - -# Override OBJECTS here because each $MACH/$PLATFORM can have a different -# set of algortithm optimisations and thus different source and object files. -OBJECTS = md5.o - -MAPFILES = mapfile - -ASFLAGS += -xarch=v8plusa -warn - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -all: $(LIBS) - -$(ROOT_PSM_LIB_DIR)/% := FILEMODE = 755 - -install: all $(ROOT_PSM_LIB_DIR)/$(LIBS) - -include $(SRC)/Makefile.psm.targ diff --git a/usr/src/lib/libmd/sun4v/sparcv9/Makefile b/usr/src/lib/libmd/sun4v/sparcv9/Makefile deleted file mode 100644 index 0c535c6bfb..0000000000 --- a/usr/src/lib/libmd/sun4v/sparcv9/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -CLASS = 64 -PLATFORM = sun4v -MODULE = libmd_psr.so.1 - -include ../Makefile.com -include $(SRC)/lib/Makefile.lib.64 - -# Override OBJECTS here because each $MACH/$PLATFORM can have a different -# set of algortithm optimisations and thus different source and object files. -OBJECTS = md5.o - -MAPFILES = mapfile - -ASDEFS += -D__sparcv9 -ASFLAGS += -xarch=v9a $(AS_PICFLAGS) - -# Redefine shared object build rule to use $(LD) directly (this avoids .init -# and .fini sections being added). - -BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) - -.KEEP_STATE: - -all: $(LIBS) - -$(ROOT_PSM_LIB64_DIR)/% := FILEMODE = 755 - -install: all $(ROOT_PSM_LIB64_DIR)/$(LIBS) - -include $(SRC)/Makefile.psm.targ diff --git a/usr/src/lib/pkcs11/libsoftcrypto/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/Makefile index ff69f0195a..96d8d8144d 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/Makefile @@ -18,38 +18,35 @@ # # CDDL HEADER END # + # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# lib/libsoftcrypto/Makefile +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # -include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.lib -$(SPARC_BLD)PLATFORMS = sun4u sun4v -$(INTEL_BLD)PLATFORMS = i386_hwcap1 - -SUBDIRS = $(MACH) $(MACH64) $(PLATFORMS) +CAPDIR = capabilities +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) $(PLATFORMS) all := TARGET= all -check := TARGET= check clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install lint := TARGET= lint +.KEEP_STATE: -.PARALLEL: $(SUBDIRS) - -all check clean clobber install lint: $(SUBDIRS) +.PARALLEL: $(SUBDIRS) -install_h: $(ROOTHDRS) +all clean clobber install lint: \ + $(CAPDIR) .WAIT $(SUBDIRS) -check: $(CHECKHDRS) +install_h: $(ROOTHDRS) +check: $(CHECKHDRS) -$(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(TARGET) +$(CAPDIR) \ +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com index afa93ad2a2..b97aa47114 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com +++ b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com @@ -23,212 +23,99 @@ # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # -# -# lib/pkcs11/libsoftcrypto/Makefile.com -# - # AES -AES_DIR= $(SRC)/common/crypto/aes -AES_COMMON_OBJS= aes_impl.o aes_modes.o -AES_COMMON_SRC= $(AES_COMMON_OBJS:%.o=$(AES_DIR)/%.c) -AES_FLAGS= -I$(AES_DIR) +AES_DIR = $(SRC)/common/crypto/aes +AES_COMMON_OBJS = aes_impl.o aes_modes.o +AES_COMMON_SRC = $(AES_COMMON_OBJS:%.o=$(AES_DIR)/%.c) +AES_FLAGS = -I$(AES_DIR) # Blowfish -BLOWFISH_DIR= $(SRC)/common/crypto/blowfish -BLOWFISH_COMMON_OBJS= blowfish_impl.o -BLOWFISH_COMMON_SRC= $(BLOWFISH_COMMON_OBJS:%.o=$(BLOWFISH_DIR)/%.c) -BLOWFISH_FLAGS= -I$(BLOWFISH_DIR) +BLOWFISH_DIR = $(SRC)/common/crypto/blowfish +BLOWFISH_COMMON_OBJS = blowfish_impl.o +BLOWFISH_COMMON_SRC = $(BLOWFISH_COMMON_OBJS:%.o=$(BLOWFISH_DIR)/%.c) +BLOWFISH_FLAGS = -I$(BLOWFISH_DIR) # ARCFour -ARCFOUR_DIR= $(SRC)/common/crypto/arcfour -ARCFOUR_COMMON_OBJS= arcfour_crypt.o -ARCFOUR_COMMON_SRC= $(ARCFOUR_COMMON_OBJS:%.o=$(ARCFOUR_DIR)/%.c) -ARCFOUR_FLAGS= -I$(ARCFOUR_DIR) +ARCFOUR_DIR = $(SRC)/common/crypto/arcfour +ARCFOUR_COMMON_OBJS = arcfour_crypt.o +ARCFOUR_COMMON_SRC = $(ARCFOUR_COMMON_OBJS:%.o=$(ARCFOUR_DIR)/%.c) +ARCFOUR_FLAGS = -I$(ARCFOUR_DIR) # DES -DES_DIR= $(SRC)/common/crypto/des -DES_COMMON_OBJS= des_impl.o des_ks.o -DES_COMMON_SRC= $(DES_COMMON_OBJS:%.o=$(DES_DIR)/%.c) -DES_FLAGS= -I$(DES_DIR) +DES_DIR = $(SRC)/common/crypto/des +DES_COMMON_OBJS = des_impl.o des_ks.o +DES_COMMON_SRC = $(DES_COMMON_OBJS:%.o=$(DES_DIR)/%.c) +DES_FLAGS = -I$(DES_DIR) # BIGNUM -- needed by DH, DSA, RSA -BIGNUM_DIR= $(SRC)/common/bignum -BIGNUM_COMMON_OBJS= bignumimpl.o -BIGNUM_COMMON_SRC= $(BIGNUM_COMMON_OBJS:%.o=$(BIGNUM_DIR)/%.c) -BIGNUM_FLAGS= -I$(BIGNUM_DIR) +BIGNUM_DIR = $(SRC)/common/bignum +BIGNUM_COMMON_OBJS = bignumimpl.o +BIGNUM_COMMON_SRC = $(BIGNUM_COMMON_OBJS:%.o=$(BIGNUM_DIR)/%.c) +BIGNUM_FLAGS = -I$(BIGNUM_DIR) # Modes -MODES_DIR= $(SRC)/common/crypto/modes -MODES_COMMON_OBJS= modes.o ecb.o cbc.o ctr.o -MODES_COMMON_SRC= $(MODES_COMMON_OBJS:%.o=$(MODES_DIR)/%.c) -MODES_FLAGS= -I$(MODES_DIR) +MODES_DIR = $(SRC)/common/crypto/modes +MODES_COMMON_OBJS = modes.o ecb.o cbc.o ctr.o +MODES_COMMON_SRC = $(MODES_COMMON_OBJS:%.o=$(MODES_DIR)/%.c) +MODES_FLAGS = -I$(MODES_DIR) # DH -DH_DIR= $(SRC)/common/crypto/dh -DH_COMMON_OBJS= dh_impl.o -DH_COMMON_SRC= $(DH_COMMON_OBJS:%.o=$(DH_DIR)/%.c) -DH_FLAGS= $(BIGNUM_FLAGS) -I$(DH_DIR) +DH_DIR = $(SRC)/common/crypto/dh +DH_COMMON_OBJS = dh_impl.o +DH_COMMON_SRC = $(DH_COMMON_OBJS:%.o=$(DH_DIR)/%.c) +DH_FLAGS = $(BIGNUM_FLAGS) -I$(DH_DIR) # DSA -DSA_DIR= $(SRC)/common/crypto/dsa -DSA_COMMON_OBJS= dsa_impl.o -DSA_COMMON_SRC= $(DSA_COMMON_OBJS:%.o=$(DSA_DIR)/%.c) -DSA_FLAGS= $(BIGNUM_FLAGS) -I$(DSA_DIR) +DSA_DIR = $(SRC)/common/crypto/dsa +DSA_COMMON_OBJS = dsa_impl.o +DSA_COMMON_SRC = $(DSA_COMMON_OBJS:%.o=$(DSA_DIR)/%.c) +DSA_FLAGS = $(BIGNUM_FLAGS) -I$(DSA_DIR) # RSA -RSA_DIR= $(SRC)/common/crypto/rsa -RSA_COMMON_OBJS= rsa_impl.o -RSA_COMMON_SRC= $(RSA_COMMON_OBJS:%.o=$(RSA_DIR)/%.c) -RSA_FLAGS= $(BIGNUM_FLAGS) -I$(RSA_DIR) +RSA_DIR = $(SRC)/common/crypto/rsa +RSA_COMMON_OBJS = rsa_impl.o +RSA_COMMON_SRC = $(RSA_COMMON_OBJS:%.o=$(RSA_DIR)/%.c) +RSA_FLAGS = $(BIGNUM_FLAGS) -I$(RSA_DIR) # PADDING -- needed by RSA -PAD_DIR= $(SRC)/common/crypto/padding -PAD_COMMON_OBJS= pkcs1.o pkcs7.o -PAD_COMMON_SRC= $(PAD_COMMON_OBJS:%.o=$(PAD_DIR)/%.c) -PAD_FLAGS= -I$(PAD_DIR) +PAD_DIR = $(SRC)/common/crypto/padding +PAD_COMMON_OBJS = pkcs1.o pkcs7.o +PAD_COMMON_SRC = $(PAD_COMMON_OBJS:%.o=$(PAD_DIR)/%.c) +PAD_FLAGS = -I$(PAD_DIR) # Object setup -AES_OBJS= $(AES_COMMON_OBJS) $(AES_PSM_OBJS) -ARCFOUR_OBJS= $(ARCFOUR_COMMON_OBJS) $(ARCFOUR_PSM_OBJS) -BLOWFISH_OBJS= $(BLOWFISH_COMMON_OBJS) $(BLOWFISH_PSM_OBJS) -DES_OBJS= $(DES_COMMON_OBJS) $(DES_PSM_OBJS) -BIGNUM_OBJS= $(BIGNUM_COMMON_OBJS) $(BIGNUM_PSM_OBJS) -MODES_OBJS= $(MODES_COMMON_OBJS) $(MODES_PSM_OBJS) -DH_OBJS= $(DH_COMMON_OBJS) $(DH_PSM_OBJS) -DSA_OBJS= $(DSA_COMMON_OBJS) $(DSA_PSM_OBJS) -RSA_OBJS= $(RSA_COMMON_OBJS) $(RSA_PSM_OBJS) -PAD_OBJS= $(PAD_COMMON_OBJS) $(PAD_PSM_OBJS) - -OBJECTS= $(AES_OBJS) $(ARCFOUR_OBJS) $(BIGNUM_OBJS) $(BLOWFISH_OBJS) \ - $(DES_OBJS) $(MODES_OBJS) $(DH_OBJS) $(DSA_OBJS) \ - $(RSA_OBJS) $(PAD_OBJS) - -include $(SRC)/lib/Makefile.lib +AES_OBJS = $(AES_COMMON_OBJS) $(AES_PSM_OBJS) +ARCFOUR_OBJS = $(ARCFOUR_COMMON_OBJS) $(ARCFOUR_PSM_OBJS) +BLOWFISH_OBJS = $(BLOWFISH_COMMON_OBJS) $(BLOWFISH_PSM_OBJS) +DES_OBJS = $(DES_COMMON_OBJS) $(DES_PSM_OBJS) +BIGNUM_OBJS = $(BIGNUM_COMMON_OBJS) $(BIGNUM_PSM_OBJS) +MODES_OBJS = $(MODES_COMMON_OBJS) $(MODES_PSM_OBJS) +DH_OBJS = $(DH_COMMON_OBJS) $(DH_PSM_OBJS) +DSA_OBJS = $(DSA_COMMON_OBJS) $(DSA_PSM_OBJS) +RSA_OBJS = $(RSA_COMMON_OBJS) $(RSA_PSM_OBJS) +PAD_OBJS = $(PAD_COMMON_OBJS) $(PAD_PSM_OBJS) + +OBJECTS = $(AES_OBJS) $(ARCFOUR_OBJS) $(BIGNUM_OBJS) \ + $(BLOWFISH_OBJS) $(DES_OBJS) $(MODES_OBJS) $(DH_OBJS) \ + $(DSA_OBJS) $(RSA_OBJS) $(PAD_OBJS) # Source file setup -AES_SRC= $(AES_COMMON_SRC) $(AES_PSM_SRC) -ARCFOUR_SRC= $(ARCFOUR_COMMON_SRC) $(ARCFOUR_PSM_SRC) -BLOWFISH_SRC= $(BLOWFISH_COMMON_SRC) $(BLOWFISH_PSM_SRC) -DES_SRC= $(DES_COMMON_SRC) $(DES_PSM_SRC) -BIGNUM_SRC= $(BIGNUM_COMMON_SRC) $(BIGNUM_PSM_SRC) -MODES_SRC= $(MODES_COMMON_SRC) $(MODES_PSM_SRC) -DH_SRC= $(DH_COMMON_SRC) $(DH_PSM_SRC) -DSA_SRC= $(DSA_COMMON_SRC) $(DSA_PSM_SRC) -RSA_SRC= $(RSA_COMMON_SRC) $(RSA_PSM_SRC) -PAD_SRC= $(PAD_COMMON_SRC) $(PAD_PSM_SRC) - -SRCS= $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) $(DES_SRC) \ - $(MODES_SRC) $(DH_SRC) $(DSA_SRC) $(RSA_SRC) \ - $(PAD_SRC) - -# Do not lint ECC and MPI -LINTABLE= \ - $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) $(DES_SRC) \ - $(MODES_SRC) $(DH_SRC) $(DSA_SRC) $(RSA_SRC) $(PAD_SRC) - -# -# Compiler settings -# - -SRCDIR= $(SRC)/lib/pkcs11/libsoftcrypto/common/ -CRYPTODIR= $(SRC)/common/crypto/ -UTSDIR= $(SRC)/uts/common/ -ROOTLIBDIR= $(ROOT)/usr/lib -ROOTLIBDIR64= $(ROOT)/usr/lib/$(MACH64) -ROOTHWCAPDIR= $(ROOTLIBDIR)/libsoftcrypto - -# $(LINTLIB) is not included here; i386_hwcap1/Makefile does not make -# a lint library, so each of the other platform-specific Makefiles adds -# the lint library target individually -LIBS = $(DYNLIB) -LDLIBS += -lc - -CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) -CPPFLAGS += -I$(SRCDIR) -I$(CRYPTODIR) -I$(UTSDIR) \ - $(BIGNUM_FLAGS) \ - -D_POSIX_PTHREAD_SEMANTICS -ASFLAGS = $(AS_PICFLAGS) -P -D__STDC__ -D_ASM -EXTRA_LINT_FLAGS = \ - $(AES_FLAGS) $(BLOWFISH_FLAGS) $(ARCFOUR_FLAGS) $(DES_FLAGS) \ - $(BIGNUM_FLAGS) $(MODES_FLAGS) $(DH_FLAGS) $(DSA_FLAGS) \ - $(RSA_FLAGS) $(PAD_FLAGS) -LINTFLAGS += $(EXTRA_LINT_FLAGS) -LINTFLAGS64 += $(EXTRA_LINT_FLAGS) -errchk=longptr64 - -LINTLIB= llib-l$(LIBNAME).ln -$(LINTLIB) := SRCS = $(LINTABLE) -lintcheck := SRCS = $(LINTABLE) - -all: $(LIBS) - -lint: lintcheck - -pics/%.o: $(AES_DIR)/%.c - $(COMPILE.c) $(AES_FLAGS) -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(ARCFOUR_DIR)/%.c - $(COMPILE.c) $(ARCFOUR_FLAGS) -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(BIGNUM_DIR)/%.c - $(COMPILE.c) $(BIGNUM_FLAGS) -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(BLOWFISH_DIR)/%.c - $(COMPILE.c) $(BLOWFISH_FLAGS) -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(DES_DIR)/%.c - $(COMPILE.c) $(DES_FLAGS) -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(MODES_DIR)/%.c - $(COMPILE.c) $(MODES_FLAGS) -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(DH_DIR)/%.c - $(COMPILE.c) $(DH_FLAGS) -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(DSA_DIR)/%.c - $(COMPILE.c) $(DSA_FLAGS) -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(RSA_DIR)/%.c - $(COMPILE.c) $(RSA_FLAGS) -o $@ $< - $(POST_PROCESS_O) - -pics/%.o: $(PAD_DIR)/%.c - $(COMPILE.c) $(PAD_FLAGS) -o $@ $< - $(POST_PROCESS_O) - -# -# Platform-specific targets -# - - -SOFT_PSR_DIRS = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib) -SOFT_PSR_LINKS = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/$(MODULE)) - -SOFT_PSR64_DIRS = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/$(MACH64)) -SOFT_PSR64_LINKS = \ - $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE)) - -INS.slink6 = $(RM) -r $@; \ - $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ -INS.slink64 = $(RM) -r $@; \ - $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ - -$(SOFT_PSR_DIRS) \ -$(SOFT_PSR64_DIRS): - -$(INS.dir) - -$(SOFT_PSR_LINKS): $(SOFT_PSR_DIRS) - -$(INS.slink6) - -$(SOFT_PSR64_LINKS): $(SOFT_PSR64_DIRS) - -$(INS.slink64) - - -include $(SRC)/lib/Makefile.targ +AES_SRC = $(AES_COMMON_SRC) $(AES_PSM_SRC) +ARCFOUR_SRC = $(ARCFOUR_COMMON_SRC) $(ARCFOUR_PSM_SRC) +BLOWFISH_SRC = $(BLOWFISH_COMMON_SRC) $(BLOWFISH_PSM_SRC) +DES_SRC = $(DES_COMMON_SRC) $(DES_PSM_SRC) +BIGNUM_SRC = $(BIGNUM_COMMON_SRC) $(BIGNUM_PSM_SRC) +MODES_SRC = $(MODES_COMMON_SRC) $(MODES_PSM_SRC) +DH_SRC = $(DH_COMMON_SRC) $(DH_PSM_SRC) +DSA_SRC = $(DSA_COMMON_SRC) $(DSA_PSM_SRC) +RSA_SRC = $(RSA_COMMON_SRC) $(RSA_PSM_SRC) +PAD_SRC = $(PAD_COMMON_SRC) $(PAD_PSM_SRC) + +# Header include directories +CRYPTODIR = $(SRC)/common/crypto +UTSDIR = $(SRC)/uts/common/ + +# Lint +EXTRA_LINT_FLAGS = $(AES_FLAGS) $(BLOWFISH_FLAGS) $(ARCFOUR_FLAGS) \ + $(DES_FLAGS) $(BIGNUM_FLAGS) $(MODES_FLAGS) \ + $(DH_FLAGS) $(DSA_FLAGS) $(RSA_FLAGS) $(PAD_FLAGS) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/Makefile.targ b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.targ new file mode 100644 index 0000000000..21de491517 --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.targ @@ -0,0 +1,73 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +AES_DIR = $(SRC)/common/crypto/aes +ARCFOUR_DIR = $(SRC)/common/crypto/arcfour +BIGNUM_DIR = $(SRC)/common/bignum +BLOWFISH_DIR = $(SRC)/common/crypto/blowfish +DES_DIR = $(SRC)/common/crypto/des +MODES_DIR = $(SRC)/common/crypto/modes + +pics/%.o: $(AES_DIR)/%.c + $(COMPILE.c) $(AES_FLAGS) -o $@ $< + $(POST_PROCESS_O) + +pics/%.o: $(ARCFOUR_DIR)/%.c + $(COMPILE.c) $(ARCFOUR_FLAGS) -o $@ $< + $(POST_PROCESS_O) + +pics/%.o: $(BIGNUM_DIR)/%.c + $(COMPILE.c) $(BIGNUM_FLAGS) -o $@ $< + $(POST_PROCESS_O) + +pics/%.o: $(BLOWFISH_DIR)/%.c + $(COMPILE.c) $(BLOWFISH_FLAGS) -o $@ $< + $(POST_PROCESS_O) + +pics/%.o: $(DES_DIR)/%.c + $(COMPILE.c) $(DES_FLAGS) -o $@ $< + $(POST_PROCESS_O) + +pics/%.o: $(MODES_DIR)/%.c + $(COMPILE.c) -o $@ $< + $(POST_PROCESS_O) + +pics/%.o: $(DH_DIR)/%.c + $(COMPILE.c) $(DH_FLAGS) -o $@ $< + $(POST_PROCESS_O) + +pics/%.o: $(DSA_DIR)/%.c + $(COMPILE.c) $(DSA_FLAGS) -o $@ $< + $(POST_PROCESS_O) + +pics/%.o: $(RSA_DIR)/%.c + $(COMPILE.c) $(RSA_FLAGS) -o $@ $< + $(POST_PROCESS_O) + +pics/%.o: $(PAD_DIR)/%.c + $(COMPILE.c) $(PAD_FLAGS) -o $@ $< + $(POST_PROCESS_O) + +include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile index fdfc885a93..b2e7d90ee7 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile @@ -23,56 +23,72 @@ # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # -# -# lib/pkcs11/libsoftcrypto/amd64/Makefile -# +LIBRARY = libsoftcrypto.a +VERS = .1 -LIBRARY= libsoftcrypto.a -VERS= .1 +include ../Makefile.com -AES_PSM_OBJS= aes_amd64.o aes_intel.o aeskey.o -AES_PSM_SRC= $(AES_DIR)/$(MACH64)/aes_amd64.s $(AES_DIR)/$(MACH64)/aes_intel.s \ - $(AES_DIR)/$(MACH64)/aeskey.c +AES_PSM_OBJS = aes_amd64.o aes_intel.o aeskey.o +ARCFOUR_PSM_OBJS = arcfour-x86_64.o +BIGNUM_PSM_OBJS = bignum_amd64.o bignum_amd64_asm.o -ARCFOUR_PSM_OBJS= arcfour-x86_64.o -ARCFOUR_PSM_SRC= arcfour-x86_64.s +include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.lib.64 -BIGNUM_PSM_OBJS= bignum_amd64.o bignum_amd64_asm.o -BIGNUM_PSM_SRC= $(BIGNUM_DIR)/$(MACH64)/bignum_amd64.c \ +AES_PSM_SRC = $(AES_DIR)/$(MACH64)/aes_amd64.s \ + $(AES_DIR)/$(MACH64)/aes_intel.s \ + $(AES_DIR)/$(MACH64)/aeskey.c +ARCFOUR_PSM_SRC = arcfour-x86_64.s +BIGNUM_PSM_SRC = $(BIGNUM_DIR)/$(MACH64)/bignum_amd64.c \ $(BIGNUM_DIR)/$(MACH64)/bignum_amd64_asm.s -include ../Makefile.com -include $(SRC)/lib/Makefile.lib.64 +# Sources need to be redefined after Makefile.lib inclusion. +SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \ + $(DES_SRC) $(MODES_SRC) $(DH_SRC) $(DSA_SRC) $(RSA_SRC) \ + $(PAD_SRC) + +SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common + +LIBS = $(DYNLIB) $(LINTLIB) +MAPFILEDIR = ../common + +CFLAGS += -xO4 -xcrossfile +CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS +ASFLAGS += $(AS_PICFLAGS) -P -D__STDC__ -D_ASM +BIGNUM_FLAGS += -DPSR_MUL +CLEANFILES += arcfour-x86_64.s +LDLIBS += -lcryptoutil -lc +LINTFLAGS64 += $(EXTRA_LINT_FLAGS) + +.KEEP_STATE: + +all: $(LIBS) -CFLAGS += -xO4 -xcrossfile -BIGNUM_FLAGS += -DPSR_MUL -LINTFLAGS64 += $(BIGNUM_FLAGS) $(AES_FLAGS) $(ARCFOUR_FLAGS) -CLEANFILES += arcfour-x86_64.s +lint: $(SRCS) -LDLIBS += -lcryptoutil -LIBS += $(LINTLIB) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +pics/%.o: $(AES_DIR)/$(MACH64)/%.c + $(COMPILE.c) $(AES_FLAGS) -o $@ $< + $(POST_PROCESS_O) -arcfour-x86_64.s: $(ARCFOUR_DIR)/amd64/arcfour-x86_64.pl - $(PERL) $? $@ +pics/%.o: $(AES_DIR)/$(MACH64)/%.s + $(COMPILE.s) $(AES_FLAGS) -o $@ $< + $(POST_PROCESS_O) -pics/%.o: $(AES_DIR)/$(MACH64)/%.c - $(COMPILE.c) $(AES_FLAGS) -o $@ $< - $(POST_PROCESS_O) +pics/%.o: $(BIGNUM_DIR)/$(MACH64)/%.c + $(COMPILE.c) $(BIGNUM_FLAGS) -o $@ $< + $(POST_PROCESS_O) -pics/%.o: $(AES_DIR)/$(MACH64)/%.s - $(COMPILE.s) $(AES_FLAGS) -o $@ $< - $(POST_PROCESS_O) +pics/%.o: $(BIGNUM_DIR)/$(MACH64)/%.s + $(COMPILE64.s) $(BIGNUM_FLAGS) -o $@ $< + $(POST_PROCESS_O) -pics/%.o: $(BIGNUM_DIR)/$(MACH64)/%.c - $(COMPILE.c) $(BIGNUM_FLAGS) -o $@ $< - $(POST_PROCESS_O) +include ../Makefile.targ -pics/%.o: $(BIGNUM_DIR)/$(MACH64)/%.s - $(COMPILE64.s) $(BIGNUM_FLAGS) -o $@ $< - $(POST_PROCESS_O) +arcfour-x86_64.s: $(ARCFOUR_DIR)/amd64/arcfour-x86_64.pl + $(PERL) $? $@ -pics/%.o: arcfour-x86_64.s - $(COMPILE64.s) $(ARCFOUR_FLAGS) -o $@ $< - $(POST_PROCESS_O) +pics/%.o: arcfour-x86_64.s + $(COMPILE64.s) $(ARCFOUR_FLAGS) -o $@ $< + $(POST_PROCESS_O) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile new file mode 100644 index 0000000000..bfd264345e --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile @@ -0,0 +1,49 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include $(SRC)/lib/Makefile.lib + +# Each target directory is responsible for making a symbol capabilities object. +$(SPARC_BLD)SUBDIRS = sun4u sun4v +$(INTEL_BLD)SUBDIRS = intel + +all := TARGET= all +clean := TARGET= clean +clobber := TARGET= clobber +install := TARGET= install + +.KEEP_STATE: + +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) + +lint: + +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + +FRC: diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.com new file mode 100644 index 0000000000..7548b023c3 --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.com @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../../../Makefile.com + +MAPFILE-CAP = ../common/mapfile-cap +MAPOPT-CAP = $(MAPFILE-CAP:%=-M%) + +OBJCAP = pics/objcap.o +SYMCAP = pics/symcap.o + +CLOBBERFILES += $(OBJCAP) $(SYMCAP) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.targ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.targ new file mode 100644 index 0000000000..dfd9b10aea --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile.targ @@ -0,0 +1,71 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# libsoftcrypto provides two families of optimized functions for SPARC +# platforms, one for sun4u, and one for sun4v. Previous implementations +# provided these families as libsoftcrypto_psr.so.1 libraries, triggered +# by tagging libsoftcrypto.so.1 as an auxiliary filter. These psr filtees +# were installed under /usr/platform/sun4u/lib, and numerous symlinks were +# established to provide the necessary $PLATFORM names, ie: +# +# /usr/platform/SUNW,Ultra-2/lib/libsoftcrypto_psr.so.1 -> ../../../sun4u +# /usr/platform/SUNW,Ultra-4/lib/libsoftcrypto_psr.so.1 -> ../../../sun4u +# .... +# +# and: +# +# /usr/platform/SUNW,Netra-CP3060/lib/libsoftcrypto_psr.so.1 -> ../../sun4v +# /usr/platform/SUNW,Netra-CP3260/lib/libsoftcrypto_psr.so.1 -> ../../sun4v/ +# .... +# +# The objects that made up these filtees are now combined into one relocatable +# object, pics/objcap.o, using ../common/mapfile-cap. This mapfile identifies +# the machine hardware name, together with establishing the global symbols that +# should be exported to define each family. +# +# This object capabilities relocatable object is then translated into a symbol +# capabilities relocatable object, pics/symcap.o. +# +# The sun4u and sun4v families of symbol capabilities object are eventually +# included in the final build of libsoftcrypto.so.1. + +$(SYMCAP): $(OBJCAP) +$(OBJCAP): $(PICS) +$(PICS): pics + +# Combine all pic objects into one relocatable object. Assign any capabilities +# to this object, and define the interface. + +pics/objcap.o: $(PICS) $(MAPFILE-CAP) + $(LD) -r -o $@ $(MAPOPT-CAP) -Breduce $(PICS) + +# Convert the combined object capabilities object into a symbol capabilities +# object. + +pics/symcap.o: $(OBJCAP) + $(LD) -r -o $@ -z symbolcap $(OBJCAP) + +include ../../../Makefile.targ diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile new file mode 100644 index 0000000000..aa11eb6fde --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile @@ -0,0 +1,47 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include $(SRC)/lib/Makefile.lib + +SUBDIRS = $(MACH) + +all := TARGET= all +clean := TARGET= clean +clobber := TARGET= clobber +install := TARGET= install + +.KEEP_STATE: + +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) + +lint: + +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + +FRC: diff --git a/usr/src/lib/libc/sparc_hwcap1/sparc/mapfile-vers-aux b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/common/mapfile-cap index cfb7d2f4c3..ec14158241 100644 --- a/usr/src/lib/libc/sparc_hwcap1/sparc/mapfile-vers-aux +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/common/mapfile-cap @@ -19,37 +19,38 @@ # CDDL HEADER END # # -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -# -# MAPFILE HEADER START -# -# WARNING: STOP NOW. DO NOT MODIFY THIS FILE. -# Object versioning must comply with the rules detailed in -# -# usr/src/lib/README.mapfiles -# -# You should not be making modifications here until you've read the most current -# copy of that file. If you need help, contact a gatekeeper for guidance. -# -# MAPFILE HEADER END -# +# The only file that contains capabilities symbols is bignum_i386_asm.o, +# however this is a dependency of bignum_i386.o, which in turn is a dependency +# of pics/bignumimpl.o. Only the last object exports any interfaces, hence +# we compile, and combine all three. The resulting object is identified as a +# whole with the bignum_i386_asm.o capabilities flags. $mapfile_version 2 -SYMBOL_VERSION SYSVABI_1.3 { - global: - memcmp; - memcpy; - memmove; - memset; -}; +CAPABILITY i386_hwcap1; -SYMBOL_VERSION SUNWprivate_1.1 { - global: - _memcmp; - _memcpy { FLAGS = NODYNSORT }; - _memmove; - _memset; +SYMBOL_SCOPE { + global: + big_add; + big_bitlength; + big_cmp_abs; + big_copy; + big_div_pos; + big_ext_gcd_pos; + big_extend; + big_finish; + big_init1; + big_init; + big_modexp; + big_modexp_crt; + big_mul; + big_nextprime_pos; + big_sub; + big_sub_pos; + bignum2bytestring; + local: + *; }; diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/i386/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/i386/Makefile new file mode 100644 index 0000000000..3d80d13627 --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/i386/Makefile @@ -0,0 +1,54 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +BIGNUM_PSM_OBJS = bignum_i386.o bignum_i386_asm.o + +include ../../Makefile.com + +# Redefine the objects required for this capabilities group. +OBJECTS = $(BIGNUM_OBJS) + +include $(SRC)/lib/Makefile.lib + +AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH) +ASFLAGS += $(AS_PICFLAGS) -P +CFLAGS += $(CCVERBOSE) +CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS +BIGNUM_FLAGS += -DMMX_MANAGE -DHWCAP -DPSR_MUL -DNO_BIG_ONE -DNO_BIG_TWO + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../../Makefile.targ + +pics/bignum_i386.o: $(BIGNUM_DIR)/i386/bignum_i386.c + $(COMPILE.c) $(BIGNUM_FLAGS) -o $@ \ + $(BIGNUM_DIR)/i386/bignum_i386.c + $(POST_PROCESS_O) + +pics/bignum_i386_asm.o: $(BIGNUM_DIR)/i386/bignum_i386_asm.s + $(COMPILE.s) -o $@ $(BIGNUM_DIR)/i386/bignum_i386_asm.s + $(POST_PROCESS_O) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile new file mode 100644 index 0000000000..77aed04fa7 --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile @@ -0,0 +1,47 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include $(SRC)/lib/Makefile.lib + +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) + +all := TARGET= all +clean := TARGET= clean +clobber := TARGET= clobber +install := TARGET= install + +.KEEP_STATE: + +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) + +lint: + +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + +FRC: diff --git a/usr/src/lib/libc/sparc_hwcap1/sparcv9/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.com index 451d682145..6027025c55 100644 --- a/usr/src/lib/libc/sparc_hwcap1/sparcv9/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.com @@ -18,31 +18,29 @@ # # CDDL HEADER END # + # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -LIBCBASE= $(SRC)/lib/libc/sparcv9 - -LIBRARY= libc_hwcap1.a +PLATFORM = sun4u -EXTN_CPPFLAGS= -I$(SRC)/uts/sun4v -I$(ROOT)/usr/platform/sun4v/include -EXTN_ASFLAGS= -xarch=v9d -EXTN_DYNFLAGS= -M mapfile +AES_PSM_OBJS = aes_crypt_asm.o +ARCFOUR_PSM_OBJS = arcfour_crypt_asm.o +DES_PSM_OBJS = des_crypt_asm.o +BIGNUM_PSM_OBJS = mont_mulf_asm.o -# Defining this means build targets will first try to use source from this -# directory before falling back to unoptimized sun4v source. -# -OPTIMIZED_LIBCBASE=../common +include ../../Makefile.com -PRFOBJS= \ - memcpy.o \ - memmove.o \ - memset.o \ - strlen.o \ - strcpy.o \ +# Redefine the objects required for this capabilities group. +OBJECTS = $(AES_OBJS) $(ARCFOUR_OBJS) $(DES_OBJS) $(BIGNUM_OBJS) \ + $(MODES_OBJS) -MAPFILE_AUX = mapfile-vers-aux +include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/libc/sparcv9/Makefile.com +AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH) +ASFLAGS += $(AS_PICFLAGS) -P +CFLAGS += $(CCVERBOSE) +CPPFLAGS += -D$(PLATFORM) -I$(CRYPTODIR) -I$(UTSDIR) \ + -D_POSIX_PTHREAD_SEMANTICS +BIGNUM_FLAGS += -DUSE_FLOATING_POINT -DNO_BIG_ONE -DNO_BIG_TWO diff --git a/usr/src/lib/libmd/sun4v/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.targ index 6cef14c4ed..422f5f8c17 100644 --- a/usr/src/lib/libmd/sun4v/Makefile.com +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.targ @@ -18,24 +18,21 @@ # # CDDL HEADER END # + # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -LIBRARY= libmd_psr.a - -include $(SRC)/Makefile.psm -include ../Makefile.links -include ../../Makefile.com - -LIBS= $(DYNLIB) +include ../../Makefile.targ -CFLAGS += -m32 -xarch=sparcvis -CPPFLAGS += -D$(PLATFORM) -ASFLAGS = -P $(ASDEFS) +pics/aes_crypt_asm.o: $(AES_DIR)/sun4u/aes_crypt_asm.s + $(COMPILE.s) -o $@ $(AES_DIR)/sun4u/aes_crypt_asm.s + $(POST_PROCESS_O) -INLINES= $(COMDIR)/md5/$(MACH)/$(PLATFORM)/byteswap.il +pics/arcfour_crypt_asm.o: $(ARCFOUR_DIR)/sun4u/arcfour_crypt_asm.s + $(COMPILE.s) -o $@ $(ARCFOUR_DIR)/sun4u/arcfour_crypt_asm.s + $(POST_PROCESS_O) -# XXX This seems wrong since we explicitly set LIBS to be DYNLIB only -$(LINTLIB):= SRCS= ../../common/llib-lmd +pics/des_crypt_asm.o: $(DES_DIR)/sun4u/des_crypt_asm.s + $(COMPILE.s) -o $@ $(DES_DIR)/sun4u/des_crypt_asm.s + $(POST_PROCESS_O) diff --git a/usr/src/lib/libc/sparc_hwcap1/sparcv9/mapfile-vers-aux b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/common/mapfile-cap index 10a8c864be..0d9e354aea 100644 --- a/usr/src/lib/libc/sparc_hwcap1/sparcv9/mapfile-vers-aux +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/common/mapfile-cap @@ -18,38 +18,50 @@ # # CDDL HEADER END # -# -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. -# # -# MAPFILE HEADER START -# -# WARNING: STOP NOW. DO NOT MODIFY THIS FILE. -# Object versioning must comply with the rules detailed in -# -# usr/src/lib/README.mapfiles -# -# You should not be making modifications here until you've read the most current -# copy of that file. If you need help, contact a gatekeeper for guidance. -# -# MAPFILE HEADER END +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # $mapfile_version 2 -SYMBOL_VERSION SUNW_0.7 { # SunOS 5.3 (Solaris 2.3) - global: - memcmp; - memcpy; - memmove; - memset; +CAPABILITY sun4u { + MACHINE = sun4u; }; -SYMBOL_VERSION SUNWprivate_1.1 { - global: - _memcmp; - _memcpy { FLAGS = NODYNSORT }; - _memmove; - _memset; +SYMBOL_SCOPE { + global: + aes_alloc_keysched; + aes_decrypt_contiguous_blocks; + aes_decrypt_block; + aes_encrypt_contiguous_blocks; + aes_encrypt_block; + aes_init_keysched; + arcfour_crypt; + arcfour_key_init; + big_add; + big_bitlength; + big_cmp_abs; + big_copy; + big_div_pos; + big_ext_gcd_pos; + big_extend; + big_finish; + big_init1; + big_init; + big_modexp; + big_modexp_crt; + big_mul; + big_nextprime_pos; + big_random; + big_sub; + big_sub_pos; + bignum2bytestring; + des3_crunch_block; + des_alloc_keysched; + des_crunch_block; + des_init_keysched; + des_keycheck; + local: + *; }; diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/sparc/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/sparc/Makefile index 35a083de83..2bc570c2ef 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/sparc/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/sparc/Makefile @@ -20,20 +20,20 @@ # # -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -# -# lib/pkcs11/libsoftcrypto/sun4v/sparc/Makefile -# +include ../Makefile.com -CLASS = 32 +ASFLAGS += -xarch=v8plus -include ../Makefile.com +.KEEP_STATE: -LINTFLAGS += -D$(PLATFORM) -erroff=E_NAME_MULTIPLY_DEF2 +all install: $(SYMCAP) -install: all $(SOFT_PSR_LINKS) $(USR_PSM_LIBS) +include ../Makefile.targ -include $(SRC)/Makefile.psm.targ +pics/mont_mulf_asm.o: \ + $(BIGNUM_DIR)/sun4u/mont_mulf_v8plus.s + $(COMPILE.s) -o $@ $(BIGNUM_DIR)/sun4u/mont_mulf_v8plus.s diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/sparcv9/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/sparcv9/Makefile new file mode 100644 index 0000000000..a582d20f9e --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/sparcv9/Makefile @@ -0,0 +1,38 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com +include $(SRC)/lib/Makefile.lib.64 + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../Makefile.targ + +pics/mont_mulf_asm.o: \ + $(BIGNUM_DIR)/sun4u/mont_mulf_v9.s + $(COMPILE.s) -o $@ $(BIGNUM_DIR)/sun4u/mont_mulf_v9.s + diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile new file mode 100644 index 0000000000..77aed04fa7 --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile @@ -0,0 +1,47 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include $(SRC)/lib/Makefile.lib + +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) + +all := TARGET= all +clean := TARGET= clean +clobber := TARGET= clobber +install := TARGET= install + +.KEEP_STATE: + +.PARALLEL: $(SUBDIRS) + +all clean clobber install: \ + $(SUBDIRS) + +lint: + +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) + +FRC: diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.com new file mode 100644 index 0000000000..48a72842a7 --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.com @@ -0,0 +1,40 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +PLATFORM = sun4v + +include ../../Makefile.com + +# Redefine the objects required for this capabilities group. +OBJECTS = $(ARCFOUR_OBJS) $(BIGNUM_OBJS) + +include $(SRC)/lib/Makefile.lib + +AS_CPPFLAGS += -D__STDC__ -D_ASM -DPIC -D_REENTRANT -D$(MACH) +ASFLAGS += $(AS_PICFLAGS) -P +CFLAGS += $(CCVERBOSE) -xO5 -xbuiltin=%all -dalign +CPPFLAGS += -D$(PLATFORM) -I$(CRYPTODIR) -I$(UTSDIR) \ + -D_POSIX_PTHREAD_SEMANTICS +BIGNUM_FLAGS += -DUMUL64 -DNO_BIG_ONE -DNO_BIG_TWO diff --git a/usr/src/lib/libc_psr/sun4u_hwcap2/mapfile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.targ index 428106b752..529351fa2e 100644 --- a/usr/src/lib/libc_psr/sun4u_hwcap2/mapfile +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile.targ @@ -1,6 +1,4 @@ # -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. -# # CDDL HEADER START # # The contents of this file are subject to the terms of the @@ -21,8 +19,8 @@ # CDDL HEADER END # -$mapfile_version 2 +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# -CAPABILITY { - hw += popc; -}; +include ../../Makefile.targ diff --git a/usr/src/lib/libmd/sun4u/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/common/mapfile-cap index 9fe1ae7d35..c10d8f4639 100644 --- a/usr/src/lib/libmd/sun4u/Makefile.com +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/common/mapfile-cap @@ -18,24 +18,39 @@ # # CDDL HEADER END # + # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -LIBRARY= libmd_psr.a - -include $(SRC)/Makefile.psm -include ../Makefile.links -include ../../Makefile.com - -LIBS= $(DYNLIB) - -CFLAGS += -m32 -xarch=sparcvis -CPPFLAGS += -D$(PLATFORM) -DVIS_SHA1 -ASFLAGS = -P $(ASDEFS) +$mapfile_version 2 -INLINES= $(COMDIR)/md5/$(MACH)/$(PLATFORM)/byteswap.il +CAPABILITY sun4v { + MACHINE = sun4v; +}; -# XXX This seems wrong since we explicitly set LIBS to be DYNLIB only -$(LINTLIB):= SRCS= ../../common/llib-lmd +SYMBOL_SCOPE { + global: + arcfour_crypt; + arcfour_key_init; + big_add; + big_bitlength; + big_cmp_abs; + big_copy; + big_div_pos; + big_ext_gcd_pos; + big_extend; + big_finish; + big_init1; + big_init; + big_modexp; + big_modexp_crt; + big_mul; + big_nextprime_pos; + big_random; + big_sub; + big_sub_pos; + bignum2bytestring; + local: + *; +}; diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/sparc/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/sparc/Makefile new file mode 100644 index 0000000000..96eebadc90 --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/sparc/Makefile @@ -0,0 +1,32 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../Makefile.targ diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/sparcv9/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/sparcv9/Makefile new file mode 100644 index 0000000000..02c81e7510 --- /dev/null +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/sparcv9/Makefile @@ -0,0 +1,33 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +include ../Makefile.com +include $(SRC)/lib/Makefile.lib.64 + +.KEEP_STATE: + +all install: $(SYMCAP) + +include ../Makefile.targ diff --git a/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile index dcd7241c09..750bb15482 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile @@ -23,18 +23,37 @@ # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # -# -# lib/pkcs11/libsoftcrypto/i386/Makefile -# +LIBRARY = libsoftcrypto.a +VERS = .1 + +include ../Makefile.com + +include $(SRC)/lib/Makefile.lib + +# Sources need to be redefined after Makefile.lib inclusion. +SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \ + $(DES_SRC) $(MODES_SRC) $(DH_SRC) $(DSA_SRC) $(RSA_SRC) \ + $(PAD_SRC) + +SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common + +LIBS = $(DYNLIB) $(LINTLIB) +MAPFILEDIR = ../common + +CFLAGS += $(CCVERBOSE) +CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS +LDLIBS += -lcryptoutil -lc +LINTFLAGS += $(EXTRA_LINT_FLAGS) + +# Symbol capabilities objects are i386. +EXTPICS = ../capabilities/intel/i386/pics/symcap.o -LIBRARY= libsoftcrypto.a -VERS= .1 +.KEEP_STATE: -include ../Makefile.com +all: $(LIBS) -LDLIBS += -lcryptoutil -LIBS += $(LINTLIB) +lint: $(SRCS) -DYNFLAGS += -Wl,-f/usr/lib/libsoftcrypto/\$$HWCAP +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +include ../Makefile.targ diff --git a/usr/src/lib/pkcs11/libsoftcrypto/i386_hwcap1/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/i386_hwcap1/Makefile deleted file mode 100644 index 4f2eaa539b..0000000000 --- a/usr/src/lib/pkcs11/libsoftcrypto/i386_hwcap1/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# lib/pkcs11/libsoftcrypto/i386_hwcap1/Makefile -# -LIBRARY= libsoftcrypto_hwcap1.a -VERS= .1 - -MODULE= libsoftcrypto_hwcap1.so.1 - -BIGNUM_PSM_OBJS= bignum_i386.o bignum_i386_asm.o -BIGNUM_PSM_SRC= $(BIGNUM_DIR)/i386/bignum_i386_asm.s \ - $(BIGNUM_DIR)/i386/bignum_i386.c - -include ../Makefile.com - -BIGNUM_FLAGS += -DMMX_MANAGE -DHWCAP -DPSR_MUL -LINTFLAGS += $(BIGNUM_FLAGS) - -LDLIBS += -lcryptoutil - -$(ROOTHWCAPDIR)/% := FILEMODE= 755 - -install: all $(ROOTHWCAPDIR)/$(MODULE) - -pics/bignum_i386.o: $(BIGNUM_DIR)/i386/bignum_i386.c - $(COMPILE.c) $(BIGNUM_FLAGS) -o $@ $(BIGNUM_DIR)/i386/bignum_i386.c - $(POST_PROCESS_O) - -pics/bignum_i386_asm.o: $(BIGNUM_DIR)/i386/bignum_i386_asm.s - $(COMPILE.s) -o $@ $(BIGNUM_DIR)/i386/bignum_i386_asm.s - $(POST_PROCESS_O) - -$(ROOTHWCAPDIR): $(ROOTLIBDIR) - $(INS.dir) - -$(ROOTHWCAPDIR)/%: $(ROOTHWCAPDIR) % - $(INS.file) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile index 56ad2c2205..a5442e51ab 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile @@ -23,18 +23,38 @@ # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # -# -# lib/pkcs11/libsoftcrypto/sparc/Makefile -# +LIBRARY = libsoftcrypto.a +VERS = .1 + +include ../Makefile.com + +include $(SRC)/lib/Makefile.lib + +# Sources need to be redefined after Makefile.lib inclusion. +SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \ + $(DES_SRC) $(MODES_SRC) $(DH_SRC) $(DSA_SRC) $(RSA_SRC) \ + $(PAD_SRC) + +SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common + +LIBS = $(DYNLIB) $(LINTLIB) +MAPFILEDIR = ../common + +CFLAGS += $(CCVERBOSE) +CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS +LDLIBS += -lcryptoutil -lc +LINTFLAGS += $(EXTRA_LINT_FLAGS) + +# Symbol capabilities objects are added for sun4u and sun4v. +EXTPICS = ../capabilities/sun4u/sparc/pics/symcap.o \ + ../capabilities/sun4v/sparc/pics/symcap.o -LIBRARY= libsoftcrypto.a -VERS= .1 +.KEEP_STATE: -include ../Makefile.com +all: $(LIBS) -LDLIBS += -lcryptoutil -LIBS += $(LINTLIB) +lint: $(SRCS) -DYNFLAGS += -Wl,-f/usr/platform/\$$PLATFORM/lib/$(DYNLIBPSR) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +include ../Makefile.targ diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile index 037a1e36ef..0dc3a48308 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile +++ b/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile @@ -23,19 +23,39 @@ # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # -# -# lib/pkcs11/libsoftcrypto/sparcv9/Makefile -# +LIBRARY = libsoftcrypto.a +VERS = .1 + +include ../Makefile.com + +include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.lib.64 + +# Sources need to be redefined after Makefile.lib inclusion. +SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \ + $(DES_SRC) $(MODES_SRC) $(DH_SRC) $(DSA_SRC) $(RSA_SRC) \ + $(PAD_SRC) + +SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common + +LIBS = $(DYNLIB) $(LINTLIB) +MAPFILEDIR = ../common + +CFLAGS += $(CCVERBOSE) +CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS +LDLIBS += -lcryptoutil -lc +LINTFLAGS64 += $(EXTRA_LINT_FLAGS) + +# Symbol capabilities objects are added for sun4u and sun4v. +EXTPICS = ../capabilities/sun4u/sparcv9/pics/symcap.o \ + ../capabilities/sun4v/sparcv9/pics/symcap.o -LIBRARY= libsoftcrypto.a -VERS= .1 +.KEEP_STATE: -include ../Makefile.com -include $(SRC)/lib/Makefile.lib.64 +all: $(LIBS) -LDLIBS += -lcryptoutil -LIBS += $(LINTLIB) +lint: $(SRCS) -DYNFLAGS += -Wl,-f/usr/platform/\$$PLATFORM/lib/$(MACH64)/$(DYNLIBPSR) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +include ../Makefile.targ diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile.com deleted file mode 100644 index 331bc8d77f..0000000000 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile.com +++ /dev/null @@ -1,137 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# lib/pkcs11/libsoftcrypto/sun4u/Makefile.com -# - -LIBRARY = libsoftcrypto_psr.a -VERS= .1 -PLATFORM = sun4u -MODULE = libsoftcrypto_psr.so.1 - -include $(SRC)/Makefile.psm -include ../Makefile.links -include ../../Makefile.com - -# Platform-specific settings -# -# Specifying *_OBJS here brings in both *_COMMON_OBJS and *_PSM_OBJS to this -# platform-specific implementation, and *supercedes* (replaces) the common -# version. Specifying only *_PSM_OBJS is used when the PSM version is -# intended to *augment* (add onto) the common version. -# -# COMMON and PSM source/object setup is done in libsoftcrypto/Makefile.com, -# and does not need to be repeated here. Only list *_SRCS/*_PSM_SRCS and -# *_OBJS/*_PSM_OBJS that are platform-specific here. Keep SRCS= and -# OBJECTS= in sync with each other. Update mapfile-vers to list only -# the functions that are actually compiled into this platform-specific -# library; do not duplicate what is already in common/mapfile-vers unless -# this library is providing a superceded version of that function here. -# -# Note: This Makefile.com is set up to compile the PSM objects for AES, -# ARCFOUR, and DES to augment the corresponding COMMON objects already -# included in the base libsoftcrypto library. It does not compile anything -# for sun4u sparc/sparcv9 to supercede a COMMON object from libsoftcrypto. -# See the sun4v platform-specific implementation for an alternate example. -# -# NOTE: BIGNUM is different. There is actually no COMMON object in -# libsoftcrypto for currently-supported platforms (sun4u, sun4v, i386/amd64). -# The COMMON objects for BIGNUM are a starting point if a new platform is -# ever added. Thus, BIGNUM_OBJS is listed in every currently-supported -# platform-specific Makefile.com, in effect always overriding what it is -# in the COMMON implementation. BIGNUM_PSM_OBJS is then used to further -# augment BIGNUM_COMMON_OBJS on a platform-by-platform basis. -# -# Example: -# 1. common/Makefile.com: -# FOO_COMMON_OBJS = foo.o -# FOO_PSM_OBJS = <blank> -# FOO_OBJS = $(FOO_COMMON_OBJS) $(FOO_PSM_OBJS) -# -# BAR_COMMON_OBJS = bar.o -# BAR_PSM_OBJS = <blank> -# BAR_OBJS = $(BAR_COMMON_OBJS) $(BAR_PSM_OBJS) -# -# OBJECTS = $(FOO_OBJS) $(BAR_OBJS) -# LIB = libsoftcrypto -# -# Compiling here will make a library libsoftcrypto.so containing: -# foo.o bar.o -# -# Run time sees, unless it is a sun4u or sun4v platform (see below): -# foo.o bar.o -# -# 2. sun4u/Makefile.com: -# FOO_PSM_OBJS = foo-plus.o -# OBJECTS = $(FOO_OBJS) /* defined in common */ -# LIB = libsoftcrypto_psr -# -# Compiling here will make a library libsoftcrypto_psr.so containing: -# foo-plus.o -# -# Run time sees, on a sun4u platform only: -# foo.o bar.o foo-plus.o /* note the difference */ -# -# 3. sun4v/Makefile.com: -# BAR_PSM_OBJS = bar'.o -# OBJECTS = $(BAR_PSM_OBJS) /* not $(BAR_OBJS) */ -# LIB - libsoftcrypto_psr -# -# Compiling here will make a library libsoftcrypto_psr.so containing: -# bar'.o -# -# Run time sees, on a sun4v platform only: -# foo.o bar'.o /* note the difference */ -# -AES_PSM_OBJS= aes_crypt_asm.o -ARCFOUR_PSM_OBJS= arcfour_crypt_asm.o -DES_PSM_OBJS= des_crypt_asm.o -BIGNUM_PSM_OBJS= mont_mulf_asm.o -BIGNUM_FLAGS += -DUSE_FLOATING_POINT - -MAPFILES = ../mapfile-vers -OBJECTS = $(AES_OBJS) $(ARCFOUR_OBJS) $(DES_OBJS) $(BIGNUM_OBJS) \ - $(MODES_OBJS) - -# Compiler settings -CFLAGS += -D$(PLATFORM) -CFLAGS64 += -D$(PLATFORM) -ASFLAGS += -DPIC - -$(USR_PSM_LIB_DIR)/% := FILEMODE = 755 - -pics/aes_crypt_asm.o: $(AES_DIR)/sun4u/aes_crypt_asm.s - $(COMPILE.s) $(AS_BIGPICFLAGS) -o $@ $(AES_DIR)/sun4u/aes_crypt_asm.s - $(POST_PROCESS_O) - -pics/arcfour_crypt_asm.o: $(ARCFOUR_DIR)/sun4u/arcfour_crypt_asm.s - $(COMPILE.s) $(AS_BIGPICFLAGS) -o $@ \ - $(ARCFOUR_DIR)/sun4u/arcfour_crypt_asm.s - $(POST_PROCESS_O) - -pics/des_crypt_asm.o: $(DES_DIR)/sun4u/des_crypt_asm.s - $(COMPILE.s) $(AS_BIGPICFLAGS) -o $@ $(DES_DIR)/sun4u/des_crypt_asm.s - $(POST_PROCESS_O) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile.links b/usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile.links deleted file mode 100644 index 96eafa633f..0000000000 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/Makefile.links +++ /dev/null @@ -1,61 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# lib/pkcs11/libsoftcrypto/sun4u/Makefile.links -# -# Used when building links in /usr/platform/sun4u/lib/ and -# /usr/platform/sun4u/lib/sparcv9/ -# - -LINKED_PLATFORMS = \ - SUNW,Ultra-2 \ - SUNW,Ultra-4 \ - SUNW,Ultra-250 \ - SUNW,Ultra-Enterprise \ - SUNW,Ultra-Enterprise-10000 \ - SUNW,UltraSPARC-IIi-Netract \ - SUNW,UltraSPARC-IIe-NetraCT-40 \ - SUNW,UltraSPARC-IIe-NetraCT-60 \ - SUNW,Sun-Blade-100 \ - SUNW,Sun-Blade-1000 \ - SUNW,Sun-Blade-1500 \ - SUNW,Sun-Blade-2500 \ - SUNW,A70 \ - SUNW,Sun-Fire \ - SUNW,Sun-Fire-V215 \ - SUNW,Sun-Fire-V240 \ - SUNW,Sun-Fire-V250 \ - SUNW,Sun-Fire-V440 \ - SUNW,Sun-Fire-V445 \ - SUNW,Sun-Fire-280R \ - SUNW,Sun-Fire-15000 \ - SUNW,Sun-Fire-880 \ - SUNW,Sun-Fire-480R \ - SUNW,Sun-Fire-V890 \ - SUNW,Sun-Fire-V490 \ - SUNW,Serverblade1 \ - SUNW,Netra-T12 \ - SUNW,Netra-T4 \ - SUNW,Netra-CP2300 \ - SUNW,Netra-CP3010 diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/mapfile-vers b/usr/src/lib/pkcs11/libsoftcrypto/sun4u/mapfile-vers deleted file mode 100644 index 086993a110..0000000000 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/mapfile-vers +++ /dev/null @@ -1,85 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# MAPFILE HEADER START -# -# WARNING: STOP NOW. DO NOT MODIFY THIS FILE. -# Object versioning must comply with the rules detailed in -# -# usr/src/lib/README.mapfiles -# -# You should not be making modifications here until you've read the most current -# copy of that file. If you need help, contact a gatekeeper for guidance. -# -# MAPFILE HEADER END -# - -$mapfile_version 2 - -SYMBOL_VERSION SUNWprivate { - global: - aes_alloc_keysched; - aes_decrypt_contiguous_blocks; - aes_decrypt_block; - aes_encrypt_contiguous_blocks; - aes_encrypt_block; - aes_init_keysched; - arcfour_crypt; - arcfour_key_init; - big_One; - big_Two; - big_add; - big_bitlength; - big_cmp_abs; - big_copy; - big_div_pos; - big_ext_gcd_pos; - big_extend; - big_finish; - big_init1; - big_init; - big_modexp; - big_modexp_crt; - big_mul; - big_nextprime_pos; - big_random; - big_sub; - big_sub_pos; - bignum2bytestring; - conv_d16_to_i32; - conv_i32_to_d32; - conv_i32_to_d16; - conv_i32_to_d32_and_d16; - mont_mulf_noconv; - des3_crunch_block; - des_alloc_keysched; - des_crunch_block; - des_init_keysched; - des_keycheck; - local: - *; -}; - diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/sparcv9/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/sun4u/sparcv9/Makefile deleted file mode 100644 index 49c32e620d..0000000000 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/sparcv9/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# lib/pkcs11/libsoftcrypto/sun4u/sparcv9/Makefile -# - -CLASS = 64 - -include ../Makefile.com -include $(SRC)/lib/Makefile.lib.64 - -# E_STATIC_UNUSED is for bignumimpl.c, big_modexp_ncp_int/big_modexp_ncp_float -LINTFLAGS64 += -D$(PLATFORM) -erroff=E_STATIC_UNUSED - -install: all $(SOFT_PSR64_LINKS) $(USR_PSM_LIBS64) - -include $(SRC)/Makefile.psm.targ - -pics/mont_mulf_asm.o: $(BIGNUM_DIR)/sun4u/mont_mulf_v9.s - $(COMPILE.s) -o $@ $(BIGNUM_DIR)/sun4u/mont_mulf_v9.s - $(POST_PROCESS_O) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile deleted file mode 100644 index 4f0e552192..0000000000 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# lib/pkcs11/libsoftcrypto/sun4v/Makefile -# - -include $(SRC)/lib/Makefile.lib - -SUBDIRS = $(MACH) $(PLATFORMS) -$(BUILD64)SUBDIRS += $(MACH64) - -all := TARGET= all -check := TARGET= check -clean := TARGET= clean -clobber := TARGET= clobber -install := TARGET= install -lint := TARGET= lint - -.PARALLEL: $(SUBDIRS) - -all check clean clobber install lint: $(SUBDIRS) - -$(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(TARGET) - -FRC: diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile.com deleted file mode 100644 index 3bc7dc8048..0000000000 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile.com +++ /dev/null @@ -1,68 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# lib/pkcs11/libsoftcrypto/sun4v/Makefile.com -# - -LIBRARY = libsoftcrypto_psr.a -VERS= .1 -PLATFORM = sun4v -MODULE = libsoftcrypto_psr.so.1 - -include $(SRC)/Makefile.psm -include ../Makefile.links -include ../../Makefile.com - -# Platform-specific settings -# -# See the sun4u platform-specific Makefile.com for important information -# that also relates to this file. -# -# Note: This file is set up to compile the PSM objects for ARCFOUR to -# *augment* (add onto) its common objects from libsoftcrypto, and to compile -# BIGNUM to *supercede* (replaced) its common objects from libsoftcrypto. -# -ARCFOUR_PSM_OBJS= arcfour_crypt.o -ARCFOUR_PSM_SRC= $(ARCFOUR_DIR)/sun4v/arcfour_crypt.c -BIGNUM_FLAGS += -DUMUL64 - -MAPFILES= ../mapfile-vers -OBJECTS= $(ARCFOUR_PSM_OBJS) $(BIGNUM_OBJS) - -# Compiler settings -sparc_XARCH = -m32 -xarch=sparc -sparcv9_XARCH = -m64 -xarch=sparcvis - -# Niagara perf options as per $SRC/uts/sun4v/arcfour -CFLAGS += -xO5 -xbuiltin=%all -dalign -D$(PLATFORM) -CFLAGS64 += -D$(PLATFORM) -ASFLAGS += -DPIC - -$(USR_PSM_LIB_DIR)/% := FILEMODE = 755 - -pics/arcfour_crypt.o: $(ARCFOUR_DIR)/sun4v/arcfour_crypt.c - $(COMPILE.c) -o $@ $(ARCFOUR_DIR)/sun4v/arcfour_crypt.c - $(POST_PROCESS_O) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile.links b/usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile.links deleted file mode 100644 index c450d67c2e..0000000000 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/Makefile.links +++ /dev/null @@ -1,41 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# lib/libsoftcrypto/sun4v/Makefile.links -# -# Used when building links in /usr/platform/sun4v/lib and -# /usr/platform/sun4v/lib/sparcv9/ -# - -LINKED_PLATFORMS = \ - SUNW,Netra-CP3060 \ - SUNW,Netra-CP3260 \ - SUNW,Netra-T5220 \ - SUNW,Netra-T5440 \ - SUNW,SPARC-Enterprise-T5120 \ - SUNW,Sun-Blade-T6300 \ - SUNW,Sun-Blade-T6320 \ - SUNW,Sun-Fire-T200 \ - SUNW,T5140 \ - SUNW,USBRDT-5240 diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/mapfile-vers b/usr/src/lib/pkcs11/libsoftcrypto/sun4v/mapfile-vers deleted file mode 100644 index a831fd420a..0000000000 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/mapfile-vers +++ /dev/null @@ -1,69 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# MAPFILE HEADER START -# -# WARNING: STOP NOW. DO NOT MODIFY THIS FILE. -# Object versioning must comply with the rules detailed in -# -# usr/src/lib/README.mapfiles -# -# You should not be making modifications here until you've read the most current -# copy of that file. If you need help, contact a gatekeeper for guidance. -# -# MAPFILE HEADER END -# - - -$mapfile_version 2 - -SYMBOL_VERSION SUNWprivate { - global: - arcfour_crypt; - arcfour_key_init; - big_One; - big_Two; - big_add; - big_bitlength; - big_cmp_abs; - big_copy; - big_div_pos; - big_ext_gcd_pos; - big_extend; - big_finish; - big_init1; - big_init; - big_modexp; - big_modexp_crt; - big_mul; - big_nextprime_pos; - big_random; - big_sub; - big_sub_pos; - bignum2bytestring; - local: - *; -}; diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/sparcv9/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/sun4v/sparcv9/Makefile deleted file mode 100644 index ba8463e5ae..0000000000 --- a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/sparcv9/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# lib/pkcs11/libsoftcrypto/sun4v/sparcv9/Makefile -# - -CLASS = 64 - -include ../Makefile.com -include $(SRC)/lib/Makefile.lib.64 - -# E_NAME_MULTIPLY_DEF2 is for arcfour_key_init and arcfour_crypt in -# different implementations of arcfour_crypt.c -LINTFLAGS64 += -D$(PLATFORM) -erroff=E_NAME_MULTIPLY_DEF2 - -install: all $(SOFT_PSR64_LINKS) $(USR_PSM_LIBS64) - -include $(SRC)/Makefile.psm.targ |