summaryrefslogtreecommitdiff
path: root/usr/src/uts
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts')
-rw-r--r--usr/src/uts/common/ctf/mapfile7
-rw-r--r--usr/src/uts/common/io/sdcard/impl/mapfile4
-rw-r--r--usr/src/uts/common/zmod/mapfile7
-rw-r--r--usr/src/uts/i86pc/conf/Mapfile58
-rw-r--r--usr/src/uts/i86pc/conf/Mapfile.amd6459
-rw-r--r--usr/src/uts/i86pc/conf/Mapfile.bios17
-rw-r--r--usr/src/uts/i86pc/conf/Mapfile.fb_swtch16
-rw-r--r--usr/src/uts/i86pc/unix/dboot/Mapfile.dboot35
-rw-r--r--usr/src/uts/i86xpv/conf/Mapfile58
-rw-r--r--usr/src/uts/i86xpv/conf/Mapfile.amd6458
-rw-r--r--usr/src/uts/i86xpv/unix/dboot/Mapfile.dboot47
-rw-r--r--usr/src/uts/sparc/krtld/mapfile7
-rw-r--r--usr/src/uts/sun4/conf/Mapfile61
13 files changed, 305 insertions, 129 deletions
diff --git a/usr/src/uts/common/ctf/mapfile b/usr/src/uts/common/ctf/mapfile
index e76eebbae2..ca83165803 100644
--- a/usr/src/uts/common/ctf/mapfile
+++ b/usr/src/uts/common/ctf/mapfile
@@ -1,6 +1,5 @@
#
-# 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.
#
# CDDL HEADER START
#
@@ -36,7 +35,9 @@
# MAPFILE HEADER END
#
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
global:
ctf_add_array;
ctf_add_const;
diff --git a/usr/src/uts/common/io/sdcard/impl/mapfile b/usr/src/uts/common/io/sdcard/impl/mapfile
index f0182fdb17..6497bd4c6b 100644
--- a/usr/src/uts/common/io/sdcard/impl/mapfile
+++ b/usr/src/uts/common/io/sdcard/impl/mapfile
@@ -37,7 +37,9 @@
# MAPFILE HEADER END
#
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
global:
# consolidation private nexus interfaces
sda_host_init_ops;
diff --git a/usr/src/uts/common/zmod/mapfile b/usr/src/uts/common/zmod/mapfile
index bd1fdda29d..910dfb5e3a 100644
--- a/usr/src/uts/common/zmod/mapfile
+++ b/usr/src/uts/common/zmod/mapfile
@@ -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
#
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
global:
# public interfaces
z_compress;
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;
+ };
+};
diff --git a/usr/src/uts/i86pc/unix/dboot/Mapfile.dboot b/usr/src/uts/i86pc/unix/dboot/Mapfile.dboot
index f20c949687..5719183348 100644
--- a/usr/src/uts/i86pc/unix/dboot/Mapfile.dboot
+++ b/usr/src/uts/i86pc/unix/dboot/Mapfile.dboot
@@ -20,19 +20,28 @@
#
#
-# 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.
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
+$mapfile_version 2
-dboot = LOAD ?RWXO V0xC00000 P0xC00000 A0x1000;
-#
-# Make sure that dboot_grub.s`_start is the first thing in the dboot
-# .text segment, since when we boot that's where the boot loader will
-# start execution
-#
-dboot : .text : *dboot_grub.o;
-dboot : ?A;
+LOAD_SEGMENT dboot {
+ FLAGS = READ WRITE EXECUTE;
+ VADDR = 0xC00000;
+ PADDR = 0xC00000;
+ ALIGN = 0x1000;
+
+ #
+ # Make sure that dboot_grub.s`_start is the first thing in the dboot
+ # .text segment, since when we boot that's where the boot loader will
+ # start execution
+ #
+ ASSIGN_SECTION is_text {
+ IS_NAME = .text;
+ FILE_BASENAME = dboot_grub.o;
+ };
+ ASSIGN_SECTION is_alloc {
+ FLAGS = ALLOC;
+ };
+ IS_ORDER = is_text is_alloc;
+};
diff --git a/usr/src/uts/i86xpv/conf/Mapfile b/usr/src/uts/i86xpv/conf/Mapfile
index 8a33bc557e..e6e49e1bea 100644
--- a/usr/src/uts/i86xpv/conf/Mapfile
+++ b/usr/src/uts/i86xpv/conf/Mapfile
@@ -20,36 +20,62 @@
#
#
-# 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.
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
+$mapfile_version 2
#
# This is 1:1 mapped code to setup the kernel memory image.
# It needs to be after (in physical) the kernel bits, so that
# they have full 8 Meg of memory.
#
-dboot = LOAD ?RWXN P0x40800000 V0x40800000;
-dboot : .data : *dboot.o;
+LOAD_SEGMENT dboot {
+ FLAGS = READ WRITE EXECUTE;
+ NOHDR;
+ PADDR = 0x40800000;
+ VADDR = 0x40800000;
+ ASSIGN_SECTION {
+ IS_NAME = .data;
+ FILE_BASENAME = dboot.o;
+ };
+};
#
# kernel text segment
#
-text = LOAD ?RXN P0x40000000 V0xf4c00000;
-text | .text;
-text : $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+ FLAGS = READ EXECUTE;
+ NOHDR;
+ PADDR = 0x40000000;
+ VADDR = 0xf4c00000;
+ OS_ORDER = .text;
+ ASSIGN_SECTION {
+ TYPE = PROGBITS;
+ FLAGS = ALLOC !WRITE;
+ };
+};
#
# start the data segment on a new 4MB page boundary
#
-data = LOAD ?RWX P0x40400000 V0xf5000000;
-data | .data;
-data : $PROGBITS ?AW;
-data : $NOBITS ?AW;
+LOAD_SEGMENT data {
+ FLAGS = READ WRITE EXECUTE;
+ PADDR = 0x40400000;
+ VADDR = 0xf5000000;
+ 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/i86xpv/conf/Mapfile.amd64 b/usr/src/uts/i86xpv/conf/Mapfile.amd64
index 47f12ebea1..d5b18bfcd6 100644
--- a/usr/src/uts/i86xpv/conf/Mapfile.amd64
+++ b/usr/src/uts/i86xpv/conf/Mapfile.amd64
@@ -20,33 +20,59 @@
#
#
-# 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
#
# This is 1:1 mapped code to setup the kernel memory image.
# It needs to be after (in physical) the kernel bits, so that
# they have full 8 Meg of memory.
#
-dboot = LOAD ?RWXN P0x40800000 V0x40800000;
-dboot : .data : *dboot.o;
+LOAD_SEGMENT dboot {
+ FLAGS = READ WRITE EXECUTE;
+ NOHDR;
+ PADDR = 0x40800000;
+ VADDR = 0x40800000;
+ ASSIGN_SECTION {
+ IS_NAME = .data;
+ FILE_BASENAME = dboot.o;
+ };
+};
-text = LOAD ?RXN P0x40000000 V0xFFFFFFFFFB800000;
-text | .text;
-text : $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+ FLAGS = READ EXECUTE;
+ NOHDR;
+ PADDR = 0x40000000;
+ VADDR = 0xFFFFFFFFFB800000;
+ OS_ORDER = .text;
+ ASSIGN_SECTION {
+ TYPE = PROGBITS;
+ FLAGS = ALLOC !WRITE;
+ };
+};
#
# start the data segment on a new 4MB page boundary
#
-data = LOAD ?RWX P0x40400000 V0xFFFFFFFFFBC00000;
-data | .data;
-data : $PROGBITS ?AW;
-data : $NOBITS ?AW;
+LOAD_SEGMENT data {
+ FLAGS = READ WRITE EXECUTE;
+ PADDR = 0x40400000;
+ 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/i86xpv/unix/dboot/Mapfile.dboot b/usr/src/uts/i86xpv/unix/dboot/Mapfile.dboot
index 3c99a23825..955ce1e60c 100644
--- a/usr/src/uts/i86xpv/unix/dboot/Mapfile.dboot
+++ b/usr/src/uts/i86xpv/unix/dboot/Mapfile.dboot
@@ -20,23 +20,40 @@
#
#
-# 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.
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
+$mapfile_version 2
+LOAD_SEGMENT dboot {
+ NOHDR;
+ FLAGS = READ WRITE EXECUTE;
+ VADDR = 0x40800000;
+ PADDR = 0x40800000;
+ ALIGN = 0x1000;
-dboot = LOAD ?NRWXO V0x40800000 P0x40800000 A0x1000;
-#
-# Make sure that dboot_xen.s`_start is the first thing in the dboot
-# .text segment, since when we boot that's where the boot loader will
-# start execution
-#
-dboot : .text : *dboot_xen.o;
-dboot : $PROGBITS ?A;
-dboot : $NOBITS ?A;
+ #
+ # Make sure that dboot_xen.s`_start is the first thing in the dboot
+ # .text segment, since when we boot that's where the boot loader will
+ # start execution
+ #
+ ASSIGN_SECTION is_text {
+ IS_NAME = .text;
+ FILE_BASENAME = dboot_xen.o;
+ };
+ ASSIGN_SECTION is_progbits {
+ TYPE = PROGBITS;
+ FLAGS = ALLOC;
+ };
+ ASSIGN_SECTION is_nobits {
+ TYPE = NOBITS;
+ FLAGS = ALLOC;
+ };
+ IS_ORDER = is_text is_progbits is_nobits;
+};
-otherstuff : ?A;
+LOAD_SEGMENT otherstuff {
+ ASSIGN_SECTION {
+ FLAGS = ALLOC;
+ };
+};
diff --git a/usr/src/uts/sparc/krtld/mapfile b/usr/src/uts/sparc/krtld/mapfile
index 1c937c863e..23b7a3a40a 100644
--- a/usr/src/uts/sparc/krtld/mapfile
+++ b/usr/src/uts/sparc/krtld/mapfile
@@ -1,6 +1,5 @@
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
# CDDL HEADER START
#
@@ -36,7 +35,9 @@
# MAPFILE HEADER END
#
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
global:
kobj_addrcheck;
kobj_alloc;
diff --git a/usr/src/uts/sun4/conf/Mapfile b/usr/src/uts/sun4/conf/Mapfile
index 9a0dd0b984..124fbc080f 100644
--- a/usr/src/uts/sun4/conf/Mapfile
+++ b/usr/src/uts/sun4/conf/Mapfile
@@ -1,6 +1,5 @@
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
#
# CDDL HEADER START
#
@@ -20,37 +19,59 @@
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
+
+$mapfile_version 2
#
# Some four meg of kernel virtual address space
# is mapped via a locked 4-meg mapping in the ITLB
#
-text = LOAD ?RXN V0x01000000;
-text | .text;
-text : $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+ FLAGS = READ EXECUTE;
+ NOHDR;
+ VADDR = 0x01000000;
+ OS_ORDER = .text;
+ ASSIGN_SECTION {
+ TYPE = PROGBITS;
+ FLAGS = ALLOC !WRITE;
+ };
+};
#
# Another four meg of kernel virtual address space
# is mapped via a locked 4-meg mapping in the DTLB
#
-data = LOAD ?RWX V0x01800000 A0x00400000;
-data | .data;
-data : $PROGBITS ?AW;
-data : $NOBITS ?AW;
+LOAD_SEGMENT data {
+ FLAGS = READ WRITE EXECUTE;
+ VADDR = 0x01800000;
+ ALIGN = 0x00400000;
+ OS_ORDER = .data;
+ ASSIGN_SECTION {
+ TYPE = PROGBITS;
+ FLAGS = ALLOC WRITE;
+ };
+ ASSIGN_SECTION {
+ TYPE = NOBITS;
+ FLAGS = ALLOC WRITE;
+ };
+};
#
# put reloc seg in space between text and data
# it will be freed by the kernel after use
#
-reloc = LOAD ?RW V0x01402000;
-reloc : $DYNSYM;
-reloc : $HASH;
-reloc : .dynstr;
-reloc : .rela.text;
-reloc : .rela.data;
+LOAD_SEGMENT reloc {
+ FLAGS = READ WRITE;
+ VADDR = 0x01402000;
+ ASSIGN_SECTION { TYPE = DYNSYM };
+ ASSIGN_SECTION { TYPE = HASH };
+ ASSIGN_SECTION { IS_NAME = .dynstr };
+ ASSIGN_SECTION { IS_NAME = .rela.text };
+ ASSIGN_SECTION { IS_NAME = .rela.data };
+};
-note = NOTE;
-note : $NOTE;
+NOTE_SEGMENT note {
+ ASSIGN_SECTION {
+ TYPE = NOTE;
+ };
+};