diff options
Diffstat (limited to 'usr/src/cmd/sgs')
76 files changed, 598 insertions, 1762 deletions
diff --git a/usr/src/cmd/sgs/elfedit/common/mapfile-vers b/usr/src/cmd/sgs/elfedit/common/mapfile-vers index f5f6c52c96..86949d1cb7 100644 --- a/usr/src/cmd/sgs/elfedit/common/mapfile-vers +++ b/usr/src/cmd/sgs/elfedit/common/mapfile-vers @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -38,14 +37,16 @@ # MAPFILE HEADER END # -{ +$mapfile_version 2 + +SYMBOL_SCOPE { global: main; # debuggers seem to like this. # liblddbg dbg_print() function - dbg_print = NODIRECT; + dbg_print { FLAGS = NODIRECT }; diff --git a/usr/src/cmd/sgs/elfedit/modules/common/mapfile-vers b/usr/src/cmd/sgs/elfedit/modules/common/mapfile-vers index 23fbf0fb37..0e4b73abe7 100644 --- a/usr/src/cmd/sgs/elfedit/modules/common/mapfile-vers +++ b/usr/src/cmd/sgs/elfedit/modules/common/mapfile-vers @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -46,7 +45,9 @@ # The routines exported by elfedit for use by the modules # are also defined here, using the PARENT mapfile keyword. -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: # Standard init routines exported by every module elfedit32_init; @@ -54,158 +55,158 @@ SUNWprivate_1.1 { # liblddbg dbg_print() function - dbg_print = PARENT NODIRECT; + dbg_print { FLAGS = PARENT NODIRECT }; # Core API - elfedit_command_usage = PARENT; - elfedit_cpl_match = PARENT; - elfedit_cpl_ndx = PARENT; - elfedit_elferr = PARENT; - elfedit_flags = PARENT; - elfedit_malloc = PARENT; - elfedit_msg = PARENT; - elfedit_outstyle = PARENT; - elfedit_pager_init = PARENT; - elfedit_printf = PARENT; - elfedit_realloc = PARENT; - elfedit_str_to_c_literal = PARENT; - elfedit_write = PARENT; + elfedit_command_usage { FLAGS = PARENT }; + elfedit_cpl_match { FLAGS = PARENT }; + elfedit_cpl_ndx { FLAGS = PARENT }; + elfedit_elferr { FLAGS = PARENT }; + elfedit_flags { FLAGS = PARENT }; + elfedit_malloc { FLAGS = PARENT }; + elfedit_msg { FLAGS = PARENT }; + elfedit_outstyle { FLAGS = PARENT }; + elfedit_pager_init { FLAGS = PARENT }; + elfedit_printf { FLAGS = PARENT }; + elfedit_realloc { FLAGS = PARENT }; + elfedit_str_to_c_literal { FLAGS = PARENT }; + elfedit_write { FLAGS = PARENT }; # ato[u]i routines - elfedit_const_to_atoui = PARENT; + elfedit_const_to_atoui { FLAGS = PARENT }; - elfedit_atoi = PARENT; - elfedit_atoui = PARENT; - elfedit_atoconst = PARENT; + elfedit_atoi { FLAGS = PARENT }; + elfedit_atoui { FLAGS = PARENT }; + elfedit_atoconst { FLAGS = PARENT }; - elfedit_atoi2 = PARENT; - elfedit_atoui2 = PARENT; - elfedit_atoconst2 = PARENT; + elfedit_atoi2 { FLAGS = PARENT }; + elfedit_atoui2 { FLAGS = PARENT }; + elfedit_atoconst2 { FLAGS = PARENT }; - elfedit_atoi_range = PARENT; - elfedit_atoui_range = PARENT; - elfedit_atoconst_range = PARENT; + elfedit_atoi_range { FLAGS = PARENT }; + elfedit_atoui_range { FLAGS = PARENT }; + elfedit_atoconst_range { FLAGS = PARENT }; - elfedit_atoi_range2 = PARENT; - elfedit_atoui_range2 = PARENT; - elfedit_atoconst_range2 = PARENT; + elfedit_atoi_range2 { FLAGS = PARENT }; + elfedit_atoui_range2 { FLAGS = PARENT }; + elfedit_atoconst_range2 { FLAGS = PARENT }; - elfedit_atoi_value_to_str = PARENT; - elfedit_atoui_value_to_str = PARENT; - elfedit_atoconst_value_to_str = PARENT; + elfedit_atoi_value_to_str { FLAGS = PARENT }; + elfedit_atoui_value_to_str { FLAGS = PARENT }; + elfedit_atoconst_value_to_str { FLAGS = PARENT }; - elfedit_cpl_atoi = PARENT; - elfedit_cpl_atoui = PARENT; - elfedit_cpl_atoconst = PARENT; + elfedit_cpl_atoi { FLAGS = PARENT }; + elfedit_cpl_atoui { FLAGS = PARENT }; + elfedit_cpl_atoconst { FLAGS = PARENT }; # Convenience functions built on top of the ato[u]i routines - elfedit_atobool = PARENT; - elfedit_atoshndx = PARENT; + elfedit_atobool { FLAGS = PARENT }; + elfedit_atoshndx { FLAGS = PARENT }; # Getopt - elfedit_getopt_init = PARENT; - elfedit_getopt = PARENT; + elfedit_getopt_init { FLAGS = PARENT }; + elfedit_getopt { FLAGS = PARENT }; # Utilities - elfedit_array_elts_delete = PARENT; + elfedit_array_elts_delete { FLAGS = PARENT }; - elfedit_array_elts_move = PARENT; + elfedit_array_elts_move { FLAGS = PARENT }; - elfedit_bits_set = PARENT; + elfedit_bits_set { FLAGS = PARENT }; - elfedit32_dyn_elt_init = PARENT; - elfedit64_dyn_elt_init = PARENT; + elfedit32_dyn_elt_init { FLAGS = PARENT }; + elfedit64_dyn_elt_init { FLAGS = PARENT }; - elfedit32_dyn_elt_save = PARENT; - elfedit64_dyn_elt_save = PARENT; + elfedit32_dyn_elt_save { FLAGS = PARENT }; + elfedit64_dyn_elt_save { FLAGS = PARENT }; - elfedit32_dyn_offset_to_str = PARENT; - elfedit64_dyn_offset_to_str = PARENT; + elfedit32_dyn_offset_to_str { FLAGS = PARENT }; + elfedit64_dyn_offset_to_str { FLAGS = PARENT }; - elfedit32_dynstr_getpad = PARENT; - elfedit64_dynstr_getpad = PARENT; + elfedit32_dynstr_getpad { FLAGS = PARENT }; + elfedit64_dynstr_getpad { FLAGS = PARENT }; - elfedit32_dynstr_insert = PARENT; - elfedit64_dynstr_insert = PARENT; + elfedit32_dynstr_insert { FLAGS = PARENT }; + elfedit64_dynstr_insert { FLAGS = PARENT }; - elfedit32_modified_data = PARENT; - elfedit64_modified_data = PARENT; + elfedit32_modified_data { FLAGS = PARENT }; + elfedit64_modified_data { FLAGS = PARENT }; - elfedit32_modified_ehdr = PARENT; - elfedit64_modified_ehdr = PARENT; + elfedit32_modified_ehdr { FLAGS = PARENT }; + elfedit64_modified_ehdr { FLAGS = PARENT }; - elfedit32_modified_phdr = PARENT; - elfedit64_modified_phdr = PARENT; + elfedit32_modified_phdr { FLAGS = PARENT }; + elfedit64_modified_phdr { FLAGS = PARENT }; - elfedit32_modified_shdr = PARENT; - elfedit64_modified_shdr = PARENT; + elfedit32_modified_shdr { FLAGS = PARENT }; + elfedit64_modified_shdr { FLAGS = PARENT }; - elfedit32_name_to_shndx = PARENT; - elfedit64_name_to_shndx = PARENT; + elfedit32_name_to_shndx { FLAGS = PARENT }; + elfedit64_name_to_shndx { FLAGS = PARENT }; - elfedit32_name_to_symndx = PARENT; - elfedit64_name_to_symndx = PARENT; + elfedit32_name_to_symndx { FLAGS = PARENT }; + elfedit64_name_to_symndx { FLAGS = PARENT }; - elfedit32_offset_to_str = PARENT; - elfedit64_offset_to_str = PARENT; + elfedit32_offset_to_str { FLAGS = PARENT }; + elfedit64_offset_to_str { FLAGS = PARENT }; - elfedit32_sec_findstr = PARENT; - elfedit64_sec_findstr = PARENT; + elfedit32_sec_findstr { FLAGS = PARENT }; + elfedit64_sec_findstr { FLAGS = PARENT }; - elfedit32_sec_get = PARENT; - elfedit64_sec_get = PARENT; + elfedit32_sec_get { FLAGS = PARENT }; + elfedit64_sec_get { FLAGS = PARENT }; - elfedit32_sec_getcap = PARENT; - elfedit64_sec_getcap = PARENT; + elfedit32_sec_getcap { FLAGS = PARENT }; + elfedit64_sec_getcap { FLAGS = PARENT }; - elfedit32_sec_getdyn = PARENT; - elfedit64_sec_getdyn = PARENT; + elfedit32_sec_getdyn { FLAGS = PARENT }; + elfedit64_sec_getdyn { FLAGS = PARENT }; - elfedit32_sec_getstr = PARENT; - elfedit64_sec_getstr = PARENT; + elfedit32_sec_getstr { FLAGS = PARENT }; + elfedit64_sec_getstr { FLAGS = PARENT }; - elfedit32_sec_getsyminfo = PARENT; - elfedit64_sec_getsyminfo = PARENT; + elfedit32_sec_getsyminfo { FLAGS = PARENT }; + elfedit64_sec_getsyminfo { FLAGS = PARENT }; - elfedit32_sec_getsymtab = PARENT; - elfedit64_sec_getsymtab = PARENT; + elfedit32_sec_getsymtab { FLAGS = PARENT }; + elfedit64_sec_getsymtab { FLAGS = PARENT }; - elfedit32_sec_getversym = PARENT; - elfedit64_sec_getversym = PARENT; + elfedit32_sec_getversym { FLAGS = PARENT }; + elfedit64_sec_getversym { FLAGS = PARENT }; - elfedit32_sec_getxshndx = PARENT; - elfedit64_sec_getxshndx = PARENT; + elfedit32_sec_getxshndx { FLAGS = PARENT }; + elfedit64_sec_getxshndx { FLAGS = PARENT }; - elfedit32_sec_issymtab = PARENT; - elfedit64_sec_issymtab = PARENT; + elfedit32_sec_issymtab { FLAGS = PARENT }; + elfedit64_sec_issymtab { FLAGS = PARENT }; - elfedit32_shndx_to_name = PARENT; - elfedit64_shndx_to_name = PARENT; + elfedit32_shndx_to_name { FLAGS = PARENT }; + elfedit64_shndx_to_name { FLAGS = PARENT }; - elfedit32_sec_msgprefix = PARENT; - elfedit64_sec_msgprefix = PARENT; + elfedit32_sec_msgprefix { FLAGS = PARENT }; + elfedit64_sec_msgprefix { FLAGS = PARENT }; - elfedit32_strtab_insert = PARENT; - elfedit64_strtab_insert = PARENT; + elfedit32_strtab_insert { FLAGS = PARENT }; + elfedit64_strtab_insert { FLAGS = PARENT }; - elfedit32_strtab_insert_test = PARENT; - elfedit64_strtab_insert_test = PARENT; + elfedit32_strtab_insert_test { FLAGS = PARENT }; + elfedit64_strtab_insert_test { FLAGS = PARENT }; - elfedit32_test_osabi = PARENT; - elfedit64_test_osabi = PARENT; + elfedit32_test_osabi { FLAGS = PARENT }; + elfedit64_test_osabi { FLAGS = PARENT }; - elfedit32_type_to_shndx = PARENT; - elfedit64_type_to_shndx = PARENT; + elfedit32_type_to_shndx { FLAGS = PARENT }; + elfedit64_type_to_shndx { FLAGS = PARENT }; -local: + local: *; }; diff --git a/usr/src/cmd/sgs/ld/common/mapfile-intf b/usr/src/cmd/sgs/ld/common/mapfile-intf index c144b7aa83..5f904c32cc 100644 --- a/usr/src/cmd/sgs/ld/common/mapfile-intf +++ b/usr/src/cmd/sgs/ld/common/mapfile-intf @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved. # # Export eprintf for dependencies. @@ -38,7 +37,10 @@ # # MAPFILE HEADER END # -{ + +$mapfile_version 2 + +SYMBOL_SCOPE { global: eprintf; }; diff --git a/usr/src/cmd/sgs/ldprof/Makefile.com b/usr/src/cmd/sgs/ldprof/Makefile.com index dfad2b5c5e..f9406e08fc 100644 --- a/usr/src/cmd/sgs/ldprof/Makefile.com +++ b/usr/src/cmd/sgs/ldprof/Makefile.com @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. # LIBRARY= ldprof.a @@ -37,7 +36,7 @@ ROOTLIBDIR= $(ROOT)/usr/lib/link_audit SGSPROTO= ../../proto/$(MACH) -MAPFILES = mapfile-vers +MAPFILES = ../common/mapfile-vers DYNFLAGS += $(CC_USE_PROTO) CPPFLAGS= -I. -I../common -I../../include \ diff --git a/usr/src/cmd/sgs/ldprof/amd64/mapfile-vers b/usr/src/cmd/sgs/ldprof/amd64/mapfile-vers deleted file mode 100644 index dce5c3b389..0000000000 --- a/usr/src/cmd/sgs/ldprof/amd64/mapfile-vers +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objclose; - la_objopen; - la_amd64_pltenter; - local: - *; -}; diff --git a/usr/src/cmd/sgs/ldprof/sparc/mapfile-vers b/usr/src/cmd/sgs/ldprof/common/mapfile-vers index 1d0f6863eb..4df6afbfee 100644 --- a/usr/src/cmd/sgs/ldprof/sparc/mapfile-vers +++ b/usr/src/cmd/sgs/ldprof/common/mapfile-vers @@ -1,6 +1,5 @@ # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # # CDDL HEADER START # @@ -36,12 +35,39 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: la_version; # Audit interfaces la_objclose; la_objopen; + + # There is a different pltenter function for every platform +$if _sparc + +$if _ELF32 la_sparcv8_pltenter; +$elif _ELF64 + la_sparcv9_pltenter; +$else +$error unknown sparc ELFCLASS +$endif + +$elif _x86 + +$if _ELF32 + la_i86_pltenter; +$elif _ELF64 + la_amd64_pltenter; +$else +$error unknown x86 ELFCLASS +$endif + +$else +$error unknown platform +$endif + local: *; }; diff --git a/usr/src/cmd/sgs/ldprof/i386/mapfile-vers b/usr/src/cmd/sgs/ldprof/i386/mapfile-vers deleted file mode 100644 index 587526bfb8..0000000000 --- a/usr/src/cmd/sgs/ldprof/i386/mapfile-vers +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objclose; - la_objopen; - la_i86_pltenter; - local: - *; -}; diff --git a/usr/src/cmd/sgs/ldprof/sparcv9/mapfile-vers b/usr/src/cmd/sgs/ldprof/sparcv9/mapfile-vers deleted file mode 100644 index 39062f9d36..0000000000 --- a/usr/src/cmd/sgs/ldprof/sparcv9/mapfile-vers +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objclose; - la_objopen; - la_sparcv9_pltenter; - local: - *; -}; diff --git a/usr/src/cmd/sgs/lex/common/mapfile-vers b/usr/src/cmd/sgs/lex/common/mapfile-vers index 7e94c71289..1e59867fcb 100644 --- a/usr/src/cmd/sgs/lex/common/mapfile-vers +++ b/usr/src/cmd/sgs/lex/common/mapfile-vers @@ -1,6 +1,5 @@ # -# 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. # # CDDL HEADER START # @@ -38,7 +37,9 @@ # MAPFILE HEADER END # -SUNW_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNW_1.1 { global: allprint; allprint_w; diff --git a/usr/src/cmd/sgs/libcrle/common/mapfile-vers b/usr/src/cmd/sgs/libcrle/common/mapfile-vers index 83d2e0210e..672a80f5da 100644 --- a/usr/src/cmd/sgs/libcrle/common/mapfile-vers +++ b/usr/src/cmd/sgs/libcrle/common/mapfile-vers @@ -1,6 +1,5 @@ # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # # CDDL HEADER START # @@ -36,7 +35,9 @@ # MAPFILE HEADER END # -SUNWprivate_1.3 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.3 { global: la_version; # Audit interfaces la_objopen; diff --git a/usr/src/cmd/sgs/libdl/Makefile.com b/usr/src/cmd/sgs/libdl/Makefile.com index 90fe1ceb0e..eac0600bee 100644 --- a/usr/src/cmd/sgs/libdl/Makefile.com +++ b/usr/src/cmd/sgs/libdl/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) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # LIBRARY = libdl.a @@ -29,4 +28,3 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs LIBS += $(LINTLIB) -MAPFILES += mapfile-vers diff --git a/usr/src/cmd/sgs/libdl/amd64/mapfile-vers b/usr/src/cmd/sgs/libdl/amd64/mapfile-vers deleted file mode 100644 index 9745625909..0000000000 --- a/usr/src/cmd/sgs/libdl/amd64/mapfile-vers +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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.6 { - global: - dl_iterate_phdr = FUNCTION; -} SUNW_1.5; - -SUNW_1.5 { - global: - dlamd64getunwind = FUNCTION; -} SUNW_1.4; - -SUNWprivate_1.1 { - global: - _dlamd64getunwind = FUNCTION; -}; - -SUNW_0.8 { - global: - dladdr = FUNCTION; -} SUNW_0.7; - -SUNW_0.7 { - global: - dlclose = FUNCTION; - dlerror = FUNCTION; - dlopen = FUNCTION; - dlsym = FUNCTION; -}; diff --git a/usr/src/cmd/sgs/libdl/common/mapfile-vers b/usr/src/cmd/sgs/libdl/common/mapfile-vers index 6dfa35cbc0..9251d2ab0b 100644 --- a/usr/src/cmd/sgs/libdl/common/mapfile-vers +++ b/usr/src/cmd/sgs/libdl/common/mapfile-vers @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -38,40 +37,96 @@ # MAPFILE HEADER END # -SUNW_1.4 { - global: - dladdr1 = FUNCTION; - local: - *; +$mapfile_version 2 + +$if _x86 && _ELF64 +$add amd64 +$endif + +# Starting with SUNW_1.5 and dlamd64getunwind(), the amd64 +# platform is one version ahead of the other platforms. +$if amd64 +SYMBOL_VERSION SUNW_1.6 { +$else +SYMBOL_VERSION SUNW_1.5 { +$endif + global: + dl_iterate_phdr { TYPE = FUNCTION }; +$if amd64 +} SUNW_1.5; + +SYMBOL_VERSION SUNW_1.5 { + global: + dlamd64getunwind { TYPE = FUNCTION }; +$endif +} SUNW_1.4; + +SYMBOL_VERSION SUNW_1.4 { + global: + dladdr1 { TYPE = FUNCTION }; } SUNW_1.3; -SUNW_1.3 { - global: - SUNW_1.3; +SYMBOL_VERSION SUNW_1.3 { + global: + SUNW_1.3; } SUNW_1.2; -SUNW_1.2 { - global: - SUNW_1.2; +SYMBOL_VERSION SUNW_1.2 { + global: + SUNW_1.2; } SUNW_1.1; -SUNW_1.1 { - global: - dldump = FUNCTION; - dlinfo = FUNCTION; - dlmopen = FUNCTION; +SYMBOL_VERSION SUNW_1.1 { + global: + dldump { TYPE = FUNCTION }; + dlinfo { TYPE = FUNCTION }; + dlmopen { TYPE = FUNCTION }; } SUNW_0.8; -SUNWprivate_1.1 { - global: - _ld_libc = FUNCTION; - _dlinfo = FUNCTION; - _dldump = FUNCTION; - _dlmopen = FUNCTION; - _dlopen = FUNCTION; - _dlerror = FUNCTION; - _dlsym = FUNCTION; - _dlclose = FUNCTION; - _dladdr = FUNCTION; - _dladdr1 = FUNCTION; +SYMBOL_VERSION SUNW_0.8 { + global: + dladdr { TYPE = FUNCTION }; +} SUNW_0.7; + + +# +# For most platforms, SUNW_0.7 contains dlclose, dlerror, dlopen, and dlsym. +# For ABI reasons, 32-bit sparc puts them in SISCD_2.3 instead, and SUNW_0.7 +# exists solely so that SUNW_0.8 can inherit from it on all platforms. +# +SYMBOL_VERSION SUNW_0.7 { + global: +$if _sparc && _ELF32 + SUNW_0.7; +} SISCD_2.3; + +SYMBOL_VERSION SISCD_2.3 { + global: +$endif + dlclose { TYPE = FUNCTION }; + dlerror { TYPE = FUNCTION }; + dlopen { TYPE = FUNCTION }; + dlsym { TYPE = FUNCTION }; +}; + + +SYMBOL_VERSION SUNWprivate_1.1 { + global: + _ld_libc { TYPE = FUNCTION }; + _dlinfo { TYPE = FUNCTION }; + _dldump { TYPE = FUNCTION }; + _dlmopen { TYPE = FUNCTION }; + _dlopen { TYPE = FUNCTION }; + _dlerror { TYPE = FUNCTION }; + _dlsym { TYPE = FUNCTION }; + _dlclose { TYPE = FUNCTION }; + _dladdr { TYPE = FUNCTION }; + _dladdr1 { TYPE = FUNCTION }; + +$if amd64 + _dlamd64getunwind { TYPE = FUNCTION }; +$endif + + local: + *; }; diff --git a/usr/src/cmd/sgs/libdl/i386/mapfile-vers b/usr/src/cmd/sgs/libdl/i386/mapfile-vers deleted file mode 100644 index 35a900b937..0000000000 --- a/usr/src/cmd/sgs/libdl/i386/mapfile-vers +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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.5 { - global: - dl_iterate_phdr = FUNCTION; -} SUNW_1.4; - -SUNW_0.8 { - global: - dladdr = FUNCTION; -} SUNW_0.7; - -SUNW_0.7 { - global: - dlclose = FUNCTION; - dlerror = FUNCTION; - dlopen = FUNCTION; - dlsym = FUNCTION; -}; diff --git a/usr/src/cmd/sgs/libdl/sparc/mapfile-vers b/usr/src/cmd/sgs/libdl/sparc/mapfile-vers deleted file mode 100644 index 7d87ae38ad..0000000000 --- a/usr/src/cmd/sgs/libdl/sparc/mapfile-vers +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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.5 { - global: - dl_iterate_phdr = FUNCTION; -} SUNW_1.4; - -SUNW_0.8 { - global: - dladdr = FUNCTION; -} SUNW_0.7; - -SUNW_0.7 { - global: - SUNW_0.7; -} SISCD_2.3; - -SISCD_2.3 { - global: - dlclose = FUNCTION; - dlerror = FUNCTION; - dlopen = FUNCTION; - dlsym = FUNCTION; -}; diff --git a/usr/src/cmd/sgs/libdl/sparcv9/mapfile-vers b/usr/src/cmd/sgs/libdl/sparcv9/mapfile-vers deleted file mode 100644 index dba7513b42..0000000000 --- a/usr/src/cmd/sgs/libdl/sparcv9/mapfile-vers +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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.5 { - global: - dl_iterate_phdr = FUNCTION; -} SUNW_1.4; - -SUNW_0.8 { - global: - dladdr = FUNCTION ; -} SUNW_0.7; - -SUNW_0.7 { - global: - dlclose = FUNCTION ; - dlerror = FUNCTION ; - dlopen = FUNCTION ; - dlsym = FUNCTION ; -}; diff --git a/usr/src/cmd/sgs/libelf/Makefile.com b/usr/src/cmd/sgs/libelf/Makefile.com index 087daaa7c0..0742e07592 100644 --- a/usr/src/cmd/sgs/libelf/Makefile.com +++ b/usr/src/cmd/sgs/libelf/Makefile.com @@ -19,8 +19,7 @@ # CDDL HEADER END # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. # LIBRARY= libelf.a @@ -61,7 +60,7 @@ include $(SRC)/cmd/sgs/Makefile.com WARLOCKFILES= $(OBJECTS:%.o=wlocks/%.ll) -MAPFILES = ../common/mapfile-common +MAPFILES = ../common/mapfile-vers CLOBBERFILES += diff --git a/usr/src/cmd/sgs/libelf/common/mapfile-32 b/usr/src/cmd/sgs/libelf/common/mapfile-32 deleted file mode 100644 index 04689f6d1c..0000000000 --- a/usr/src/cmd/sgs/libelf/common/mapfile-32 +++ /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 -# - -SUNWprivate_1.1 { - global: - elf_demangle; -}; diff --git a/usr/src/cmd/sgs/libelf/common/mapfile-common b/usr/src/cmd/sgs/libelf/common/mapfile-vers index 3ab6404aa2..6c46234e31 100644 --- a/usr/src/cmd/sgs/libelf/common/mapfile-common +++ b/usr/src/cmd/sgs/libelf/common/mapfile-vers @@ -36,25 +36,27 @@ # MAPFILE HEADER END # -SUNW_1.7 { +$mapfile_version 2 + +SYMBOL_VERSION SUNW_1.7 { global: elf_getphdrnum; elf_getshdrnum; elf_getshdrstrndx; } SUNW_1.6; -SUNW_1.6 { +SYMBOL_VERSION SUNW_1.6 { global: elf_getphnum; } SUNW_1.5; -SUNW_1.5 { +SYMBOL_VERSION SUNW_1.5 { global: gelf_getcap; gelf_update_cap; } SUNW_1.4; -SUNW_1.4 { +SYMBOL_VERSION SUNW_1.4 { global: elf_getshnum; elf_getshstrndx; @@ -62,14 +64,14 @@ SUNW_1.4 { gelf_update_symshndx; } SUNW_1.3; -SUNW_1.3 { +SYMBOL_VERSION SUNW_1.3 { global: elf32_checksum; elf64_checksum; gelf_checksum; } SUNW_1.2; -SUNW_1.2 { +SYMBOL_VERSION SUNW_1.2 { global: elf64_fsize; elf64_getehdr; @@ -105,12 +107,12 @@ SUNW_1.2 { gelf_update_rel; } SUNW_1.1; -SUNW_1.1 { +SYMBOL_VERSION SUNW_1.1 { global: SUNW_1.1; } SUNW_0.7; -SUNW_0.7 { +SYMBOL_VERSION SUNW_0.7 { global: elf_begin; elf_end; @@ -157,7 +159,7 @@ SUNW_0.7 { *; }; -SUNWprivate_1.1 { +SYMBOL_VERSION SUNWprivate_1.1 { global: _elf_execfill; _elf_getarhdrbase; @@ -167,4 +169,8 @@ SUNWprivate_1.1 { _elf_sys_encoding; _elf_swap_wrimage; _gelf_getdyndtflags_1; + +$if _ELF32 + elf_demangle; +$endif }; diff --git a/usr/src/cmd/sgs/libelf/i386/Makefile b/usr/src/cmd/sgs/libelf/i386/Makefile index c68f2cfae5..be3bf8ab80 100644 --- a/usr/src/cmd/sgs/libelf/i386/Makefile +++ b/usr/src/cmd/sgs/libelf/i386/Makefile @@ -20,15 +20,11 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -MAPFILES += ../common/mapfile-32 - SGSMSGTARG += $(SGSMSG32) .KEEP_STATE: diff --git a/usr/src/cmd/sgs/libelf/sparc/Makefile b/usr/src/cmd/sgs/libelf/sparc/Makefile index c68f2cfae5..0cdef9272f 100644 --- a/usr/src/cmd/sgs/libelf/sparc/Makefile +++ b/usr/src/cmd/sgs/libelf/sparc/Makefile @@ -20,15 +20,11 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # -# ident "%Z%%M% %I% %E% SMI" include ../Makefile.com -MAPFILES += ../common/mapfile-32 - SGSMSGTARG += $(SGSMSG32) .KEEP_STATE: diff --git a/usr/src/cmd/sgs/libld/common/mapfile-vers b/usr/src/cmd/sgs/libld/common/mapfile-vers index 06d08ce207..8b16b20249 100644 --- a/usr/src/cmd/sgs/libld/common/mapfile-vers +++ b/usr/src/cmd/sgs/libld/common/mapfile-vers @@ -39,9 +39,13 @@ # MAPFILE HEADER END # -SUNWprivate_4.6 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_4.6 { global: - dbg_print = NODIRECT; # interposed - ld(1) and ld.so.1(1) + dbg_print { # interposed - ld(1) and ld.so.1(1) + FLAGS = NODIRECT; + }; ld_getopt; @@ -77,7 +81,10 @@ SUNWprivate_4.6 { # The following functions must be provided by our caller, or one of the # callers dependencies. -{ +SYMBOL_SCOPE { global: - eprintf = FUNCTION extern; + eprintf { + TYPE = FUNCTION; + FLAGS = extern; + }; }; diff --git a/usr/src/cmd/sgs/liblddbg/common/mapfile-vers b/usr/src/cmd/sgs/liblddbg/common/mapfile-vers index 539eb861d8..164bfd75c8 100644 --- a/usr/src/cmd/sgs/liblddbg/common/mapfile-vers +++ b/usr/src/cmd/sgs/liblddbg/common/mapfile-vers @@ -40,10 +40,16 @@ # MAPFILE HEADER END # -SUNWprivate_4.81 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_4.81 { global: - dbg_desc = NODIRECT; # interposed - ld.so.1(1) - dbg_print = NODIRECT; # interposed - ld(1) and ld.so.1(1) + dbg_desc { # interposed - ld.so.1(1) + FLAGS = NODIRECT; + }; + dbg_print { # interposed - ld(1) and ld.so.1(1) + FLAGS = NODIRECT; + }; Dbg_args_file; Dbg_args_option; @@ -524,7 +530,7 @@ SUNWprivate_4.81 { # this interface, and thus by separating in from the ever changing Dbg_* # interfaces we can provide a stable versioning environment for this utility. -SUNWprivate_3.23 { +SYMBOL_VERSION SUNWprivate_3.23 { global: Elf_syminfo_entry; Elf_syminfo_title; diff --git a/usr/src/cmd/sgs/libldmake/common/mapfile-vers b/usr/src/cmd/sgs/libldmake/common/mapfile-vers index e818789b59..5942a1cfcd 100644 --- a/usr/src/cmd/sgs/libldmake/common/mapfile-vers +++ b/usr/src/cmd/sgs/libldmake/common/mapfile-vers @@ -1,6 +1,5 @@ # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # # CDDL HEADER START # @@ -36,7 +35,9 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: ld_file; ld_atexit; diff --git a/usr/src/cmd/sgs/libldstab/amd64/Makefile b/usr/src/cmd/sgs/libldstab/amd64/Makefile index 5b934c0606..f8560e93bf 100644 --- a/usr/src/cmd/sgs/libldstab/amd64/Makefile +++ b/usr/src/cmd/sgs/libldstab/amd64/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,10 +19,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # DUPOBJS= stab64.o @@ -38,8 +34,6 @@ ROOTDYNLIB64= $(DYNLIB:%=$(ROOTLIBDIR)/%) CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) -MAPFILES += ../common/mapfile-64 - LINTFLAGS64 += $(VAR_LINTFLAGS64) all: $(DYNLIB) diff --git a/usr/src/cmd/sgs/libldstab/common/mapfile-64 b/usr/src/cmd/sgs/libldstab/common/mapfile-64 deleted file mode 100644 index 8a8bdddc01..0000000000 --- a/usr/src/cmd/sgs/libldstab/common/mapfile-64 +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 -# -# ELF64 interface definition for usr/src/cmd/sgs/libldstab/sparc - -# -# 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 -# - -SUNWprivate_1.1 { - global: - ld_version64; -}; diff --git a/usr/src/cmd/sgs/libldstab/common/mapfile-vers b/usr/src/cmd/sgs/libldstab/common/mapfile-vers index d5fd8d6dcc..8946b08876 100644 --- a/usr/src/cmd/sgs/libldstab/common/mapfile-vers +++ b/usr/src/cmd/sgs/libldstab/common/mapfile-vers @@ -1,6 +1,5 @@ # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # # CDDL HEADER START # @@ -37,12 +36,15 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: ld_version; + ld_version64; }; -{ +SYMBOL_SCOPE { local: *; }; diff --git a/usr/src/cmd/sgs/libldstab/i386/Makefile b/usr/src/cmd/sgs/libldstab/i386/Makefile index fd4297a9fa..32d67e8050 100644 --- a/usr/src/cmd/sgs/libldstab/i386/Makefile +++ b/usr/src/cmd/sgs/libldstab/i386/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,18 +19,13 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # DUPOBJS= stab64.o include ../Makefile.com -MAPFILES += ../common/mapfile-64 - .KEEP_STATE: all: $(DYNLIB) diff --git a/usr/src/cmd/sgs/libldstab/sparc/Makefile b/usr/src/cmd/sgs/libldstab/sparc/Makefile index 8e15428f3d..9c4889da43 100644 --- a/usr/src/cmd/sgs/libldstab/sparc/Makefile +++ b/usr/src/cmd/sgs/libldstab/sparc/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,18 +19,13 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # DUPOBJS= stab64.o include ../Makefile.com -MAPFILES += ../common/mapfile-64 - .KEEP_STATE: all: $(DYNLIB) diff --git a/usr/src/cmd/sgs/libldstab/sparcv9/Makefile b/usr/src/cmd/sgs/libldstab/sparcv9/Makefile index 4a2273ae52..e0841a6ee6 100644 --- a/usr/src/cmd/sgs/libldstab/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libldstab/sparcv9/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,10 +19,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # DUPOBJS= stab64.o @@ -38,8 +34,6 @@ ROOTDYNLIB64= $(DYNLIB:%=$(ROOTLIBDIR)/%) CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) -MAPFILES += ../common/mapfile-64 - LINTFLAGS64 += $(VAR_LINTFLAGS64) all: $(DYNLIB) diff --git a/usr/src/cmd/sgs/librtld/amd64/Makefile b/usr/src/cmd/sgs/librtld/amd64/Makefile index e0645150c2..b642bc3270 100644 --- a/usr/src/cmd/sgs/librtld/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld/amd64/Makefile @@ -20,16 +20,12 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # include $(SRC)/cmd/sgs/librtld/Makefile.com CPPFLAGS += -I../../../../uts/intel/amd64/krtld -MAPFILES += ../common/mapfile-64-vers .KEEP_STATE: diff --git a/usr/src/cmd/sgs/librtld/common/mapfile-32-vers b/usr/src/cmd/sgs/librtld/common/mapfile-32-vers deleted file mode 100644 index b15133bf3f..0000000000 --- a/usr/src/cmd/sgs/librtld/common/mapfile-32-vers +++ /dev/null @@ -1,45 +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 -# - -{ - global: - do32_reloc_rtld = FUNCTION parent; - reloc32_table = DATA parent; -}; diff --git a/usr/src/cmd/sgs/librtld/common/mapfile-64-vers b/usr/src/cmd/sgs/librtld/common/mapfile-64-vers deleted file mode 100644 index d8fcf65118..0000000000 --- a/usr/src/cmd/sgs/librtld/common/mapfile-64-vers +++ /dev/null @@ -1,45 +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 -# - -{ - global: - do64_reloc_rtld = FUNCTION parent; - reloc64_table = DATA parent; -}; diff --git a/usr/src/cmd/sgs/librtld/common/mapfile-vers b/usr/src/cmd/sgs/librtld/common/mapfile-vers index c8e8189a09..4c6768d3ac 100644 --- a/usr/src/cmd/sgs/librtld/common/mapfile-vers +++ b/usr/src/cmd/sgs/librtld/common/mapfile-vers @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -38,21 +37,36 @@ # MAPFILE HEADER END # -SUNWprivate_1.3 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.3 { global: rt_dldump; }; -{ +SYMBOL_SCOPE { global: - alist_append = FUNCTION parent; - elf_plt_write = FUNCTION parent; - eprintf = FUNCTION parent; - is_so_loaded = FUNCTION parent; - lookup_sym = FUNCTION parent; - - ld_entry_cnt = DATA parent; - lml_main = DATA parent; + alist_append { TYPE = FUNCTION; FLAGS = PARENT }; + elf_plt_write { TYPE = FUNCTION; FLAGS = PARENT }; + eprintf { TYPE = FUNCTION; FLAGS = PARENT }; + is_so_loaded { TYPE = FUNCTION; FLAGS = PARENT }; + lookup_sym { TYPE = FUNCTION; FLAGS = PARENT }; + + ld_entry_cnt { TYPE = DATA; FLAGS = PARENT }; + lml_main { TYPE = DATA; FLAGS = PARENT }; + + +$if _ELF32 + do32_reloc_rtld { TYPE = FUNCTION; FLAGS = PARENT }; + reloc32_table { TYPE = DATA; FLAGS = PARENT }; +$elif _ELF64 + do64_reloc_rtld { TYPE = FUNCTION; FLAGS = PARENT }; + reloc64_table { TYPE = DATA; FLAGS = PARENT }; +$else +$error unknown ELFCLASS +$endif + + local: *; }; diff --git a/usr/src/cmd/sgs/librtld/i386/Makefile b/usr/src/cmd/sgs/librtld/i386/Makefile index d0972f0319..546a8504fe 100644 --- a/usr/src/cmd/sgs/librtld/i386/Makefile +++ b/usr/src/cmd/sgs/librtld/i386/Makefile @@ -20,16 +20,12 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. # include $(SRC)/cmd/sgs/librtld/Makefile.com CPPFLAGS += -I../../../../uts/intel/ia32/krtld -MAPFILES += ../common/mapfile-32-vers .KEEP_STATE: diff --git a/usr/src/cmd/sgs/librtld/sparc/Makefile b/usr/src/cmd/sgs/librtld/sparc/Makefile index 5d07608807..33efa5334e 100644 --- a/usr/src/cmd/sgs/librtld/sparc/Makefile +++ b/usr/src/cmd/sgs/librtld/sparc/Makefile @@ -20,16 +20,12 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. # include $(SRC)/cmd/sgs/librtld/Makefile.com CPPFLAGS += -I../../../../uts/sparc/krtld -MAPFILES += ../common/mapfile-32-vers .KEEP_STATE: diff --git a/usr/src/cmd/sgs/librtld/sparcv9/Makefile b/usr/src/cmd/sgs/librtld/sparcv9/Makefile index eba63918c2..0fdca1ad1f 100644 --- a/usr/src/cmd/sgs/librtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld/sparcv9/Makefile @@ -20,16 +20,12 @@ # # -# 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. # include $(SRC)/cmd/sgs/librtld/Makefile.com CPPFLAGS += -I../../../../uts/sparc/krtld -MAPFILES += ../common/mapfile-64-vers .KEEP_STATE: diff --git a/usr/src/cmd/sgs/librtld_db/amd64/Makefile b/usr/src/cmd/sgs/librtld_db/amd64/Makefile index 90593524fd..21fbeff150 100644 --- a/usr/src/cmd/sgs/librtld_db/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld_db/amd64/Makefile @@ -20,10 +20,7 @@ # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # COMOBJS64 = rd_elf64.o @@ -37,7 +34,6 @@ SGSMSGTARG += $(SGSMSGINTEL) LINTFLAGS64 += $(VAR_LINTFLAGS64) CPPFLAGS += -D_SYSCALL32 CONVLIBDIR = $(CONVLIBDIR64) -DYNFLAGS += -M../common/mapfile-vers.64 .KEEP_STATE: diff --git a/usr/src/cmd/sgs/librtld_db/common/mapfile-vers b/usr/src/cmd/sgs/librtld_db/common/mapfile-vers index 6d80b56378..02ac13ea5d 100644 --- a/usr/src/cmd/sgs/librtld_db/common/mapfile-vers +++ b/usr/src/cmd/sgs/librtld_db/common/mapfile-vers @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -38,7 +37,9 @@ # MAPFILE HEADER END # -SUNW_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNW_1.1 { global: rd_delete; rd_errstr; @@ -57,23 +58,30 @@ SUNW_1.1 { *; }; -SUNWprivate_1.1 { +SYMBOL_VERSION SUNWprivate_1.1 { global: _rd_get_dyns32; _rd_get_ehdr32; _rd_loadobj_iter32; rd_get_dyns; validate_rdebug32; + +$if _ELF64 + _rd_get_dyns64; + _rd_get_ehdr64; + _rd_loadobj_iter64; + validate_rdebug64; +$endif }; #Externally defined symbols -{ +SYMBOL_SCOPE { global: - ps_pauxv = NODIRECT PARENT; - ps_pdmodel = NODIRECT PARENT; - ps_pglobal_lookup = NODIRECT PARENT; - ps_pglobal_sym = NODIRECT PARENT; - ps_plog = NODIRECT PARENT; - ps_pread = NODIRECT PARENT; - ps_pwrite = NODIRECT PARENT; + ps_pauxv { FLAGS = NODIRECT PARENT }; + ps_pdmodel { FLAGS = NODIRECT PARENT }; + ps_pglobal_lookup { FLAGS = NODIRECT PARENT }; + ps_pglobal_sym { FLAGS = NODIRECT PARENT }; + ps_plog { FLAGS = NODIRECT PARENT }; + ps_pread { FLAGS = NODIRECT PARENT }; + ps_pwrite { FLAGS = NODIRECT PARENT }; }; diff --git a/usr/src/cmd/sgs/librtld_db/common/mapfile-vers.64 b/usr/src/cmd/sgs/librtld_db/common/mapfile-vers.64 deleted file mode 100644 index 5f7362e3ab..0000000000 --- a/usr/src/cmd/sgs/librtld_db/common/mapfile-vers.64 +++ /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 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 -# - -SUNWprivate_1.1 { - global: - _rd_get_dyns64; - _rd_get_ehdr64; - _rd_loadobj_iter64; - validate_rdebug64; -}; diff --git a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile index de9be4eee9..cb2fb3b6d1 100644 --- a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile @@ -20,10 +20,7 @@ # # -# Copyright 2008 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. # COMOBJS64 = rd_elf64.o @@ -37,7 +34,6 @@ SGSMSGTARG += $(SGSMSGSPARCV9) LINTFLAGS64 += $(VAR_LINTFLAGS64) CPPFLAGS += -D_SYSCALL32 CONVLIBDIR = $(CONVLIBDIR64) -DYNFLAGS += -M../common/mapfile-vers.64 .KEEP_STATE: diff --git a/usr/src/cmd/sgs/link_audit/Makefile.com b/usr/src/cmd/sgs/link_audit/Makefile.com index 6f213224a3..c15aa1e204 100644 --- a/usr/src/cmd/sgs/link_audit/Makefile.com +++ b/usr/src/cmd/sgs/link_audit/Makefile.com @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. # include ../../../../lib/Makefile.lib @@ -84,11 +83,11 @@ $(WHOLIB):= SONAME = $(WHOLIB) $(SYMBINDREP):= SONAME = $(SYMBINDREP) $(BINDLIB):= SONAME = $(BINDLIB) -$(TRUSSLIB):= MAPFILES = mapfile-vers-truss -$(PERFLIB):= MAPFILES = mapfile-vers-perfcnt -$(WHOLIB):= MAPFILES = mapfile-vers-who -$(SYMBINDREP):= MAPFILES = mapfile-vers-symbindrep -$(BINDLIB):= MAPFILES = mapfile-vers-bindings +$(TRUSSLIB):= MAPFILES = ../common/mapfile-vers-truss +$(PERFLIB):= MAPFILES = ../common/mapfile-vers-perfcnt +$(WHOLIB):= MAPFILES = ../common/mapfile-vers-who +$(SYMBINDREP):= MAPFILES = ../common/mapfile-vers-symbindrep +$(BINDLIB):= MAPFILES = ../common/mapfile-vers-bindings $(ROOTCCSLIB) := DIRMODE = 755 diff --git a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-bindings b/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-bindings deleted file mode 100644 index 046a851f7e..0000000000 --- a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-bindings +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_amd64_pltenter; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-perfcnt b/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-perfcnt deleted file mode 100644 index 4c4ae67fbb..0000000000 --- a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-perfcnt +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_amd64_pltenter; - la_pltexit64; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-truss b/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-truss deleted file mode 100644 index 7344d35745..0000000000 --- a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-truss +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_pltexit64; - la_amd64_pltenter; - la_symbind64; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-who b/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-who deleted file mode 100644 index 3e98f53cbf..0000000000 --- a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-who +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_objclose; - la_amd64_pltenter; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-bindings b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-bindings index 3e2cc4802c..be0b1a58af 100644 --- a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-bindings +++ b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-bindings @@ -1,6 +1,5 @@ # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # # CDDL HEADER START # @@ -36,11 +35,36 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: la_version; # Audit interfaces la_objopen; +$if _sparc + +$if _ELF32 la_sparcv8_pltenter; +$elif _ELF64 + la_sparcv9_pltenter; +$else +$error unknown sparc ELFCLASS +$endif + +$elif _x86 + +$if _ELF32 + la_i86_pltenter; +$elif _ELF64 + la_amd64_pltenter; +$else +$error unknown x86 ELFCLASS +$endif + +$else +$error unknown platform +$endif + local: *; }; diff --git a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-perfcnt b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-perfcnt index 2d9582ebfc..c109e91197 100644 --- a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-perfcnt +++ b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-perfcnt @@ -1,6 +1,5 @@ # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # # CDDL HEADER START # @@ -36,12 +35,48 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: la_version; # Audit interfaces la_objopen; - la_sparcv9_pltenter; + + +$if _ELF32 + la_pltexit; +$elif _ELF64 la_pltexit64; +$else +$error unknown ELFCLASS +$endif + + +$if _sparc + +$if _ELF32 + la_sparcv8_pltenter; +$elif _ELF64 + la_sparcv9_pltenter; +$else +$error unknown sparc ELFCLASS +$endif + +$elif _x86 + +$if _ELF32 + la_i86_pltenter; +$elif _ELF64 + la_amd64_pltenter; +$else +$error unknown x86 ELFCLASS +$endif + +$else +$error unknown platform +$endif + + local: *; }; diff --git a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-symbindrep b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-symbindrep index 7bfa9eb78f..a5bdce7d2b 100644 --- a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-symbindrep +++ b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-symbindrep @@ -1,6 +1,5 @@ # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # # CDDL HEADER START # @@ -36,12 +35,24 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: la_version; # Audit interfaces la_objopen; la_preinit; + + +$if _ELF32 + la_symbind32; +$elif _ELF64 la_symbind64; +$else +$error unknown ELFCLASS +$endif + + local: *; }; diff --git a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-truss b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-truss index 848e9fc37e..428e7b2e0c 100644 --- a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-truss +++ b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-truss @@ -1,6 +1,5 @@ # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # # CDDL HEADER START # @@ -36,13 +35,50 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: la_version; # Audit interfaces la_objopen; + + +$if _ELF32 + la_pltexit; + la_symbind32; +$elif _ELF64 la_pltexit64; - la_sparcv9_pltenter; la_symbind64; +$else +$error unknown ELFCLASS +$endif + + +$if _sparc + +$if _ELF32 + la_sparcv8_pltenter; +$elif _ELF64 + la_sparcv9_pltenter; +$else +$error unknown sparc ELFCLASS +$endif + +$elif _x86 + +$if _ELF32 + la_i86_pltenter; +$elif _ELF64 + la_amd64_pltenter; +$else +$error unknown x86 ELFCLASS +$endif + +$else +$error unknown platform +$endif + + local: *; }; diff --git a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-who b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-who index 0c3c0a6cd0..ac57ecab9d 100644 --- a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-who +++ b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-who @@ -1,6 +1,5 @@ # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # # CDDL HEADER START # @@ -36,12 +35,40 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: la_version; # Audit interfaces la_objopen; la_objclose; + + +$if _sparc + +$if _ELF32 la_sparcv8_pltenter; +$elif _ELF64 + la_sparcv9_pltenter; +$else +$error unknown sparc ELFCLASS +$endif + +$elif _x86 + +$if _ELF32 + la_i86_pltenter; +$elif _ELF64 + la_amd64_pltenter; +$else +$error unknown x86 ELFCLASS +$endif + +$else +$error unknown platform +$endif + + local: *; }; diff --git a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-bindings b/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-bindings deleted file mode 100644 index 4e52244c59..0000000000 --- a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-bindings +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_i86_pltenter; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-perfcnt b/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-perfcnt deleted file mode 100644 index f4e9eb19a5..0000000000 --- a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-perfcnt +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_pltexit; - la_i86_pltenter; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-symbindrep b/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-symbindrep deleted file mode 100644 index a0c0285e6c..0000000000 --- a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-symbindrep +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_preinit; - la_symbind32; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-truss b/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-truss deleted file mode 100644 index f0059132ef..0000000000 --- a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-truss +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_pltexit; - la_i86_pltenter; - la_symbind32; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-who b/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-who deleted file mode 100644 index da495875bf..0000000000 --- a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-who +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_objclose; - la_i86_pltenter; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-perfcnt b/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-perfcnt deleted file mode 100644 index 240f11877a..0000000000 --- a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-perfcnt +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_pltexit; - la_sparcv8_pltenter; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-symbindrep b/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-symbindrep deleted file mode 100644 index a0c0285e6c..0000000000 --- a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-symbindrep +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_preinit; - la_symbind32; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-truss b/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-truss deleted file mode 100644 index 0b36ae5c33..0000000000 --- a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-truss +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_pltexit; - la_sparcv8_pltenter; - la_symbind32; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-bindings b/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-bindings deleted file mode 100644 index bde87f53fd..0000000000 --- a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-bindings +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_sparcv9_pltenter; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-symbindrep b/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-symbindrep deleted file mode 100644 index 7bfa9eb78f..0000000000 --- a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-symbindrep +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_preinit; - la_symbind64; - local: - *; -}; diff --git a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-who b/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-who deleted file mode 100644 index 4b22b79b5d..0000000000 --- a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-who +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# 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 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 -# - -SUNWprivate_1.1 { - global: - la_version; # Audit interfaces - la_objopen; - la_objclose; - la_sparcv9_pltenter; - local: - *; -}; diff --git a/usr/src/cmd/sgs/packages/common/SUNWonld-README b/usr/src/cmd/sgs/packages/common/SUNWonld-README index 61e44e562c..a511b81869 100644 --- a/usr/src/cmd/sgs/packages/common/SUNWonld-README +++ b/usr/src/cmd/sgs/packages/common/SUNWonld-README @@ -1595,3 +1595,4 @@ Bugid Risk Synopsis 6961755 ld.so.1's -e arguments should take precedence over environment variables. (D) 6748925 moe returns wrong hwcap library in some circumstances +6916796 OSnet mapfiles should use version 2 link-editor syntax diff --git a/usr/src/cmd/sgs/rtld/Makefile b/usr/src/cmd/sgs/rtld/Makefile index fa9e77db0e..9d3176b398 100644 --- a/usr/src/cmd/sgs/rtld/Makefile +++ b/usr/src/cmd/sgs/rtld/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,11 +18,9 @@ # # CDDL HEADER END # + # -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2001-2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. # include $(SRC)/cmd/sgs/Makefile.com diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com index c0229116ae..687f72006f 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.com +++ b/usr/src/cmd/sgs/rtld/Makefile.com @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # RTLD= ld.so.1 @@ -54,7 +53,7 @@ PLAT = $(VAR_PLAT_$(BASEPLAT)) # DTrace needs an executable data segment. MAPFILE.NED= -MAPFILES += $(MAPFILE-ORDER) $(MAPFILE-PLAT) +MAPFILES += $(MAPFILE-ORDER) # For the libc/libthread unified world: # This library needs to be placed in /lib to allow diff --git a/usr/src/cmd/sgs/rtld/amd64/Makefile b/usr/src/cmd/sgs/rtld/amd64/Makefile index c9b8af20ca..053171045d 100644 --- a/usr/src/cmd/sgs/rtld/amd64/Makefile +++ b/usr/src/cmd/sgs/rtld/amd64/Makefile @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # BASEPLAT = amd64 @@ -61,8 +60,6 @@ include $(SRC)/lib/Makefile.lib.64 MAPFILE-ORDER = ../common/mapfile-order-devpro $(__GNUC64)MAPFILE-ORDER = ../common/mapfile-order-gcc -MAPFILE-PLAT = mapfile-amd64-vers - # Add any machine specific flags. CFLAGS += -xregs=no%appl @@ -83,8 +80,6 @@ CPICLIB = $(CPICLIB64) LDDBGLIBDIR = $(LDDBGLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -MAPFILES += ../common/mapfile-64-vers - .KEEP_STATE: all: $(RTLD) diff --git a/usr/src/cmd/sgs/rtld/common/mapfile-32-vers b/usr/src/cmd/sgs/rtld/common/mapfile-32-vers deleted file mode 100644 index 5bbfddabc7..0000000000 --- a/usr/src/cmd/sgs/rtld/common/mapfile-32-vers +++ /dev/null @@ -1,45 +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 -# - -SUNWprivate_1.3 { - protected: - do32_reloc_rtld; # Required to support librtld.so - reloc32_table; -}; diff --git a/usr/src/cmd/sgs/rtld/common/mapfile-64-vers b/usr/src/cmd/sgs/rtld/common/mapfile-64-vers deleted file mode 100644 index 3de22585c3..0000000000 --- a/usr/src/cmd/sgs/rtld/common/mapfile-64-vers +++ /dev/null @@ -1,45 +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 -# - -SUNWprivate_1.3 { - protected: - do64_reloc_rtld; # Required to support librtld.so - reloc64_table; -}; diff --git a/usr/src/cmd/sgs/rtld/common/mapfile-order-devpro b/usr/src/cmd/sgs/rtld/common/mapfile-order-devpro index 95f8df5e4d..59fdaa0be5 100644 --- a/usr/src/cmd/sgs/rtld/common/mapfile-order-devpro +++ b/usr/src/cmd/sgs/rtld/common/mapfile-order-devpro @@ -20,10 +20,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. # # Note: This mapfile is used to place r_debug as the # very first data item inside of the run-time linker. @@ -41,6 +38,21 @@ # devpro mapfile: rtld/common/mapfile-order-devpro # -data = LOAD ?RWXO; -data : .data : pics/debugdata.o; -data | .data; +$mapfile_version 2 + +LOAD_SEGMENT data { + FLAGS = READ WRITE EXECUTE; + + # .data sections from pics/debugdata.o go to data segment + ASSIGN_SECTION dbg_data { + IS_NAME = .data; + FILE_PATH = pics/debugdata.o; + }; + + # Put .data sections from pics/debugdata.o ahead of any other + # .data input sections in the .data output section. + IS_ORDER = dbg_data; + + # Put .data output section at top of data segment + OS_ORDER = .data; +}; diff --git a/usr/src/cmd/sgs/rtld/common/mapfile-order-gcc b/usr/src/cmd/sgs/rtld/common/mapfile-order-gcc index c719599999..f466ea9e8e 100644 --- a/usr/src/cmd/sgs/rtld/common/mapfile-order-gcc +++ b/usr/src/cmd/sgs/rtld/common/mapfile-order-gcc @@ -20,10 +20,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # # Note: This mapfile is used to place r_debug as the # very first data item inside of the run-time linker. @@ -41,6 +38,21 @@ # devpro mapfile: rtld/common/mapfile-order-devpro # -data = LOAD ?RWXO; -data : .data.rel : pics/debugdata.o; -data | .data.rel; +$mapfile_version 2 + +LOAD_SEGMENT data { + FLAGS = READ WRITE EXECUTE; + + # .data.rel sections from pics/debugdata.o go to data segment + ASSIGN_SECTION dbg_data { + IS_NAME = .data.rel; + FILE_PATH = pics/debugdata.o; + }; + + # Put .data.rel sections from pics/debugdata.o ahead of any other + # .data.rel input sections in the .data.rel output section. + IS_ORDER = dbg_data; + + # Put .data.rel output section at top of data segment + OS_ORDER = .data.rel; +}; diff --git a/usr/src/cmd/sgs/rtld/common/mapfile-vers b/usr/src/cmd/sgs/rtld/common/mapfile-vers index 9864da20d1..606964553c 100644 --- a/usr/src/cmd/sgs/rtld/common/mapfile-vers +++ b/usr/src/cmd/sgs/rtld/common/mapfile-vers @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. # # Generic interface definition for usr/src/cmd/sgs/rtld. # @@ -40,10 +39,12 @@ # MAPFILE HEADER END # +$mapfile_version 2 + # # All symbols in ld.so.1 are private as no-one should bind to these directly. # -SUNWprivate_1.3 { +SYMBOL_VERSION SUNWprivate_1.3 { protected: dladdr; # Standard dlopen(3x) family dladdr1; @@ -110,6 +111,24 @@ SUNWprivate_1.3 { ___errno; qsort; dl_iterate_phdr; + +$if _x86 && _ELF64 + # amd64 ABI exception unwinding + _dlamd64getunwind; + dlamd64getunwind; +$endif + + # doXX_reloc_rtld and relocXX_table are required to + # support librtld.so. +$if _ELF32 + do32_reloc_rtld; + reloc32_table; +$elif _ELF64 + do64_reloc_rtld; + reloc64_table; +$else +$error unknown ELFCLASS +$endif local: *; }; diff --git a/usr/src/cmd/sgs/rtld/i386/Makefile b/usr/src/cmd/sgs/rtld/i386/Makefile index 50ebf15c23..21b5fc74f9 100644 --- a/usr/src/cmd/sgs/rtld/i386/Makefile +++ b/usr/src/cmd/sgs/rtld/i386/Makefile @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. # BASEPLAT = i386 @@ -71,8 +70,6 @@ SONAME= $(VAR_RTLD_SONAME) SGSMSGTARG += $(SGSMSGINTEL) $(SGSMSGINTEL32) $(SGSMSG32) -MAPFILES += ../common/mapfile-32-vers - .KEEP_STATE: all: $(RTLD) diff --git a/usr/src/cmd/sgs/rtld/mdbmod/common/mapfile b/usr/src/cmd/sgs/rtld/mdbmod/common/mapfile index 127d9bb27c..9f42664fc6 100644 --- a/usr/src/cmd/sgs/rtld/mdbmod/common/mapfile +++ b/usr/src/cmd/sgs/rtld/mdbmod/common/mapfile @@ -1,6 +1,5 @@ # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # # CDDL HEADER START # @@ -36,7 +35,9 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: # # Exported Interface @@ -46,20 +47,20 @@ SUNWprivate_1.1 { *; }; -{ +SYMBOL_SCOPE { # # Imported Interface # - mdb_alloc = EXTERN; - mdb_call_dcmd = EXTERN; - mdb_dec_indent = EXTERN; - mdb_getopts = EXTERN; - mdb_inc_indent = EXTERN; - mdb_lookup_by_obj = EXTERN; - mdb_printf = EXTERN; - mdb_pwalk = EXTERN; - mdb_readstr = EXTERN; - mdb_set_dot = EXTERN; - mdb_vread = EXTERN; - mdb_warn = EXTERN; + mdb_alloc { FLAGS = EXTERN }; + mdb_call_dcmd { FLAGS = EXTERN }; + mdb_dec_indent { FLAGS = EXTERN }; + mdb_getopts { FLAGS = EXTERN }; + mdb_inc_indent { FLAGS = EXTERN }; + mdb_lookup_by_obj { FLAGS = EXTERN }; + mdb_printf { FLAGS = EXTERN }; + mdb_pwalk { FLAGS = EXTERN }; + mdb_readstr { FLAGS = EXTERN }; + mdb_set_dot { FLAGS = EXTERN }; + mdb_vread { FLAGS = EXTERN }; + mdb_warn { FLAGS = EXTERN }; }; diff --git a/usr/src/cmd/sgs/rtld/sparc/Makefile b/usr/src/cmd/sgs/rtld/sparc/Makefile index e0e74ed0c4..ef605236f9 100644 --- a/usr/src/cmd/sgs/rtld/sparc/Makefile +++ b/usr/src/cmd/sgs/rtld/sparc/Makefile @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. # # Object lists are organized into primary (most frequently used code) and @@ -76,8 +75,6 @@ ADBGENFLAGS += -milp32 ADBSUB= $(ADBSUB32) SONAME= $(VAR_RTLD_SONAME) -MAPFILES += ../common/mapfile-32-vers - SGSMSGTARG += $(SGSMSGSPARC) $(SGSMSGSPARC32) $(SGSMSG32) .KEEP_STATE: diff --git a/usr/src/cmd/sgs/rtld/sparcv9/Makefile b/usr/src/cmd/sgs/rtld/sparcv9/Makefile index ce13492f59..a414aebbca 100644 --- a/usr/src/cmd/sgs/rtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/rtld/sparcv9/Makefile @@ -20,8 +20,7 @@ # # -# 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. # # Object lists are organized into primary (most frequently used code) and @@ -77,8 +76,6 @@ CPPFLAGS += -D_ELF64 LINTFLAGS64 += $(VAR_LINTFLAGS64) SONAME= $(VAR_RTLD_V9_SONAME) -MAPFILES += ../common/mapfile-64-vers - SGSMSGTARG += $(SGSMSGSPARC) $(SGSMSGSPARC64) $(SGSMSG64) LDLIB = -L ../../libld/$(MACH64) diff --git a/usr/src/cmd/sgs/yacc/common/mapfile-vers b/usr/src/cmd/sgs/yacc/common/mapfile-vers index a33180dea2..0dd3e28202 100644 --- a/usr/src/cmd/sgs/yacc/common/mapfile-vers +++ b/usr/src/cmd/sgs/yacc/common/mapfile-vers @@ -1,6 +1,5 @@ # -# 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. # # CDDL HEADER START # @@ -38,7 +37,9 @@ # MAPFILE HEADER END # -SUNW_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNW_1.1 { global: main; yyerror; |