diff options
Diffstat (limited to 'usr/src/lib/libadm')
| -rw-r--r-- | usr/src/lib/libadm/Makefile.com | 7 | ||||
| -rw-r--r-- | usr/src/lib/libadm/amd64/mapfile-vers | 41 | ||||
| -rw-r--r-- | usr/src/lib/libadm/common/mapfile-vers | 48 | ||||
| -rw-r--r-- | usr/src/lib/libadm/i386/mapfile-vers | 60 | ||||
| -rw-r--r-- | usr/src/lib/libadm/sparc/mapfile-vers | 60 | ||||
| -rw-r--r-- | usr/src/lib/libadm/sparcv9/mapfile-vers | 60 |
6 files changed, 43 insertions, 233 deletions
diff --git a/usr/src/lib/libadm/Makefile.com b/usr/src/lib/libadm/Makefile.com index 9e8f1299cf..58420e2cfc 100644 --- a/usr/src/lib/libadm/Makefile.com +++ b/usr/src/lib/libadm/Makefile.com @@ -19,10 +19,7 @@ # 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) 1997, 2010, Oracle and/or its affiliates. All rights reserved. # LIBRARY= libadm.a @@ -44,8 +41,6 @@ include ../../Makefile.rootfs LIBS= $(DYNLIB) $(LINTLIB) SRCDIR= ../common -MAPFILES += mapfile-vers - CPPFLAGS += -I ../inc $(LINTLIB) := SRCS=$(SRCDIR)/$(LINTSRC) diff --git a/usr/src/lib/libadm/amd64/mapfile-vers b/usr/src/lib/libadm/amd64/mapfile-vers deleted file mode 100644 index 6e47fe847e..0000000000 --- a/usr/src/lib/libadm/amd64/mapfile-vers +++ /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 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 -# - -# This mapfile is empty, on purpose. -# Look at the mapfiles under i386, sparc and sparcv9 for content. diff --git a/usr/src/lib/libadm/common/mapfile-vers b/usr/src/lib/libadm/common/mapfile-vers index ba493269d8..78db9864f1 100644 --- a/usr/src/lib/libadm/common/mapfile-vers +++ b/usr/src/lib/libadm/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,7 +36,9 @@ # MAPFILE HEADER END # -SUNW_1.2 { +$mapfile_version 2 + +SYMBOL_VERSION SUNW_1.2 { global: read_extvtoc; write_extvtoc; @@ -47,19 +48,19 @@ SUNW_1.2 { # no SUNW_1.1 symbols, but the version is now kept as a placeholder. # Don't add any symbols to this version. -SUNW_1.1 { +SYMBOL_VERSION SUNW_1.1 { global: SUNW_1.1; } SUNW_0.7; -SUNW_0.7 { +SYMBOL_VERSION SUNW_0.7 { global: pkgdir; read_vtoc; write_vtoc; }; -SUNWprivate_1.1 { +SYMBOL_VERSION SUNWprivate_1.1 { global: _adddevtabrec; _adddgrptabrec; @@ -163,3 +164,38 @@ SUNWprivate_1.1 { local: *; }; + + +$if _sparc || (_x86 && _ELF32) +# The following applies to sparc (32/64-bit), and 32-bit x86: +# +# It was a mistake ever to have exported these symbols from libadm. +# They are now being redirected to libgen where they really belong, +# except for 'circf' and 'sed', which do not exist in libgen and +# are being retained as dummy variables in libadm. + +SYMBOL_VERSION SUNW_0.7 { + global: + circf; + sed; + nbra { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 }; +$if _ELF32 + loc1 { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 }; + loc2 { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 }; + locs { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 }; +$elif _ELF64 + loc1 { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x8 }; + loc2 { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x8 }; + locs { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x8 }; +$else +$error unknown ELFCLASS +$endif +}; + +SYMBOL_VERSION SUNWprivate_1.1 { + global: + advance { TYPE = FUNCTION; FILTER = libgen.so.1 }; + compile { TYPE = FUNCTION; FILTER = libgen.so.1 }; + step { TYPE = FUNCTION; FILTER = libgen.so.1 }; +}; +$endif diff --git a/usr/src/lib/libadm/i386/mapfile-vers b/usr/src/lib/libadm/i386/mapfile-vers deleted file mode 100644 index 8fce31fd06..0000000000 --- a/usr/src/lib/libadm/i386/mapfile-vers +++ /dev/null @@ -1,60 +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 -# - -# It was a mistake ever to have exported these symbols from libadm. -# They are now being redirected to libgen where they really belong, -# except for 'circf' and 'sed', which do not exist in libgen and -# are being retained as dummy variables in libadm. - -SUNW_0.7 { - global: - circf; - loc1 = DATA FILTER libgen.so.1 S0x4; - loc2 = DATA FILTER libgen.so.1 S0x4; - locs = DATA FILTER libgen.so.1 S0x4; - nbra = DATA FILTER libgen.so.1 S0x4; - sed; -}; - -SUNWprivate_1.1 { - global: - advance = FUNCTION FILTER libgen.so.1; - compile = FUNCTION FILTER libgen.so.1; - step = FUNCTION FILTER libgen.so.1; -}; diff --git a/usr/src/lib/libadm/sparc/mapfile-vers b/usr/src/lib/libadm/sparc/mapfile-vers deleted file mode 100644 index 8fce31fd06..0000000000 --- a/usr/src/lib/libadm/sparc/mapfile-vers +++ /dev/null @@ -1,60 +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 -# - -# It was a mistake ever to have exported these symbols from libadm. -# They are now being redirected to libgen where they really belong, -# except for 'circf' and 'sed', which do not exist in libgen and -# are being retained as dummy variables in libadm. - -SUNW_0.7 { - global: - circf; - loc1 = DATA FILTER libgen.so.1 S0x4; - loc2 = DATA FILTER libgen.so.1 S0x4; - locs = DATA FILTER libgen.so.1 S0x4; - nbra = DATA FILTER libgen.so.1 S0x4; - sed; -}; - -SUNWprivate_1.1 { - global: - advance = FUNCTION FILTER libgen.so.1; - compile = FUNCTION FILTER libgen.so.1; - step = FUNCTION FILTER libgen.so.1; -}; diff --git a/usr/src/lib/libadm/sparcv9/mapfile-vers b/usr/src/lib/libadm/sparcv9/mapfile-vers deleted file mode 100644 index c2659c4b9c..0000000000 --- a/usr/src/lib/libadm/sparcv9/mapfile-vers +++ /dev/null @@ -1,60 +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 -# - -# It was a mistake ever to have exported these symbols from libadm. -# They are now being redirected to libgen where they really belong, -# except for 'circf' and 'sed', which do not exist in libgen and -# are being retained as dummy variables in libadm. - -SUNW_0.7 { - global: - circf; - loc1 = DATA FILTER libgen.so.1 S0x8; - loc2 = DATA FILTER libgen.so.1 S0x8; - locs = DATA FILTER libgen.so.1 S0x8; - nbra = DATA FILTER libgen.so.1 S0x4; - sed; -}; - -SUNWprivate_1.1 { - global: - advance = FUNCTION FILTER libgen.so.1; - compile = FUNCTION FILTER libgen.so.1; - step = FUNCTION FILTER libgen.so.1; -}; |