---

yaml
---
r: 106065
b: refs/heads/auto
c: c800c98
h: refs/heads/master
i:
  106063: e383245
v: v3

Author: bnoordhuis

[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: 3301223c99574d53bbdcd06ac85b3cec255128e0
+refs/heads/auto: c800c985740a0fcc2e978b346d3f3b9390850b7b
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/lib/llvm.rs

@@ -59,8 +59,6 @@ pub enum Linkage {
     ExternalWeakLinkage = 12,
     GhostLinkage = 13,
     CommonLinkage = 14,
-    LinkerPrivateLinkage = 15,
-    LinkerPrivateWeakLinkage = 16,
 }
 
 #[deriving(Clone)]

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

@@ -121,8 +121,6 @@ pub fn llvm_linkage_by_name(name: &str) -> Option<Linkage> {
         "extern_weak" => Some(lib::llvm::ExternalWeakLinkage),
         "external" => Some(lib::llvm::ExternalLinkage),
         "internal" => Some(lib::llvm::InternalLinkage),
-        "linker_private" => Some(lib::llvm::LinkerPrivateLinkage),
-        "linker_private_weak" => Some(lib::llvm::LinkerPrivateWeakLinkage),
         "linkonce" => Some(lib::llvm::LinkOnceAnyLinkage),
         "linkonce_odr" => Some(lib::llvm::LinkOnceODRLinkage),
         "private" => Some(lib::llvm::PrivateLinkage),