about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2016-05-07 15:35:18 -0400
committerSteve Klabnik <steve@steveklabnik.com>2016-05-07 15:35:18 -0400
commitf569b59fdf7575fc0c7a3a1ca9b30601a101f734 (patch)
treeb97c11fc457088a36d34fec4e648a8b719ba6503
parentaec36f61a02671e4239fbece4e66f15a709870f5 (diff)
parenta22ca2872ef6782306012e6817dc4b8b778c43e9 (diff)
downloadrust-f569b59fdf7575fc0c7a3a1ca9b30601a101f734.tar.gz
rust-f569b59fdf7575fc0c7a3a1ca9b30601a101f734.zip
Rollup merge of #33430 - phil-opp:patch-1, r=alexcrichton
[Doc] Default cpu is "generic" (and not "default")

See [line 305](https://github.com/phil-opp/rust/blob/a22ca2872ef6782306012e6817dc4b8b778c43e9/src/librustc_back/target/mod.rs#L305).
-rw-r--r--src/librustc_back/target/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
index 739107afcbd..c2b86ce28f6 100644
--- a/src/librustc_back/target/mod.rs
+++ b/src/librustc_back/target/mod.rs
@@ -202,7 +202,7 @@ pub struct TargetOptions {
     pub post_link_args: Vec<String>,
 
     /// Default CPU to pass to LLVM. Corresponds to `llc -mcpu=$cpu`. Defaults
-    /// to "default".
+    /// to "generic".
     pub cpu: String,
     /// Default target features to pass to LLVM. These features will *always* be
     /// passed, and cannot be disabled even via `-C`. Corresponds to `llc