6916796 OSnet mapfiles should use version 2 link-editor syntax

--HG--
rename : usr/src/cmd/sgs/libelf/common/mapfile-common => usr/src/cmd/sgs/libelf/common/mapfile-vers
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-bindings => usr/src/cmd/sgs/link_audit/common/mapfile-vers-bindings
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-perfcnt => usr/src/cmd/sgs/link_audit/common/mapfile-vers-perfcnt
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-symbindrep => usr/src/cmd/sgs/link_audit/common/mapfile-vers-symbindrep
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-truss => usr/src/cmd/sgs/link_audit/common/mapfile-vers-truss
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-who => usr/src/cmd/sgs/link_audit/common/mapfile-vers-who
rename : usr/src/common/mapfiles/i386/map.noexdata => usr/src/common/mapfiles/common/map.noexdata
rename : usr/src/lib/libaio/sparc/mapfile-vers => usr/src/lib/libaio/common/mapfile-vers
rename : usr/src/lib/libelfsign/common/mapfile.map => usr/src/lib/libelfsign/common/mapfile-vers
rename : usr/src/lib/libpthread/sparc/mapfile-vers => usr/src/lib/libpthread/common/mapfile-vers
rename : usr/src/lib/librt/amd64/mapfile-vers => usr/src/lib/librt/common/mapfile-vers
rename : usr/src/lib/libsys/sparc/mapfile-vers => usr/src/lib/libsys/common/mapfile-vers
rename : usr/src/lib/libthread/sparc/mapfile-vers => usr/src/lib/libthread/common/mapfile-vers

3 files changed, 87 insertions, 39 deletions

diff --git a/usr/src/psm/stand/boot/sparc/common/mapfile b/usr/src/psm/stand/boot/sparc/common/mapfile
index 07df7f5f2a..ced0506d2b 100644
--- a/usr/src/psm/stand/boot/sparc/common/mapfile
+++ b/usr/src/psm/stand/boot/sparc/common/mapfile
@@ -19,18 +19,35 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI" 
 
-text    = LOAD ?RX V0x130000;
-text    : $PROGBITS ?A!W;
+$mapfile_version 2
+
+LOAD_SEGMENT text {
+	FLAGS = READ EXECUTE;
+	VADDR = 0x130000;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
  
-data    = LOAD ?RWX A0x8;
-data    : $PROGBITS ?AW;
-data    : $NOBITS ?AW;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	ALIGN = 0x8;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+	};
+	ASSIGN_SECTION {
+		TYPE = NOBITS;
+		FLAGS = ALLOC WRITE;
+	};
+};
  
-note    = NOTE;
-note    : $NOTE;
-
+NOTE_SEGMENT note {
+	ASSIGN_SECTION {
+		TYPE = NOTE;
+	};
+};
diff --git a/usr/src/psm/stand/bootlst/sparc/mapfile b/usr/src/psm/stand/bootlst/sparc/mapfile
index 22dc304042..91fb4bfcd6 100644
--- a/usr/src/psm/stand/bootlst/sparc/mapfile
+++ b/usr/src/psm/stand/bootlst/sparc/mapfile
@@ -1,7 +1,4 @@
 #
-# Copyright 2005 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
@@ -21,20 +18,37 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # psm/stand/bootlst/sparc/mapfile
 #
 
-text    = LOAD ?RX V0x100000;
-text    : $PROGBITS ?A!W;
- 
-data    = LOAD ?RWX A0x8;
-data    : $PROGBITS ?AW;
-data    : $NOBITS ?AW;
+$mapfile_version 2
+
+LOAD_SEGMENT text {
+	FLAGS = READ EXECUTE;
+	VADDR = 0x100000;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
  
-note    = NOTE;
-note    : $NOTE;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	ALIGN = 0x8;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+	};
+	ASSIGN_SECTION {
+		TYPE = NOBITS;
+		FLAGS = ALLOC WRITE;
+	};
+ };
+
+NOTE_SEGMENT note {
+	ASSIGN_SECTION {
+		TYPE = NOTE;
+	};
+};
diff --git a/usr/src/psm/stand/cpr/sparcv9/sun4u/mapfile b/usr/src/psm/stand/cpr/sparcv9/sun4u/mapfile
index 51e01a8c7e..f862e8ab00 100644
--- a/usr/src/psm/stand/cpr/sparcv9/sun4u/mapfile
+++ b/usr/src/psm/stand/cpr/sparcv9/sun4u/mapfile
@@ -1,13 +1,11 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # 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.
@@ -22,14 +20,33 @@
 #
 # CDDL HEADER END
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-text    = LOAD ?RX V0x100000;
-text    : $PROGBITS ?A!W;
+$mapfile_version 2
+
+LOAD_SEGMENT text {
+	FLAGS = READ EXECUTE;
+	VADDR = 0x100000;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
  
-data    = LOAD ?RWX A0x8;
-data    : $PROGBITS ?AW;
-data    : $NOBITS ?AW;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	ALIGN = 0x8;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+	};
+	ASSIGN_SECTION {
+		TYPE = NOBITS;
+		FLAGS = ALLOC WRITE;
+	};
+};
  
-note    = NOTE;
-note    : $NOTE;
+NOTE_SEGMENT note {
+	ASSIGN_SECTION {
+		TYPE = NOTE;
+	};
+};