diff options
author | Ali Bahrami <Ali.Bahrami@Oracle.COM> | 2010-06-24 18:16:42 -0600 |
---|---|---|
committer | Ali Bahrami <Ali.Bahrami@Oracle.COM> | 2010-06-24 18:16:42 -0600 |
commit | cd3e933325e68e23516a196a8fea7f49b1e497c3 (patch) | |
tree | b3d6fcc31c1e7dc60bd48d34239721e8a8b68cfe /usr/src/ucblib | |
parent | f6f041a26ccdc2172df744c7a891423cabe01265 (diff) | |
download | illumos-gate-cd3e933325e68e23516a196a8fea7f49b1e497c3.tar.gz |
6916796 OSnet mapfiles should use version 2 link-editor syntax
--HG--
rename : usr/src/cmd/sgs/libelf/common/mapfile-common => usr/src/cmd/sgs/libelf/common/mapfile-vers
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-bindings => usr/src/cmd/sgs/link_audit/common/mapfile-vers-bindings
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-perfcnt => usr/src/cmd/sgs/link_audit/common/mapfile-vers-perfcnt
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-symbindrep => usr/src/cmd/sgs/link_audit/common/mapfile-vers-symbindrep
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-truss => usr/src/cmd/sgs/link_audit/common/mapfile-vers-truss
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-who => usr/src/cmd/sgs/link_audit/common/mapfile-vers-who
rename : usr/src/common/mapfiles/i386/map.noexdata => usr/src/common/mapfiles/common/map.noexdata
rename : usr/src/lib/libaio/sparc/mapfile-vers => usr/src/lib/libaio/common/mapfile-vers
rename : usr/src/lib/libelfsign/common/mapfile.map => usr/src/lib/libelfsign/common/mapfile-vers
rename : usr/src/lib/libpthread/sparc/mapfile-vers => usr/src/lib/libpthread/common/mapfile-vers
rename : usr/src/lib/librt/amd64/mapfile-vers => usr/src/lib/librt/common/mapfile-vers
rename : usr/src/lib/libsys/sparc/mapfile-vers => usr/src/lib/libsys/common/mapfile-vers
rename : usr/src/lib/libthread/sparc/mapfile-vers => usr/src/lib/libthread/common/mapfile-vers
Diffstat (limited to 'usr/src/ucblib')
-rw-r--r-- | usr/src/ucblib/libcurses/mapfile-vers | 9 | ||||
-rw-r--r-- | usr/src/ucblib/libdbm/mapfile-vers | 9 | ||||
-rw-r--r-- | usr/src/ucblib/librpcsoc/mapfile-vers | 9 | ||||
-rw-r--r-- | usr/src/ucblib/libtermcap/mapfile-vers | 7 | ||||
-rw-r--r-- | usr/src/ucblib/libucb/Makefile.com | 5 | ||||
-rw-r--r-- | usr/src/ucblib/libucb/amd64/mapfile-vers | 110 | ||||
-rw-r--r-- | usr/src/ucblib/libucb/i386/mapfile-vers | 120 | ||||
-rw-r--r-- | usr/src/ucblib/libucb/port/mapfile-vers | 140 | ||||
-rw-r--r-- | usr/src/ucblib/libucb/sparc/mapfile-vers | 120 | ||||
-rw-r--r-- | usr/src/ucblib/libucb/sparcv9/mapfile-vers | 115 |
10 files changed, 156 insertions, 488 deletions
diff --git a/usr/src/ucblib/libcurses/mapfile-vers b/usr/src/ucblib/libcurses/mapfile-vers index 5313de16e9..a5a3d7fce6 100644 --- a/usr/src/ucblib/libcurses/mapfile-vers +++ b/usr/src/ucblib/libcurses/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.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNW_1.1 { global: AL; AL_PARM; @@ -185,7 +186,7 @@ SUNW_1.1 { XX; }; -SUNWprivate_1.1 { +SYMBOL_VERSION SUNWprivate_1.1 { global: _putchar; local: diff --git a/usr/src/ucblib/libdbm/mapfile-vers b/usr/src/ucblib/libdbm/mapfile-vers index 2eb0cd4957..91a6fa644b 100644 --- a/usr/src/ucblib/libdbm/mapfile-vers +++ b/usr/src/ucblib/libdbm/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.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNW_1.1 { global: bitno; blkno; @@ -57,7 +58,7 @@ SUNW_1.1 { store; }; -SUNWprivate_1.1 { +SYMBOL_VERSION SUNWprivate_1.1 { global: calchash; hashinc; diff --git a/usr/src/ucblib/librpcsoc/mapfile-vers b/usr/src/ucblib/librpcsoc/mapfile-vers index bd39496b10..acafab9f89 100644 --- a/usr/src/ucblib/librpcsoc/mapfile-vers +++ b/usr/src/ucblib/librpcsoc/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,12 +36,14 @@ # MAPFILE HEADER END # -SUNW_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNW_1.1 { global: SUNW_1.1; } SUNW_0.7; -SUNW_0.7 { +SYMBOL_VERSION SUNW_0.7 { global: clnttcp_create; clntudp_bufcreate; diff --git a/usr/src/ucblib/libtermcap/mapfile-vers b/usr/src/ucblib/libtermcap/mapfile-vers index b361685b7a..c977042dd3 100644 --- a/usr/src/ucblib/libtermcap/mapfile-vers +++ b/usr/src/ucblib/libtermcap/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.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNW_1.1 { global: BC; ospeed; diff --git a/usr/src/ucblib/libucb/Makefile.com b/usr/src/ucblib/libucb/Makefile.com index a2a2b5c2c9..b1a0dd1d60 100644 --- a/usr/src/ucblib/libucb/Makefile.com +++ b/usr/src/ucblib/libucb/Makefile.com @@ -19,8 +19,7 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. # LIBRARY= libucb.a @@ -79,7 +78,7 @@ include $(SRC)/lib/Makefile.lib ROOTLIBDIR= $(ROOT)/usr/ucblib ROOTLIBDIR64= $(ROOT)/usr/ucblib/$(MACH64) -MAPFILES = ../port/mapfile-vers mapfile-vers +MAPFILES = ../port/mapfile-vers SRCS= $(PORTGENOBJS:%.o=../port/gen/%.c) \ $(PORTSTDIOOBJS:%.o=../port/stdio/%.c) \ diff --git a/usr/src/ucblib/libucb/amd64/mapfile-vers b/usr/src/ucblib/libucb/amd64/mapfile-vers deleted file mode 100644 index 3233250391..0000000000 --- a/usr/src/ucblib/libucb/amd64/mapfile-vers +++ /dev/null @@ -1,110 +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 { - global: - SUNW_1.1; -} SUNW_0.7; - -SUNW_0.7 { - global: - alphasort; - bcmp; - bcopy; - bzero; - flock; - fopen; - fprintf; - freopen; - fstatfs; - ftime; - getdtablesize; - gethostid; - gethostname; - getpagesize; - getrusage = FUNCTION FILTER libc.so.1; - gettimeofday; - getwd; - index; - killpg; - mctl; - nice; - nlist; - printf; - psignal; - rand; - readdir; - reboot; - re_comp; - re_exec; - rindex; - scandir; - setbuffer; - sethostname; - setlinebuf; - setpgrp; - settimeofday; - sigblock; - siginterrupt; - signal; - sigpause; - sigsetmask; - sigstack; - sigvec; - sigvechandler; - sleep = FUNCTION FILTER libc.so.1; - sprintf; - srand; - statfs; - sys_siglist; - times; - ualarm = FUNCTION FILTER libc.so.1; - usignal; - usigpause; - usleep = FUNCTION FILTER libc.so.1; - vfprintf; - vprintf; - vsprintf; - wait3; - wait4; -}; - -SUNWprivate_1.1 { - global: -}; diff --git a/usr/src/ucblib/libucb/i386/mapfile-vers b/usr/src/ucblib/libucb/i386/mapfile-vers deleted file mode 100644 index bea578ac8b..0000000000 --- a/usr/src/ucblib/libucb/i386/mapfile-vers +++ /dev/null @@ -1,120 +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 { - global: - alphasort64; - fopen64; - freopen64; - readdir64; - scandir64; -} SUNW_0.7; - -SUNW_0.7 { - global: - alphasort; - bcmp; - bcopy; - bzero; - flock; - fopen; - fprintf; - freopen; - fstatfs; - ftime; - getdtablesize; - gethostid; - gethostname; - getpagesize; - getrusage = FUNCTION FILTER libc.so.1; - gettimeofday; - getwd; - index; - killpg; - longjmp = FUNCTION FILTER libc.so.1; - mctl; - nice; - nlist; - printf; - psignal; - rand; - readdir; - reboot; - re_comp; - re_exec; - rindex; - scandir; - setbuffer; - sethostname; - setjmp = FUNCTION FILTER libc.so.1; - setlinebuf; - setpgrp; - settimeofday; - sigblock; - siginterrupt; - signal; - sigpause; - sigsetmask; - sigstack; - sigvec; - sigvechandler; - sleep = FUNCTION FILTER libc.so.1; - sprintf; - srand; - statfs; - sys_siglist; - times; - ualarm = FUNCTION FILTER libc.so.1; - usignal; - usigpause; - usleep = FUNCTION FILTER libc.so.1; - vfprintf; - vprintf; - vsprintf; - wait3; - wait4; -}; - -SUNWprivate_1.1 { - global: - _longjmp = FUNCTION FILTER libc.so.1; - _setjmp = FUNCTION FILTER libc.so.1; - _syscall = FUNCTION FILTER libc.so.1; - _times = FUNCTION FILTER libc.so.1; -}; diff --git a/usr/src/ucblib/libucb/port/mapfile-vers b/usr/src/ucblib/libucb/port/mapfile-vers index ca9c676016..09dd708502 100644 --- a/usr/src/ucblib/libucb/port/mapfile-vers +++ b/usr/src/ucblib/libucb/port/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.3 { +$mapfile_version 2 + +SYMBOL_VERSION SUNW_1.3 { global: _siguhandler; } SUNW_1.2; @@ -46,12 +47,119 @@ SUNW_1.3 { # no SUNW_1.2 symbols, but the version is now kept as a placeholder. # Don't add any symbols to this version. -SUNW_1.2 { +SYMBOL_VERSION SUNW_1.2 { global: SUNW_1.2; } SUNW_1.1; -SUNWprivate_1.1 { +# SUNW_1.1 inherits SUNW_0.7 on all platforms, encapsulating the same +# set of symbols. However, the assignment of symbol to version varies +# between platforms: +# amd64: SUNW_1.1 is empty, and SUNW_0.7 contains everything. +# i386, sparc: SUNW_1.1 contains 5 largefile API routines, and everything +# else in in SUNW_0.7. +# sparcv9: Everything is in SUNW_1.1, and SUNW_0.7 is empty + +SYMBOL_VERSION SUNW_1.1 { + global: +$if _ELF32 # largefile APIs + alphasort64; + fopen64; + freopen64; + readdir64; + scandir64; +$endif +$if _x86 && _ELF64 + SUNW_1.1; +$endif +$if !(_sparc && _ELF64) +} SUNW_0.7; + +SYMBOL_VERSION SUNW_0.7 { +$endif + global: + alphasort; + bcmp; + bcopy; + bzero; + flock; + fopen; + fprintf; + freopen; + fstatfs; + ftime; + getdtablesize; + gethostid; + gethostname; + getpagesize; + getrusage { TYPE = FUNCTION; FILTER = libc.so.1 }; + gettimeofday; + getwd; + index; + killpg; + mctl; + nice; + nlist; + printf; + psignal; + rand; + readdir; + reboot; + re_comp; + re_exec; + rindex; + scandir; + setbuffer; + sethostname; + setlinebuf; + setpgrp; + settimeofday; + sigblock; + siginterrupt; + signal; + sigpause; + sigsetmask; + sigstack; + sigvec; + sigvechandler; + sleep { TYPE = FUNCTION; FILTER = libc.so.1 }; + sprintf; + srand; + statfs; + sys_siglist; + times; + ualarm { TYPE = FUNCTION; FILTER = libc.so.1 }; + usignal; + usigpause; + usleep { TYPE = FUNCTION; FILTER = libc.so.1 }; + vfprintf; + vprintf; + vsprintf; + wait3; + wait4; + + # The longjmp/setjmp story is complex: + # - On sparc, they are supplied by the library + # - On 32-bit x86, they are filters on libc + # - On amd64, they are not present in this library +$if _sparc + longjmp; + setjmp; +$elif _x86 && _ELF32 + longjmp { TYPE = FUNCTION; FILTER = libc.so.1 }; + setjmp { TYPE = FUNCTION; FILTER = libc.so.1 }; +$endif + +$if _sparc && _ELF64 +} SUNW_0.7; + +SYMBOL_VERSION SUNW_0.7 { + global: + SUNW_0.7; +$endif +}; + +SYMBOL_VERSION SUNWprivate_1.1 { global: _doprnt; _getarg; @@ -67,6 +175,28 @@ SUNWprivate_1.1 { ucbsigpause; ucbsigsetmask; ucbsigvec; + + + # Handle per-platform variations +$if _sparc + _longjmp; + _setjmp; + __sigcleanup; +$if _ELF32 + syscall { TYPE = FUNCTION; FILTER = libc.so.1 }; +$endif +$endif + +$if _x86 && _ELF32 + _longjmp { TYPE = FUNCTION; FILTER = libc.so.1 }; + _setjmp { TYPE = FUNCTION; FILTER = libc.so.1 }; + _syscall { TYPE = FUNCTION; FILTER = libc.so.1 }; + _times { TYPE = FUNCTION; FILTER = libc.so.1 }; +$endif + + local: *; }; + + diff --git a/usr/src/ucblib/libucb/sparc/mapfile-vers b/usr/src/ucblib/libucb/sparc/mapfile-vers deleted file mode 100644 index 186ebe9134..0000000000 --- a/usr/src/ucblib/libucb/sparc/mapfile-vers +++ /dev/null @@ -1,120 +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 { - global: - alphasort64; - fopen64; - freopen64; - readdir64; - scandir64; -} SUNW_0.7; - -SUNW_0.7 { - global: - alphasort; - bcmp; - bcopy; - bzero; - flock; - fopen; - fprintf; - freopen; - fstatfs; - ftime; - getdtablesize; - gethostid; - gethostname; - getpagesize; - getrusage = FUNCTION FILTER libc.so.1; - gettimeofday; - getwd; - index; - killpg; - longjmp; - mctl; - nice; - nlist; - printf; - psignal; - rand; - readdir; - reboot; - re_comp; - re_exec; - rindex; - scandir; - setbuffer; - sethostname; - setjmp; - setlinebuf; - setpgrp; - settimeofday; - sigblock; - siginterrupt; - signal; - sigpause; - sigsetmask; - sigstack; - sigvec; - sigvechandler; - sleep = FUNCTION FILTER libc.so.1; - sprintf; - srand; - statfs; - sys_siglist; - times; - ualarm = FUNCTION FILTER libc.so.1; - usignal; - usigpause; - usleep = FUNCTION FILTER libc.so.1; - vfprintf; - vprintf; - vsprintf; - wait3; - wait4; -}; - -SUNWprivate_1.1 { - global: - _longjmp; - _setjmp; - __sigcleanup; - syscall = FUNCTION FILTER libc.so.1; -}; diff --git a/usr/src/ucblib/libucb/sparcv9/mapfile-vers b/usr/src/ucblib/libucb/sparcv9/mapfile-vers deleted file mode 100644 index 90b9a5791d..0000000000 --- a/usr/src/ucblib/libucb/sparcv9/mapfile-vers +++ /dev/null @@ -1,115 +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 { - global: - alphasort; - bcmp; - bcopy; - bzero; - flock; - fopen; - fprintf; - freopen; - fstatfs; - ftime; - getdtablesize; - gethostid; - gethostname; - getpagesize; - getrusage = FUNCTION FILTER libc.so.1; - gettimeofday; - getwd; - index; - killpg; - longjmp; - mctl; - nice; - nlist; - printf; - psignal; - rand; - readdir; - reboot; - re_comp; - re_exec; - rindex; - scandir; - setbuffer; - sethostname; - setjmp; - setlinebuf; - setpgrp; - settimeofday; - sigblock; - siginterrupt; - signal; - sigpause; - sigsetmask; - sigstack; - sigvec; - sigvechandler; - sleep = FUNCTION FILTER libc.so.1; - sprintf; - srand; - statfs; - sys_siglist; - times; - ualarm = FUNCTION FILTER libc.so.1; - usignal; - usigpause; - usleep = FUNCTION FILTER libc.so.1; - vfprintf; - vprintf; - vsprintf; - wait3; - wait4; -} SUNW_0.7; - -SUNW_0.7 { - global: - SUNW_0.7; -}; - -SUNWprivate_1.1 { - global: - _longjmp; - _setjmp; - __sigcleanup; -}; |