Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

subtree update cg_gcc 2023/10/25 #117253

Merged
merged 48 commits into from
Oct 28, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
242a482
Merge commit '11a0cceab966e5ff1058ddbcab5977e8a1d6d290' into subtree-…
antoyo Oct 9, 2023
22e6f6c
Fix checks
antoyo Oct 9, 2023
ba103e3
Use IntoDynSyncSend
antoyo Oct 9, 2023
cf8c391
Add comment
antoyo Oct 10, 2023
9030b70
Update libgccjit
antoyo Oct 11, 2023
100dfce
Fix #[inline(always)] attribute
antoyo Oct 12, 2023
e3998b2
Handle unsigned comparison for signed integers
antoyo Oct 12, 2023
e1cb818
docs: add Rust logo to more compiler crates
notriddle Oct 16, 2023
e2f32c7
Ignore failing test
antoyo Oct 17, 2023
4dce75f
Merge pull request #352 from rust-lang/update-libgccjit
antoyo Oct 17, 2023
096f14d
Add support for NonNull function attribute
GuillaumeGomez Sep 4, 2023
0348a5f
Improve code readability
GuillaumeGomez Oct 17, 2023
64abf58
optimize popcount implementation
sadlerap Oct 6, 2023
c80fb4a
Merge pull request #326 from GuillaumeGomez/non-null
antoyo Oct 17, 2023
fabdc1a
Merge pull request #348 from sadlerap/optimize-popcount
antoyo Oct 18, 2023
e5fa9f8
Use the correct alignment for integer types
antoyo Oct 7, 2023
9d5e0ba
Fixes including fixing compilation for --no-default-features
antoyo Oct 17, 2023
d64662f
Merge pull request #353 from rust-lang/fix/int-types-alignment
antoyo Oct 18, 2023
99bc37e
Refactor CI scripts to have a different file for libgccjit 12
antoyo May 22, 2023
c7679c4
Revome llvm-14-tools from failures CI
antoyo Oct 18, 2023
a9f31ab
Merge pull request #355 from rust-lang/refactor-ci
antoyo Oct 19, 2023
81c1f39
optimize u128/i128 popcounts further
sadlerap Oct 18, 2023
2096606
Merge pull request #354 from sadlerap/popcount-128-bits
antoyo Oct 19, 2023
67b28ac
s/Generator/Coroutine/
oli-obk Oct 19, 2023
a690467
s/generator/coroutine/
oli-obk Oct 19, 2023
7425c56
Add comment
antoyo Sep 6, 2023
16b3da8
Merge pull request #346 from rust-lang/fix/endianness
antoyo Oct 22, 2023
fcd336b
Add basics for `test` command in build system
GuillaumeGomez Oct 24, 2023
0b6e133
Fix to be able to use a target specification JSON file and document t…
antoyo Oct 24, 2023
46887f2
Merge pull request #364 from rust-lang/doc/target-spec
antoyo Oct 24, 2023
a93d1b7
Fix volatile_load
antoyo Oct 24, 2023
3d9c8af
Merge pull request #365 from rust-lang/fix/volatile-load
antoyo Oct 25, 2023
c15ad9e
Regenerate intrinsics mapping
GuillaumeGomez Oct 25, 2023
783789f
Build the sysroot and run more tests
antoyo Oct 19, 2023
47bac1f
Merge pull request #357 from rust-lang/fix/gcc-12
antoyo Oct 25, 2023
d4a74fb
Merge pull request #363 from GuillaumeGomez/test-command
antoyo Oct 25, 2023
8329a35
Merge pull request #369 from GuillaumeGomez/regen-intrinsics
antoyo Oct 25, 2023
4d66cd8
Merge branch 'master' into sync_from_rust_2023_10_25
antoyo Oct 26, 2023
42e3705
Fix rebase
antoyo Oct 26, 2023
9efb4ce
Update to nightly-2023-10-25
antoyo Oct 26, 2023
c12ac7e
Fix warning
antoyo Oct 26, 2023
2a2b3ea
Remove duplication in CI
antoyo Oct 26, 2023
a6984f5
Fix tests
antoyo Oct 26, 2023
e4fe941
Merge pull request #371 from rust-lang/sync_from_rust_2023_10_25
antoyo Oct 26, 2023
c797ccc
Merge commit 'e4fe941b11a55c5005630696e9b6d81c65f7bd04' into subtree-…
antoyo Oct 26, 2023
eb10fa3
Fix build scripts
GuillaumeGomez Oct 27, 2023
09ce29d
Merge pull request #375 from GuillaumeGomez/fix-build-scripts
antoyo Oct 27, 2023
f0aaf2f
Merge commit '09ce29d0591a21e1abae22eac4d41ffd32993af8' into subtree-…
antoyo Oct 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,12 @@ generate it in [gimple.md](./doc/gimple.md).
* Set the path to the cross-compiling libgccjit in `gcc_path`.
* Make sure you have the linker for your target (for instance `m68k-unknown-linux-gnu-gcc`) in your `$PATH`. Currently, the linker name is hardcoded as being `$TARGET-gcc`. Specify the target when building the sysroot: `./y.sh build --target-triple m68k-unknown-linux-gnu`.
* Build your project by specifying the target: `OVERWRITE_TARGET_TRIPLE=m68k-unknown-linux-gnu ../cargo.sh build --target m68k-unknown-linux-gnu`.
* If the target is not yet supported by the Rust compiler, create a [target specification file](https://docs.rust-embedded.org/embedonomicon/custom-target.html) (note that the `arch` specified in this file must be supported by the rust compiler).

If the target is not yet supported by the Rust compiler, create a [target specification file](https://docs.rust-embedded.org/embedonomicon/custom-target.html) (note that the `arch` specified in this file must be supported by the rust compiler).
Then, you can use it the following way:

* Add the target specification file using `--target` as an **absolute** path to build the sysroot: `./y.sh build --target-triple m68k-unknown-linux-gnu --target $(pwd)/m68k-unknown-linux-gnu.json`
* Build your project by specifying the target specification file: `OVERWRITE_TARGET_TRIPLE=m68k-unknown-linux-gnu ../cargo.sh build --target path/to/m68k-unknown-linux-gnu.json`.

If you get the following error:

Expand Down
23 changes: 16 additions & 7 deletions build_system/src/build.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::config::set_config;
use crate::config::{set_config, ConfigInfo};
use crate::utils::{
get_gcc_path, run_command, run_command_with_output_and_env, walk_dir,
};
Expand Down Expand Up @@ -55,6 +55,15 @@ impl BuildArg {
);
}
}
"--target" => {
if args.next().is_some() {
// Handled in config.rs.
} else {
return Err(
"Expected a value after `--target`, found nothing".to_string()
);
}
}
arg => return Err(format!("Unknown argument `{}`", arg)),
}
}
Expand All @@ -80,7 +89,7 @@ impl BuildArg {
fn build_sysroot(
env: &mut HashMap<String, String>,
release_mode: bool,
target_triple: &str,
config: &ConfigInfo,
) -> Result<(), String> {
std::env::set_current_dir("build_sysroot")
.map_err(|error| format!("Failed to go to `build_sysroot` directory: {:?}", error))?;
Expand Down Expand Up @@ -143,7 +152,7 @@ fn build_sysroot(
&"cargo",
&"build",
&"--target",
&target_triple,
&config.target,
&"--release",
],
None,
Expand All @@ -156,7 +165,7 @@ fn build_sysroot(
&"cargo",
&"build",
&"--target",
&target_triple,
&config.target,
],
None,
Some(env),
Expand All @@ -165,14 +174,14 @@ fn build_sysroot(
};

// Copy files to sysroot
let sysroot_path = format!("sysroot/lib/rustlib/{}/lib/", target_triple);
let sysroot_path = format!("sysroot/lib/rustlib/{}/lib/", config.target_triple);
fs::create_dir_all(&sysroot_path)
.map_err(|error| format!("Failed to create directory `{}`: {:?}", sysroot_path, error))?;
let copier = |dir_to_copy: &Path| {
run_command(&[&"cp", &"-r", &dir_to_copy, &sysroot_path], None).map(|_| ())
};
walk_dir(
&format!("target/{}/{}/deps", target_triple, channel),
&format!("target/{}/{}/deps", config.target_triple, channel),
copier,
copier,
)?;
Expand Down Expand Up @@ -216,7 +225,7 @@ fn build_codegen(args: &BuildArg) -> Result<(), String> {
build_sysroot(
&mut env,
args.sysroot_release_channel,
&config.target_triple,
&config,
)?;
Ok(())
}
Expand Down
22 changes: 21 additions & 1 deletion build_system/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::collections::HashMap;
use std::env as std_env;

pub struct ConfigInfo {
pub target: String,
pub target_triple: String,
pub rustc_command: Vec<String>,
}
Expand Down Expand Up @@ -30,25 +31,43 @@ pub fn set_config(
let host_triple = get_rustc_host_triple()?;
let mut linker = None;
let mut target_triple = host_triple.clone();
let mut target = target_triple.clone();

// We skip binary name and the command.
let mut args = std::env::args().skip(2);

let mut set_target_triple = false;
let mut set_target = false;
while let Some(arg) = args.next() {
match arg.as_str() {
"--target-triple" => {
if let Some(arg) = args.next() {
target_triple = arg;
set_target_triple = true;
} else {
return Err(
"Expected a value after `--target-triple`, found nothing".to_string()
);
}
},
"--target" => {
if let Some(arg) = args.next() {
target = arg;
set_target = true;
} else {
return Err(
"Expected a value after `--target`, found nothing".to_string()
);
}
},
_ => (),
}
}

if set_target_triple && !set_target {
target = target_triple.clone();
}

if host_triple != target_triple {
linker = Some(format!("-Clinker={}-gcc", target_triple));
}
Expand Down Expand Up @@ -123,7 +142,8 @@ pub fn set_config(
"target/out".to_string(),
]);
Ok(ConfigInfo {
target_triple: target_triple.to_string(),
target,
target_triple,
rustc_command,
})
}