diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2014-03-16 14:39:51 +0100 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-03-18 13:49:09 -0700 |
| commit | c800c985740a0fcc2e978b346d3f3b9390850b7b (patch) | |
| tree | fcd1772ec0e10bc98f8ec06d8fd5afad66b54b1d | |
| parent | 3301223c99574d53bbdcd06ac85b3cec255128e0 (diff) | |
| download | rust-c800c985740a0fcc2e978b346d3f3b9390850b7b.tar.gz rust-c800c985740a0fcc2e978b346d3f3b9390850b7b.zip | |
rustc: remove linker_private/linker_private_weak
Remove the linker_private and linker_private_weak linkage attributes, they have been superseded by private and private_weak and have been removed in upstream LLVM in commit r203866.
| -rw-r--r-- | src/librustc/lib/llvm.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/trans/foreign.rs | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/librustc/lib/llvm.rs b/src/librustc/lib/llvm.rs index 448b9e30dcd..8cfe08dc975 100644 --- a/src/librustc/lib/llvm.rs +++ b/src/librustc/lib/llvm.rs @@ -59,8 +59,6 @@ pub enum Linkage { ExternalWeakLinkage = 12, GhostLinkage = 13, CommonLinkage = 14, - LinkerPrivateLinkage = 15, - LinkerPrivateWeakLinkage = 16, } #[deriving(Clone)] diff --git a/src/librustc/middle/trans/foreign.rs b/src/librustc/middle/trans/foreign.rs index fdc33666e8a..7f6781096f5 100644 --- a/src/librustc/middle/trans/foreign.rs +++ b/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), |