diff options
Diffstat (limited to 'usr/src/lib/libsendfile')
| -rw-r--r-- | usr/src/lib/libsendfile/Makefile.com | 7 | ||||
| -rw-r--r-- | usr/src/lib/libsendfile/common/mapfile-vers | 13 | ||||
| -rw-r--r-- | usr/src/lib/libsendfile/common/mapfile32-vers | 44 | ||||
| -rw-r--r-- | usr/src/lib/libsendfile/i386/Makefile | 7 | ||||
| -rw-r--r-- | usr/src/lib/libsendfile/sparc/Makefile | 7 |
5 files changed, 13 insertions, 65 deletions
diff --git a/usr/src/lib/libsendfile/Makefile.com b/usr/src/lib/libsendfile/Makefile.com index 742e1c93a7..5a6a30574c 100644 --- a/usr/src/lib/libsendfile/Makefile.com +++ b/usr/src/lib/libsendfile/Makefile.com @@ -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) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # LIBRARY = libsendfile.a @@ -36,8 +33,6 @@ include ../../Makefile.rootfs SRCDIR = ../common -MAPFILES += $(MAPFILE32) - $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) LIBS = $(DYNLIB) $(LINTLIB) diff --git a/usr/src/lib/libsendfile/common/mapfile-vers b/usr/src/lib/libsendfile/common/mapfile-vers index 702fd9db06..43856c744c 100644 --- a/usr/src/lib/libsendfile/common/mapfile-vers +++ b/usr/src/lib/libsendfile/common/mapfile-vers @@ -19,8 +19,7 @@ # 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. # # @@ -37,10 +36,18 @@ # MAPFILE HEADER END # -SUNW_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNW_1.1 { global: sendfile; sendfilev; + +$if _ELF32 # largefile interfaces for 32-bit applications + sendfile64; + sendfilev64; +$endif + local: *; }; diff --git a/usr/src/lib/libsendfile/common/mapfile32-vers b/usr/src/lib/libsendfile/common/mapfile32-vers deleted file mode 100644 index 928b6bf6b4..0000000000 --- a/usr/src/lib/libsendfile/common/mapfile32-vers +++ /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 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# 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 -# - -SUNW_1.1 { # largefile interfaces for 32-bit applications - global: - sendfile64; - sendfilev64; -}; diff --git a/usr/src/lib/libsendfile/i386/Makefile b/usr/src/lib/libsendfile/i386/Makefile index a579a6b1b6..3d5b9051f3 100644 --- a/usr/src/lib/libsendfile/i386/Makefile +++ b/usr/src/lib/libsendfile/i386/Makefile @@ -19,13 +19,8 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# - -MAPFILE32 = ../common/mapfile32-vers include ../Makefile.com diff --git a/usr/src/lib/libsendfile/sparc/Makefile b/usr/src/lib/libsendfile/sparc/Makefile index a579a6b1b6..3d5b9051f3 100644 --- a/usr/src/lib/libsendfile/sparc/Makefile +++ b/usr/src/lib/libsendfile/sparc/Makefile @@ -19,13 +19,8 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" -# - -MAPFILE32 = ../common/mapfile32-vers include ../Makefile.com |