about summary refs log tree commit diff
path: root/compiler/rustc_codegen_gcc/example/std_example.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-03-07 22:07:56 +0000
committerbors <bors@rust-lang.org>2023-03-07 22:07:56 +0000
commit38b96553112dce3de630890701f17d86e265f6ba (patch)
tree0e794f9b5a65615f15fad3f3c47cae9eb3ecf0f2 /compiler/rustc_codegen_gcc/example/std_example.rs
parente3dfeeaa45f117281b19773d67f3f253de65cee1 (diff)
parentb0ec35362f7cb3a4a27af1af0a36b9359170ddfe (diff)
downloadrust-38b96553112dce3de630890701f17d86e265f6ba.tar.gz
rust-38b96553112dce3de630890701f17d86e265f6ba.zip
Auto merge of #108877 - matthiaskrgr:rollup-7gwgvgc, r=matthiaskrgr
Rollup of 7 pull requests

Successful merges:

 - #108460 (migrate `rustc_hir_analysis` to session diagnostic [Part Two])
 - #108581 (Add a new config flag, dist.include-mingw-linker.)
 - #108583 (Account for binders correctly when adding default RPITIT method assumption)
 - #108783 (Sync rustc_codegen_gcc 2023/03/04)
 - #108793 (Append to existing `PYTHONPATH` in compiletest instead of overwriting)
 - #108822 (Remove references to PassManagerBuilder)
 - #108866 (Force to use the stage 2 compiler  when config.download_rustc is set)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc/example/std_example.rs')
-rw-r--r--compiler/rustc_codegen_gcc/example/std_example.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_gcc/example/std_example.rs b/compiler/rustc_codegen_gcc/example/std_example.rs
index 31069058aea..5c171c49fd1 100644
--- a/compiler/rustc_codegen_gcc/example/std_example.rs
+++ b/compiler/rustc_codegen_gcc/example/std_example.rs
@@ -1,5 +1,6 @@
 #![feature(core_intrinsics, generators, generator_trait, is_sorted)]
 
+#[cfg(feature="master")]
 use std::arch::x86_64::*;
 use std::io::Write;
 use std::ops::Generator;