Add support for x86-64-{2,3,4} target CPUs and pass -Ctarget-cpu=x86-…

…64-v2
rust-lang · Nov 14, 2020 · cca4102 · cca4102
1 parent f7801d6
commit cca4102
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -36,8 +36,8 @@
 	url = https://github.com/rust-lang/edition-guide.git
 [submodule "src/llvm-project"]
 	path = src/llvm-project
-	url = https://github.com/rust-lang/llvm-project.git
-	branch = rustc/11.0-2020-10-12
+	url = https://github.com/est31/llvm-project.git
+	branch = rustc/11.0-2020-11-14
 [submodule "src/doc/embedded-book"]
 	path = src/doc/embedded-book
 	url = https://github.com/rust-embedded/book.git

diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
@@ -149,7 +149,7 @@ impl Step for Rustc {
             target,
             cargo_subcommand(builder.kind),
         );
-        rustc_cargo(builder, &mut cargo, target);
+        rustc_cargo(builder, &mut cargo, target, compiler);
         if let Subcommand::Check { all_targets: true, .. } = builder.config.cmd {
             cargo.arg("--all-targets");
         }
@@ -215,7 +215,7 @@ impl Step for CodegenBackend {
         cargo
             .arg("--manifest-path")
             .arg(builder.src.join(format!("compiler/rustc_codegen_{}/Cargo.toml", backend)));
-        rustc_cargo_env(builder, &mut cargo, target);
+        rustc_cargo_env(builder, &mut cargo, target, compiler);
 
         run_cargo(
             builder,

diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
@@ -499,7 +499,7 @@ impl Step for Rustc {
         });
 
         let mut cargo = builder.cargo(compiler, Mode::Rustc, SourceType::InTree, target, "build");
-        rustc_cargo(builder, &mut cargo, target);
+        rustc_cargo(builder, &mut cargo, target, compiler);
 
         builder.info(&format!(
             "Building stage{} compiler artifacts ({} -> {})",
@@ -522,16 +522,16 @@ impl Step for Rustc {
     }
 }
 
-pub fn rustc_cargo(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelection) {
+pub fn rustc_cargo(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelection, compiler: Compiler) {
     cargo
         .arg("--features")
         .arg(builder.rustc_features())
         .arg("--manifest-path")
         .arg(builder.src.join("compiler/rustc/Cargo.toml"));
-    rustc_cargo_env(builder, cargo, target);
+    rustc_cargo_env(builder, cargo, target, compiler);
 }
 
-pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelection) {
+pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelection, compiler: Compiler) {
     // Set some configuration variables picked up by build scripts and
     // the compiler alike
     cargo
@@ -561,7 +561,11 @@ pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetS
     if builder.config.rust_verify_llvm_ir {
         cargo.env("RUSTC_VERIFY_LLVM_IR", "1");
     }
-
+    if target == "x86_64-unknown-linux-gnu" && compiler.stage > 0 {
+        if builder.is_rust_llvm(target) {
+            cargo.rustflag("-Ctarget-cpu=x86-64-v2");
+        }
+    }
     // Pass down configuration from the LLVM build into the build of
     // rustc_llvm and rustc_codegen_llvm.
     //
@@ -701,7 +705,7 @@ impl Step for CodegenBackend {
         cargo
             .arg("--manifest-path")
             .arg(builder.src.join(format!("compiler/rustc_codegen_{}/Cargo.toml", backend)));
-        rustc_cargo_env(builder, &mut cargo, target);
+        rustc_cargo_env(builder, &mut cargo, target, compiler);
 
         let tmp_stamp = out_dir.join(".tmp.stamp");
 

diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
@@ -527,7 +527,7 @@ impl Step for Rustc {
         cargo.rustdocflag("--document-private-items");
         cargo.rustdocflag("--enable-index-page");
         cargo.rustdocflag("-Zunstable-options");
-        compile::rustc_cargo(builder, &mut cargo, target);
+        compile::rustc_cargo(builder, &mut cargo, target, compiler);
 
         // Only include compiler crates, no dependencies of those, such as `libc`.
         cargo.arg("--no-deps");

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -1732,7 +1732,7 @@ impl Step for Crate {
             }
             Mode::Rustc => {
                 builder.ensure(compile::Rustc { compiler, target });
-                compile::rustc_cargo(builder, &mut cargo, target);
+                compile::rustc_cargo(builder, &mut cargo, target, compiler);
             }
             _ => panic!("can only test libraries"),
         };

diff --git a/src/llvm-project b/src/llvm-project
+4 −0		clang/docs/ReleaseNotes.rst
+9 −0		clang/docs/UsersManual.rst
+6 −0		clang/lib/Basic/Targets/X86.cpp
+4 −0		clang/test/CodeGen/attr-target-x86.c
+9 −0		clang/test/Driver/x86-march.c
+47 −0		clang/test/Driver/x86-mtune.c
+3 −2		clang/test/Misc/target-invalid-cpu-note.c
+54 −0		clang/test/Preprocessor/predefined-arch-macros-x86.c
+0 −15		clang/test/Preprocessor/predefined-arch-macros.c
+5 −0		clang/test/Sema/builtin-cpu-supports.c
+4 −0		llvm/include/llvm/Support/X86TargetParser.h
+15 −1		llvm/lib/Support/X86TargetParser.cpp
+27 −15		llvm/lib/Target/X86/X86.td
+5 −0		llvm/test/CodeGen/X86/cpus-other.ll