---

yaml
---
r: 82697
b: refs/heads/auto
c: 09a5338
h: refs/heads/master
i:
  82695: 4811a1d
v: v3

Author: alexcrichton

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 2aadd3652dbbfa1179eea57091b0de2dc87006a4
+refs/heads/auto: 09a53381974bcf42c0b081cbfcd9f20f1e5d4f04
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/trans/base.rs

@@ -2544,10 +2544,6 @@ pub fn get_item_val(ccx: @mut CrateContext, id: ast::NodeId) -> ValueRef {
                                     llvm::LLVMAddGlobal(ccx.llmod, llty, buf)
                                 };
 
-                                if !*ccx.sess.building_library {
-                                    lib::llvm::SetLinkage(g, lib::llvm::InternalLinkage);
-                                }
-
                                 // Apply the `unnamed_addr` attribute if
                                 // requested
                                 if attr::contains_name(i.attrs,
@@ -3062,18 +3058,31 @@ pub fn write_metadata(cx: &mut CrateContext, crate: &ast::Crate) {
     }
 }
 
-// Writes the current ABI version into the crate.
-pub fn write_abi_version(ccx: &mut CrateContext) {
+fn mk_global(ccx: &CrateContext,
+             name: &str,
+             llval: ValueRef,
+             internal: bool)
+          -> ValueRef {
     unsafe {
-        let llval = C_uint(ccx, abi::abi_version);
-        let llglobal = do "rust_abi_version".with_c_str |buf| {
+        let llglobal = do name.with_c_str |buf| {
             llvm::LLVMAddGlobal(ccx.llmod, val_ty(llval).to_ref(), buf)
         };
         llvm::LLVMSetInitializer(llglobal, llval);
         llvm::LLVMSetGlobalConstant(llglobal, True);
+
+        if internal {
+            lib::llvm::SetLinkage(llglobal, lib::llvm::InternalLinkage);
+        }
+
+        return llglobal;
     }
 }
 
+// Writes the current ABI version into the crate.
+pub fn write_abi_version(ccx: &mut CrateContext) {
+    mk_global(ccx, "rust_abi_version", C_uint(ccx, abi::abi_version), false);
+}
+
 pub fn trans_crate(sess: session::Session,
                    crate: &ast::Crate,
                    analysis: &CrateAnalysis,

branches/auto/src/libsyntax/ext/expand.rs

@@ -1006,26 +1006,6 @@ pub fn std_macros() -> @str {
         }
     )
 
-    // NOTE(acrichto): start removing this after the next snapshot
-    macro_rules! printf (
-        ($arg:expr) => (
-            print(fmt!(\"%?\", $arg))
-        );
-        ($( $arg:expr ),+) => (
-            print(fmt!($($arg),+))
-        )
-    )
-
-    // NOTE(acrichto): start removing this after the next snapshot
-    macro_rules! printfln (
-        ($arg:expr) => (
-            println(fmt!(\"%?\", $arg))
-        );
-        ($( $arg:expr ),+) => (
-            println(fmt!($($arg),+))
-        )
-    )
-
     macro_rules! format(($($arg:tt)*) => (
         format_args!(::std::fmt::format, $($arg)*)
     ))