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

4 files changed, 111 insertions, 39 deletions

diff --git a/usr/src/uts/i86pc/conf/Mapfile b/usr/src/uts/i86pc/conf/Mapfile
index b822134be1..0d29beb3c3 100644
--- a/usr/src/uts/i86pc/conf/Mapfile
+++ b/usr/src/uts/i86pc/conf/Mapfile
@@ -18,31 +18,61 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 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"
+
+$mapfile_version 2
 
 #
 # this is the 32 bit 1:1 mapped code to which grub jumps.
 #
-dboot	= LOAD ?RWXN P0xC00000 V0xC00000;
-dboot	: $PROGBITS ?AW : *dboot.o;
+LOAD_SEGMENT dboot {
+	FLAGS = READ WRITE EXECUTE;
+	NOHDR;
+	PADDR = 0xC00000;
+	VADDR = 0xC00000;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+		FILE_BASENAME = dboot.o;
+	};
+};
 
 #
 # this is the kernel text
 #
-text	= LOAD ?RXN P0x400000 V0xFE800000;
-text	| .text;
-text	: $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+	FLAGS = READ EXECUTE;
+	NOHDR;
+	PADDR = 0x400000;
+	VADDR = 0xFE800000;
+	OS_ORDER = .text;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
 
 #
 # start the data segment on a new 4MB page boundary
 #
-data	= LOAD ?RWX P0x800000 V0xFEc00000;
-data	| .data;
-data	: $PROGBITS ?AW;
-data	: $NOBITS ?AW;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	PADDR = 0x800000;
+	VADDR = 0xFEc00000;
+	OS_ORDER = .data;
+	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/uts/i86pc/conf/Mapfile.amd64 b/usr/src/uts/i86pc/conf/Mapfile.amd64
index fca1e493c3..985304671a 100644
--- a/usr/src/uts/i86pc/conf/Mapfile.amd64
+++ b/usr/src/uts/i86pc/conf/Mapfile.amd64
@@ -1,6 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -22,27 +21,55 @@
 # CDDL HEADER END
 #
 
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
+$mapfile_version 2
 
 #
 # this is the 32 bit 1:1 mapped code to which grub jumps.
 #
-dboot   = LOAD ?RWXN P0xC00000 V0xC00000;
-dboot   : $PROGBITS ?AW : *dboot.o;
+LOAD_SEGMENT dboot {
+	FLAGS = READ WRITE EXECUTE;
+	NOHDR;
+	PADDR = 0xC00000;
+	VADDR = 0xC00000;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+		FILE_BASENAME = dboot.o;
+	};
+};
 
-text	= LOAD ?RXN P0x400000 V0xFFFFFFFFFB800000;
-text	| .text;
-text	: $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+	FLAGS =READ EXECUTE;
+	NOHDR;
+	PADDR = 0x400000;
+	VADDR = 0xFFFFFFFFFB800000;
+	OS_ORDER = .text;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
 
 #
 # kernel data
 #
-data	= LOAD ?RWX P0x800000 V0xFFFFFFFFFBc00000;
-data	| .data;
-data	: $PROGBITS ?AW;
-data	: $NOBITS ?AW;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	PADDR = 0x800000;
+	VADDR = 0xFFFFFFFFFBc00000;
+	OS_ORDER = .data;
+	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/uts/i86pc/conf/Mapfile.bios b/usr/src/uts/i86pc/conf/Mapfile.bios
index 18aa3ef9fc..7e0584d747 100644
--- a/usr/src/uts/i86pc/conf/Mapfile.bios
+++ b/usr/src/uts/i86pc/conf/Mapfile.bios
@@ -20,11 +20,18 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+$mapfile_version 2
 
-bios = LOAD ?NRWX V0x5000 P0x5000 A0x1000;
-bios : ?A;
+LOAD_SEGMENT bios {
+	NOHDR;
+	FLAGS = READ WRITE EXECUTE;
+	VADDR = 0x5000;
+	PADDR = 0x5000;
+	ALIGN = 0x1000;
+	ASSIGN_SECTION {
+		FLAGS = ALLOC;
+	};
+};
diff --git a/usr/src/uts/i86pc/conf/Mapfile.fb_swtch b/usr/src/uts/i86pc/conf/Mapfile.fb_swtch
index 6d3958d204..f20f7931cc 100644
--- a/usr/src/uts/i86pc/conf/Mapfile.fb_swtch
+++ b/usr/src/uts/i86pc/conf/Mapfile.fb_swtch
@@ -20,10 +20,18 @@
 #
 
 #
-# 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.
 #
 
+$mapfile_version 2
 
-fb_swtch = LOAD ?NRWX V0x5000 P0x5000 A0x2000;
-fb_swtch : ?A;
+LOAD_SEGMENT fb_swtch {
+	NOHDR;
+	FLAGS = READ WRITE EXECUTE;
+	VADDR = 0x5000;
+	PADDR = 0x5000;
+	ALIGN = 0x2000;
+	ASSIGN_SECTION {
+		FLAGS = ALLOC;
+	};
+};