6964517 OSnet mapfiles should use version 2 link-editor syntax (2nd pass)

6948720 SHT_INIT_ARRAY etc. section names don't follow ELF gABI
6962343 sgsmsg should use mkstemp() for temporary file creation

9 files changed, 55 insertions, 46 deletions

diff --git a/usr/src/lib/libipadm/common/mapfile-vers b/usr/src/lib/libipadm/common/mapfile-vers
index 9d8cdf5592..4819963afb 100644
--- a/usr/src/lib/libipadm/common/mapfile-vers
+++ b/usr/src/lib/libipadm/common/mapfile-vers
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	ipadm_add_aobjname;
 	ipadm_addr_info;
diff --git a/usr/src/lib/libkmf/mappers/kmf_mapper_cn/common/mapfile-vers b/usr/src/lib/libkmf/mappers/kmf_mapper_cn/common/mapfile-vers
index b418e3b039..f5502be594 100644
--- a/usr/src/lib/libkmf/mappers/kmf_mapper_cn/common/mapfile-vers
+++ b/usr/src/lib/libkmf/mappers/kmf_mapper_cn/common/mapfile-vers
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	mapper_finalize;
 	mapper_get_error_str;
diff --git a/usr/src/lib/libsmedia/plugins/blkdev/common/mapfile-vers b/usr/src/lib/libsmedia/plugins/blkdev/common/mapfile-vers
index ec01a91dfc..f6e4b02f77 100644
--- a/usr/src/lib/libsmedia/plugins/blkdev/common/mapfile-vers
+++ b/usr/src/lib/libsmedia/plugins/blkdev/common/mapfile-vers
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_m_device_type;
 	_m_free_device_info;
diff --git a/usr/src/lib/libsrpt/common/mapfile-vers b/usr/src/lib/libsrpt/common/mapfile-vers
index 8be8e62a75..500216fee4 100644
--- a/usr/src/lib/libsrpt/common/mapfile-vers
+++ b/usr/src/lib/libsrpt/common/mapfile-vers
@@ -34,7 +34,10 @@
 #
 # MAPFILE HEADER END
 #
