about summary refs log tree commit diff
diff options
context:
space:
mode:
authorKevin Murphy <kemurphy.cmu@gmail.com>2013-07-22 22:34:04 -0400
committerKevin Murphy <kemurphy.cmu@gmail.com>2013-07-22 22:34:04 -0400
commit64ff30a4f093480abbc2f29fd1379e28e0801c29 (patch)
tree9a920795391ad842f0c36b2b2897bbdcd0ab0d0a
parent74f4badcab30c91b018f308d2c44641abed7d732 (diff)
downloadrust-64ff30a4f093480abbc2f29fd1379e28e0801c29.tar.gz
rust-64ff30a4f093480abbc2f29fd1379e28e0801c29.zip
Add link_section attribute for static and fn items
This allows for control over the section placement of static, static
mut, and fn items.  One caveat is that if a static and a static mut are
placed in the same section, the static is declared first, and the static
mut is assigned to, the generated program crashes.  For example:

#[link_section=".boot"]
static foo : uint = 0xdeadbeef;

#[link_section=".boot"]
static mut bar : uint = 0xcafebabe;

Declaring bar first would mark .bootdata as writable, preventing the
crash when bar is written to.
-rw-r--r--src/librustc/middle/trans/base.rs11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs
index da92e76e199..7e8806aa58b 100644
--- a/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@@ -2456,7 +2456,7 @@ pub fn get_item_val(ccx: @mut CrateContext, id: ast::node_id) -> ValueRef {
         let val = match item {
           ast_map::node_item(i, pth) => {
             let my_path = vec::append((*pth).clone(), [path_name(i.ident)]);
-            match i.node {
+            let v = match i.node {
               ast::item_static(_, m, expr) => {
                 let typ = ty::node_id_to_type(ccx.tcx, i.id);
                 let s = mangle_exported_name(ccx, my_path, typ);
@@ -2488,7 +2488,16 @@ pub fn get_item_val(ccx: @mut CrateContext, id: ast::node_id) -> ValueRef {
                 llfn
               }
               _ => fail!("get_item_val: weird result in table")
+            };
+            match (attr::first_attr_value_str_by_name(i.attrs, "link_section")) {
+                Some(sect) => unsafe {
+                    do sect.as_c_str |buf| {
+                        llvm::LLVMSetSection(v, buf);
+                    }
+                },
+                None => ()
             }
+            v
           }
           ast_map::node_trait_method(trait_method, _, pth) => {
             debug!("get_item_val(): processing a node_trait_method");