Move the libgccjit.so file in a target directory

compiler/rustc_codegen_gcc/src/lib.rs

@@ -98,6 +98,7 @@ use rustc_middle::ty::TyCtxt;
 use rustc_middle::util::Providers;
 use rustc_session::Session;
 use rustc_session::config::{OptLevel, OutputFilenames};
+use rustc_session::filesearch::make_target_lib_path;
 use rustc_span::Symbol;
 use rustc_target::spec::{Arch, RelocModel};
 use tempfile::TempDir;
@@ -181,18 +182,12 @@ pub struct GccCodegenBackend {
 
 static LTO_SUPPORTED: AtomicBool = AtomicBool::new(false);
 
-fn libgccjit_path(sysroot_path: &Path) -> PathBuf {
- let sysroot_lib_dir = sysroot_path.join("lib");
- sysroot_lib_dir.join("libgccjit.so")
-}
-
-fn load_libgccjit_if_needed(sysroot_path: &Path) {
+fn load_libgccjit_if_needed(libgccjit_target_lib_file: &Path) {
  if gccjit::is_loaded() {
  // Do not load a libgccjit second time.
  return;
  }
 
- let libgccjit_target_lib_file = libgccjit_path(sysroot_path);
  let path = libgccjit_target_lib_file.to_str().expect("libgccjit path");
 
  let string = CString::new(path).expect("string to libgccjit path");
@@ -216,9 +211,10 @@ impl CodegenBackend for GccCodegenBackend {
  // invalid.
  // This is the case for instance in Rust for Linux where they specify --sysroot=/dev/null.
  for path in sess.opts.sysroot.all_paths() {
- let libgccjit_target_lib_file = libgccjit_path(path);
- if let Ok(true) = fs::exists(libgccjit_target_lib_file) {
- load_libgccjit_if_needed(path);
+ let libgccjit_target_lib_file =
+ make_target_lib_path(path, &sess.target.llvm_target).join("libgccjit.so");
+ if let Ok(true) = fs::exists(&libgccjit_target_lib_file) {
+ load_libgccjit_if_needed(&libgccjit_target_lib_file);
  break;
  }
  }

src/bootstrap/src/core/build_steps/gcc.rs

@@ -27,6 +27,7 @@ pub struct Gcc {
 #[derive(Clone)]
 pub struct GccOutput {
  pub libgccjit: PathBuf,
+ target: TargetSelection,
 }
 
 impl GccOutput {
@@ -46,7 +47,9 @@ impl GccOutput {
  format!("Cannot find libgccjit at {}", self.libgccjit.display())
  );
 
- let dst = directory.join(target_filename);
+ let dest_dir = directory.join("rustlib").join(self.target).join("lib");
+ t!(fs::create_dir_all(&dest_dir));
+ let dst = dest_dir.join(target_filename);
  builder.copy_link(&actual_libgccjit_path, &dst, FileType::NativeLibrary);
  }
 }
@@ -70,7 +73,7 @@ impl Step for Gcc {
 
  // If GCC has already been built, we avoid building it again.
  let metadata = match get_gcc_build_status(builder, target) {
- GccBuildStatus::AlreadyBuilt(path) => return GccOutput { libgccjit: path },
+ GccBuildStatus::AlreadyBuilt(path) => return GccOutput { libgccjit: path, target },
  GccBuildStatus::ShouldBuild(m) => m,
  };
 
@@ -80,14 +83,14 @@ impl Step for Gcc {
 
  let libgccjit_path = libgccjit_built_path(&metadata.install_dir);
  if builder.config.dry_run() {
- return GccOutput { libgccjit: libgccjit_path };
+ return GccOutput { libgccjit: libgccjit_path, target };
  }
 
  build_gcc(&metadata, builder, target);
 
  t!(metadata.stamp.write());
 
- GccOutput { libgccjit: libgccjit_path }
+ GccOutput { libgccjit: libgccjit_path, target }
  }
 }
 

tests/mir-opt/inline/inline_instruction_set.rs

@@ -4,6 +4,7 @@
 //
 //@ compile-flags: --target thumbv4t-none-eabi
 //@ needs-llvm-components: arm
+//@ ignore-backends: gcc
 
 #![crate_type = "lib"]
 #![feature(rustc_attrs)]

tests/ui/check-cfg/values-target-json.rs

@@ -5,6 +5,7 @@
 //@ no-auto-check-cfg
 //@ needs-llvm-components: x86
 //@ compile-flags: --crate-type=lib --check-cfg=cfg() --target={{src-base}}/check-cfg/my-awesome-platform.json
+//@ ignore-backends: gcc
 
 #![feature(lang_items, no_core, auto_traits, rustc_attrs)]
 #![no_core]

tests/ui/cmse-nonsecure/cmse-nonsecure-call/generics.rs

@@ -1,6 +1,7 @@
 //@ add-minicore
 //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
 //@ needs-llvm-components: arm
+//@ ignore-backends: gcc
 #![feature(abi_cmse_nonsecure_call, no_core, lang_items)]
 #![no_core]
 

tests/ui/cmse-nonsecure/cmse-nonsecure-call/generics.stderr

@@ -1,11 +1,11 @@
 error: function pointer types may not have generic parameters
- --> $DIR/generics.rs:14:40
+ --> $DIR/generics.rs:15:40
  |
 LL | f1: extern "cmse-nonsecure-call" fn<U: Copy>(U, u32, u32, u32) -> u64,
  | ^^^^^^^^^
 
 error[E0425]: cannot find type `U` in this scope
- --> $DIR/generics.rs:14:50
+ --> $DIR/generics.rs:15:50
  |
 LL | struct Test<T: Copy> {
  | - similarly named type parameter `T` defined here
@@ -23,51 +23,51 @@ LL | struct Test<T: Copy, U> {
  | +++
 
 error[E0562]: `impl Trait` is not allowed in `fn` pointer parameters
- --> $DIR/generics.rs:17:41
+ --> $DIR/generics.rs:18:41
  |
 LL | f2: extern "cmse-nonsecure-call" fn(impl Copy, u32, u32, u32) -> impl Copy,
  | ^^^^^^^^^
  |
  = note: `impl Trait` is only allowed in arguments and return types of functions and methods
 
 error[E0562]: `impl Trait` is not allowed in `fn` pointer return types
- --> $DIR/generics.rs:17:70
+ --> $DIR/generics.rs:18:70
  |
 LL | f2: extern "cmse-nonsecure-call" fn(impl Copy, u32, u32, u32) -> impl Copy,
  | ^^^^^^^^^
  |
  = note: `impl Trait` is only allowed in arguments and return types of functions and methods
 
 error[E0562]: `impl Trait` is not allowed in `fn` pointer parameters
- --> $DIR/generics.rs:20:42
+ --> $DIR/generics.rs:21:42
  |
 LL | f3: extern "cmse-nonsecure-call" fn((impl Copy, u32), u32, u32, u32) -> (impl Copy, u32),
  | ^^^^^^^^^
  |
  = note: `impl Trait` is only allowed in arguments and return types of functions and methods
 
 error[E0562]: `impl Trait` is not allowed in `fn` pointer return types
- --> $DIR/generics.rs:20:78
+ --> $DIR/generics.rs:21:78
  |
 LL | f3: extern "cmse-nonsecure-call" fn((impl Copy, u32), u32, u32, u32) -> (impl Copy, u32),
  | ^^^^^^^^^
  |
  = note: `impl Trait` is only allowed in arguments and return types of functions and methods
 
 error[E0798]: generics are not allowed in `extern "cmse-nonsecure-call"` signatures
- --> $DIR/generics.rs:23:41
+ --> $DIR/generics.rs:24:41
  |
 LL | f4: extern "cmse-nonsecure-call" fn(T, u32, u32, u32) -> u64,
  | ^
 
 error[E0798]: generics are not allowed in `extern "cmse-nonsecure-call"` signatures
- --> $DIR/generics.rs:24:41
+ --> $DIR/generics.rs:25:41
  |
 LL | f5: extern "cmse-nonsecure-call" fn(Wrapper<T>, u32, u32, u32) -> u64,
  | ^^^^^^^^^^
 
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/generics.rs:30:71
+ --> $DIR/generics.rs:31:71
  |
 LL | type WithTraitObject = extern "cmse-nonsecure-call" fn(&dyn Trait) -> &dyn Trait;
  | ^^^^^^^^^^ this type doesn't fit in the available registers
@@ -76,7 +76,7 @@ LL | type WithTraitObject = extern "cmse-nonsecure-call" fn(&dyn Trait) -> &dyn
  = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
 
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/generics.rs:34:60
+ --> $DIR/generics.rs:35:60
  |
 LL | extern "cmse-nonsecure-call" fn(&'static dyn Trait) -> &'static dyn Trait;
  | ^^^^^^^^^^^^^^^^^^ this type doesn't fit in the available registers
@@ -85,7 +85,7 @@ LL | extern "cmse-nonsecure-call" fn(&'static dyn Trait) -> &'static dyn Tra
  = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
 
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/generics.rs:41:60
+ --> $DIR/generics.rs:42:60
  |
 LL | extern "cmse-nonsecure-call" fn(WrapperTransparent) -> WrapperTransparent;
  | ^^^^^^^^^^^^^^^^^^ this type doesn't fit in the available registers
@@ -94,7 +94,7 @@ LL | extern "cmse-nonsecure-call" fn(WrapperTransparent) -> WrapperTranspare
  = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
 
 error[E0045]: C-variadic functions with the "cmse-nonsecure-call" calling convention are not supported
- --> $DIR/generics.rs:44:20
+ --> $DIR/generics.rs:45:20
  |
 LL | type WithVarArgs = extern "cmse-nonsecure-call" fn(u32, ...);
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C-variadic function must have a compatible calling convention

tests/ui/cmse-nonsecure/cmse-nonsecure-call/infer.rs

@@ -1,6 +1,7 @@
 //@ add-minicore
 //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
 //@ needs-llvm-components: arm
+//@ ignore-backends: gcc
 #![feature(abi_cmse_nonsecure_call, no_core, lang_items)]
 #![no_core]
 

tests/ui/cmse-nonsecure/cmse-nonsecure-call/infer.stderr

@@ -1,23 +1,23 @@
 error[E0282]: type annotations needed
- --> $DIR/infer.rs:16:13
+ --> $DIR/infer.rs:17:13
  |
 LL | let _ = mem::transmute::<fn() -> _, extern "cmse-nonsecure-call" fn() -> _>;
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type of the type parameter `Src` declared on the function `transmute`
 
 error[E0282]: type annotations needed
- --> $DIR/infer.rs:21:13
+ --> $DIR/infer.rs:22:13
  |
 LL | let _ = mem::transmute::<fn() -> (i32, _), extern "cmse-nonsecure-call" fn() -> (i32, _)>;
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type of the type parameter `Src` declared on the function `transmute`
 
 error[E0282]: type annotations needed
- --> $DIR/infer.rs:26:13
+ --> $DIR/infer.rs:27:13
  |
 LL | let _ = mem::transmute::<fn(_: _) -> (), extern "cmse-nonsecure-call" fn(_: _) -> ()>;
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type of the type parameter `Src` declared on the function `transmute`
 
 error[E0282]: type annotations needed
- --> $DIR/infer.rs:32:9
+ --> $DIR/infer.rs:33:9
  |
 LL | mem::transmute::<fn(_: (i32, _)) -> (), extern "cmse-nonsecure-call" fn(_: (i32, _)) -> ()>;
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type of the type parameter `Src` declared on the function `transmute`

tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-via-stack.rs

@@ -1,6 +1,7 @@
 //@ add-minicore
 //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
 //@ needs-llvm-components: arm
+//@ ignore-backends: gcc
 #![feature(abi_cmse_nonsecure_call, no_core, lang_items)]
 #![no_core]
 

tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-via-stack.stderr

@@ -1,5 +1,5 @@
 error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/params-via-stack.rs:16:64
+ --> $DIR/params-via-stack.rs:17:64
  |
 LL | f1: extern "cmse-nonsecure-call" fn(u32, u32, u32, u32, x: u32, y: u32),
  | ^^^ ^^^ does not fit in the available registers
@@ -9,31 +9,31 @@ LL | f1: extern "cmse-nonsecure-call" fn(u32, u32, u32, u32, x: u32, y: u32)
  = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/params-via-stack.rs:17:61
+ --> $DIR/params-via-stack.rs:18:61
  |
 LL | f2: extern "cmse-nonsecure-call" fn(u32, u32, u32, u16, u16),
  | ^^^ does not fit in the available registers
  |
  = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/params-via-stack.rs:18:51
+ --> $DIR/params-via-stack.rs:19:51
  |
 LL | f3: extern "cmse-nonsecure-call" fn(u32, u64, u32),
  | ^^^ does not fit in the available registers
  |
  = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/params-via-stack.rs:19:56
+ --> $DIR/params-via-stack.rs:20:56
  |
 LL | f4: extern "cmse-nonsecure-call" fn(AlignRelevant, u32),
  | ^^^ does not fit in the available registers
  |
  = note: functions with the `"cmse-nonsecure-call"` ABI must pass all their arguments via the 4 32-bit argument registers
 
 error[E0798]: arguments for `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/params-via-stack.rs:20:41
+ --> $DIR/params-via-stack.rs:21:41
  |
 LL | f5: extern "cmse-nonsecure-call" fn([u32; 5]),
  | ^^^^^^^^ does not fit in the available registers

tests/ui/cmse-nonsecure/cmse-nonsecure-call/return-via-stack.rs

@@ -2,6 +2,7 @@
 //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
 //@ needs-llvm-components: arm
 //@ add-minicore
+//@ ignore-backends: gcc
 
 #![feature(abi_cmse_nonsecure_call, no_core, lang_items)]
 #![no_core]

tests/ui/cmse-nonsecure/cmse-nonsecure-call/return-via-stack.stderr

@@ -1,5 +1,5 @@
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/return-via-stack.rs:36:48
+ --> $DIR/return-via-stack.rs:37:48
  |
 LL | u128: extern "cmse-nonsecure-call" fn() -> u128,
  | ^^^^ this type doesn't fit in the available registers
@@ -8,7 +8,7 @@ LL | u128: extern "cmse-nonsecure-call" fn() -> u128,
  = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
 
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/return-via-stack.rs:37:48
+ --> $DIR/return-via-stack.rs:38:48
  |
 LL | i128: extern "cmse-nonsecure-call" fn() -> i128,
  | ^^^^ this type doesn't fit in the available registers
@@ -17,7 +17,7 @@ LL | i128: extern "cmse-nonsecure-call" fn() -> i128,
  = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
 
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/return-via-stack.rs:26:46
+ --> $DIR/return-via-stack.rs:27:46
  |
 LL | f1: extern "cmse-nonsecure-call" fn() -> ReprCU64,
  | ^^^^^^^^ this type doesn't fit in the available registers
@@ -26,7 +26,7 @@ LL | f1: extern "cmse-nonsecure-call" fn() -> ReprCU64,
  = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
 
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/return-via-stack.rs:27:46
+ --> $DIR/return-via-stack.rs:28:46
  |
 LL | f2: extern "cmse-nonsecure-call" fn() -> ReprCBytes,
  | ^^^^^^^^^^ this type doesn't fit in the available registers
@@ -35,7 +35,7 @@ LL | f2: extern "cmse-nonsecure-call" fn() -> ReprCBytes,
  = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
 
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/return-via-stack.rs:28:46
+ --> $DIR/return-via-stack.rs:29:46
  |
 LL | f3: extern "cmse-nonsecure-call" fn() -> U64Compound,
  | ^^^^^^^^^^^ this type doesn't fit in the available registers
@@ -44,7 +44,7 @@ LL | f3: extern "cmse-nonsecure-call" fn() -> U64Compound,
  = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
 
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/return-via-stack.rs:29:46
+ --> $DIR/return-via-stack.rs:30:46
  |
 LL | f4: extern "cmse-nonsecure-call" fn() -> ReprCAlign16,
  | ^^^^^^^^^^^^ this type doesn't fit in the available registers
@@ -53,7 +53,7 @@ LL | f4: extern "cmse-nonsecure-call" fn() -> ReprCAlign16,
  = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
 
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/return-via-stack.rs:30:46
+ --> $DIR/return-via-stack.rs:31:46
  |
 LL | f5: extern "cmse-nonsecure-call" fn() -> [u8; 5],
  | ^^^^^^^ this type doesn't fit in the available registers
@@ -62,7 +62,7 @@ LL | f5: extern "cmse-nonsecure-call" fn() -> [u8; 5],
  = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
 
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/return-via-stack.rs:52:46
+ --> $DIR/return-via-stack.rs:53:46
  |
 LL | f1: extern "cmse-nonsecure-call" fn() -> ReprRustUnionU64,
  | ^^^^^^^^^^^^^^^^ this type doesn't fit in the available registers
@@ -71,7 +71,7 @@ LL | f1: extern "cmse-nonsecure-call" fn() -> ReprRustUnionU64,
  = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size
 
 error[E0798]: return value of `"cmse-nonsecure-call"` function too large to pass via registers
- --> $DIR/return-via-stack.rs:53:46
+ --> $DIR/return-via-stack.rs:54:46
  |
 LL | f2: extern "cmse-nonsecure-call" fn() -> ReprCUnionU64,
  | ^^^^^^^^^^^^^ this type doesn't fit in the available registers

tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs

@@ -2,6 +2,7 @@
 //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
 //@ incremental (required to trigger the bug)
 //@ needs-llvm-components: arm
+//@ ignore-backends: gcc
 #![feature(abi_cmse_nonsecure_call, no_core)]
 #![no_core]
 

tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.stderr

@@ -1,5 +1,5 @@
 error[E0261]: use of undeclared lifetime name `'a`
- --> $DIR/undeclared-lifetime.rs:15:43
+ --> $DIR/undeclared-lifetime.rs:16:43
  |
 LL | id::<extern "cmse-nonsecure-call" fn(&'a ())>(PhantomData);
  | ^^ undeclared lifetime