-SUNW_1.1 {
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		srpt_GetConfig;
 		srpt_SetConfig;
@@ -47,10 +50,3 @@ SUNW_1.1 {
 	local:
 		*;
 };
-
-SUNWprivate {
-	global:
-	local:
-	    *;
-};
-
diff --git a/usr/src/lib/libv12n/common/mapfile-vers b/usr/src/lib/libv12n/common/mapfile-vers
index 582b964fe7..e4d3bc77e4 100644
--- a/usr/src/lib/libv12n/common/mapfile-vers
+++ b/usr/src/lib/libv12n/common/mapfile-vers
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	v12n_capabilities;
 	v12n_domain_roles;
diff --git a/usr/src/lib/pysolaris/common/mapfile-vers b/usr/src/lib/pysolaris/common/mapfile-vers
index 7afd0dfa91..814abe6bf8 100644
--- a/usr/src/lib/pysolaris/common/mapfile-vers
+++ b/usr/src/lib/pysolaris/common/mapfile-vers
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	initmisc;
     local:
diff --git a/usr/src/lib/scsi/libsmp/libsmp_api.map b/usr/src/lib/scsi/libsmp/libsmp_api.map
index 1abe720d13..3d5be97c05 100644
--- a/usr/src/lib/scsi/libsmp/libsmp_api.map
+++ b/usr/src/lib/scsi/libsmp/libsmp_api.map
@@ -23,29 +23,31 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-{
-	smp_strerror = FUNCTION extern;
-	smp_errname = FUNCTION extern;
-	smp_errcode = FUNCTION extern;
-	smp_alloc = FUNCTION extern;
-	smp_zalloc = FUNCTION extern;
-	smp_strdup = FUNCTION extern;
-	smp_free = FUNCTION extern;
-	smp_set_errno = FUNCTION extern;
-	smp_verror = FUNCTION extern;
-	smp_error = FUNCTION extern;
-	smp_action_get_timeout = FUNCTION extern;
-	smp_action_get_request = FUNCTION extern;
-	smp_action_get_response = FUNCTION extern;
-	smp_action_get_request_frame = FUNCTION extern;
-	smp_action_get_response_frame = FUNCTION extern;
-	smp_action_get_function_def = FUNCTION extern;
-	smp_action_set_response_len = FUNCTION extern;
-	smp_action_set_result = FUNCTION extern;
-	smp_target_getcap = FUNCTION extern;
-	smp_target_set_change_count = FUNCTION extern;
-	smp_target_get_change_count = FUNCTION extern;
-	smp_assert = FUNCTION extern;
-	smp_engine_register = FUNCTION extern;
-	smp_plugin_register = FUNCTION extern;
+$mapfile_version 2
+
+SYMBOL_SCOPE {
+	smp_strerror			{ TYPE = FUNCTION; FLAGS = extern };
+	smp_errname			{ TYPE = FUNCTION; FLAGS = extern };
+	smp_errcode			{ TYPE = FUNCTION; FLAGS = extern };
+	smp_alloc			{ TYPE = FUNCTION; FLAGS = extern };
+	smp_zalloc			{ TYPE = FUNCTION; FLAGS = extern };
+	smp_strdup			{ TYPE = FUNCTION; FLAGS = extern };
+	smp_free			{ TYPE = FUNCTION; FLAGS = extern };
+	smp_set_errno			{ TYPE = FUNCTION; FLAGS = extern };
+	smp_verror			{ TYPE = FUNCTION; FLAGS = extern };
+	smp_error			{ TYPE = FUNCTION; FLAGS = extern };
+	smp_action_get_timeout		{ TYPE = FUNCTION; FLAGS = extern };
+	smp_action_get_request		{ TYPE = FUNCTION; FLAGS = extern };
+	smp_action_get_response		{ TYPE = FUNCTION; FLAGS = extern };
+	smp_action_get_request_frame	{ TYPE = FUNCTION; FLAGS = extern };
+	smp_action_get_response_frame	{ TYPE = FUNCTION; FLAGS = extern };
+	smp_action_get_function_def	{ TYPE = FUNCTION; FLAGS = extern };
+	smp_action_set_response_len	{ TYPE = FUNCTION; FLAGS = extern };
+	smp_action_set_result		{ TYPE = FUNCTION; FLAGS = extern };
+	smp_target_getcap		{ TYPE = FUNCTION; FLAGS = extern };
+	smp_target_set_change_count	{ TYPE = FUNCTION; FLAGS = extern };
+	smp_target_get_change_count	{ TYPE = FUNCTION; FLAGS = extern };
+	smp_assert			{ TYPE = FUNCTION; FLAGS = extern };
+	smp_engine_register		{ TYPE = FUNCTION; FLAGS = extern };
+	smp_plugin_register		{ TYPE = FUNCTION; FLAGS = extern };
 };
diff --git a/usr/src/lib/scsi/libsmp/mapfile-vers b/usr/src/lib/scsi/libsmp/mapfile-vers
index aabf0f23c3..74cb8fb756 100644
--- a/usr/src/lib/scsi/libsmp/mapfile-vers
+++ b/usr/src/lib/scsi/libsmp/mapfile-vers
@@ -37,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		smp_init;
 		smp_fini;
diff --git a/usr/src/lib/smbsrv/libsmbrp/common/mapfile-vers b/usr/src/lib/smbsrv/libsmbrp/common/mapfile-vers
index ec68fa9446..bdc9653aaf 100644
--- a/usr/src/lib/smbsrv/libsmbrp/common/mapfile-vers
+++ b/usr/src/lib/smbsrv/libsmbrp/common/mapfile-vers
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	rp_plugin_ops;
     local: