replace config.toml to bootstrap.toml in compiler:cg_gcc submodule

Shourya742 · Shourya742 · commit 8877ec1f6190 · 2025-02-15T21:25:11.000+05:30
diff --git a/compiler/rustc_codegen_cranelift/scripts/setup_rust_fork.sh b/compiler/rustc_codegen_cranelift/scripts/setup_rust_fork.sh
@@ -22,7 +22,7 @@ git submodule update --quiet --init src/tools/cargo library/backtrace library/st
 git -c user.name=Dummy -c user.email=dummy@example.com -c commit.gpgSign=false \
     am ../patches/*-stdlib-*.patch
 
-cat > config.toml <<EOF
+cat > bootstrap.toml <<EOF
 change-id = 999999
 
 [llvm]
diff --git a/compiler/rustc_codegen_gcc/.github/workflows/ci.yml b/compiler/rustc_codegen_gcc/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
     - name: Setup path to libgccjit
       run: |
           sudo dpkg --force-overwrite -i ${{ matrix.libgccjit_version.gcc }}
-          echo 'gcc-path = "/usr/lib/"' > config.toml
+          echo 'gcc-path = "/usr/lib/"' > bootstrap.toml
 
     - name: Set env
       run: |
diff --git a/compiler/rustc_codegen_gcc/.github/workflows/failures.yml b/compiler/rustc_codegen_gcc/.github/workflows/failures.yml
@@ -50,7 +50,7 @@ jobs:
     - name: Setup path to libgccjit
       if: matrix.libgccjit_version.gcc == 'libgccjit12.so'
       run: |
-          echo 'gcc-path = "/usr/lib/gcc/x86_64-linux-gnu/12"' > config.toml
+          echo 'gcc-path = "/usr/lib/gcc/x86_64-linux-gnu/12"' > bootstrap.toml
           echo "LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12" >> $GITHUB_ENV
           echo "LD_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12" >> $GITHUB_ENV
 
@@ -62,7 +62,7 @@ jobs:
       if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
       run: |
           sudo dpkg --force-overwrite -i gcc-15.deb
-          echo 'gcc-path = "/usr/lib"' > config.toml
+          echo 'gcc-path = "/usr/lib"' > bootstrap.toml
           echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
           echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
 
diff --git a/compiler/rustc_codegen_gcc/.github/workflows/gcc12.yml b/compiler/rustc_codegen_gcc/.github/workflows/gcc12.yml
@@ -47,7 +47,7 @@ jobs:
       run: sudo apt-get install ninja-build ripgrep llvm-14-tools libgccjit-12-dev
 
     - name: Setup path to libgccjit
-      run: echo 'gcc-path = "/usr/lib/gcc/x86_64-linux-gnu/12"' > config.toml
+      run: echo 'gcc-path = "/usr/lib/gcc/x86_64-linux-gnu/12"' > bootstrap.toml
 
     - name: Set env
       run: |
diff --git a/compiler/rustc_codegen_gcc/.github/workflows/m68k.yml b/compiler/rustc_codegen_gcc/.github/workflows/m68k.yml
@@ -58,7 +58,7 @@ jobs:
     - name: Setup path to libgccjit
       run: |
           sudo dpkg -i gcc-m68k-15.deb
-          echo 'gcc-path = "/usr/lib/"' > config.toml
+          echo 'gcc-path = "/usr/lib/"' > bootstrap.toml
 
     - name: Set env
       run: |
diff --git a/compiler/rustc_codegen_gcc/.github/workflows/release.yml b/compiler/rustc_codegen_gcc/.github/workflows/release.yml
@@ -42,7 +42,7 @@ jobs:
     - name: Setup path to libgccjit
       run: |
           sudo dpkg --force-overwrite -i gcc-15.deb
-          echo 'gcc-path = "/usr/lib/"' > config.toml
+          echo 'gcc-path = "/usr/lib/"' > bootstrap.toml
 
     - name: Set env
       run: |
diff --git a/compiler/rustc_codegen_gcc/.github/workflows/stdarch.yml b/compiler/rustc_codegen_gcc/.github/workflows/stdarch.yml
@@ -60,7 +60,7 @@ jobs:
     - name: Set env
       run: |
         echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
-        echo 'download-gccjit = true' > config.toml
+        echo 'download-gccjit = true' > bootstrap.toml
 
     - name: Build
       run: |
diff --git a/compiler/rustc_codegen_gcc/.gitignore b/compiler/rustc_codegen_gcc/.gitignore
@@ -19,4 +19,5 @@ tools/llvmint-2
 llvm
 build_system/target
 config.toml
+bootstrap.toml
 build
diff --git a/compiler/rustc_codegen_gcc/.ignore b/compiler/rustc_codegen_gcc/.ignore
@@ -9,3 +9,4 @@
 !*asm*
 !.github
 !config.toml
+!bootstrap.toml
diff --git a/compiler/rustc_codegen_gcc/Readme.md b/compiler/rustc_codegen_gcc/Readme.md
@@ -26,7 +26,7 @@ A secondary goal is to check if using the gcc backend will provide any run-time
 You need to use my [fork of gcc](https://github.com/antoyo/gcc) which already includes these patches.**
 
 ```bash
-$ cp config.example.toml config.toml
+$ cp bootstrap.example.toml bootstrap.toml
 ```
 
 If don't need to test GCC patches you wrote in our GCC fork, then the default configuration should
@@ -69,9 +69,9 @@ $ make check-jit
 $ make check-jit RUNTESTFLAGS="-v -v -v jit.exp=jit.dg/test-asm.cc"
 ```
 
-**Put the path to your custom build of libgccjit in the file `config.toml`.**
+**Put the path to your custom build of libgccjit in the file `bootstrap.toml`.**
 
-You now need to set the `gcc-path` value in `config.toml` with the result of this command:
+You now need to set the `gcc-path` value in `bootstrap.toml` with the result of this command:
 
 ```bash
 $ dirname $(readlink -f `find . -name libgccjit.so`)
diff --git a/compiler/rustc_codegen_gcc/build_system/src/config.rs b/compiler/rustc_codegen_gcc/build_system/src/config.rs
@@ -116,7 +116,7 @@ pub struct ConfigInfo {
     config_file: Option<String>,
     // This is used in particular in rust compiler bootstrap because it doesn't run at the root
     // of the `cg_gcc` folder, making it complicated for us to get access to local files we need
-    // like `libgccjit.version` or `config.toml`.
+    // like `libgccjit.version` or `bootstrap.toml`.
     cg_gcc_path: Option<PathBuf>,
     // Needed for the `info` command which doesn't want to actually download the lib if needed,
     // just to set the `gcc_path` field to display it.
@@ -282,7 +282,7 @@ impl ConfigInfo {
     }
 
     pub fn setup_gcc_path(&mut self) -> Result<(), String> {
-        // If the user used the `--gcc-path` option, no need to look at `config.toml` content
+        // If the user used the `--gcc-path` option, no need to look at `bootstrap.toml` content
         // since we already have everything we need.
         if let Some(gcc_path) = &self.gcc_path {
             println!(
@@ -293,7 +293,14 @@ impl ConfigInfo {
         }
         let config_file = match self.config_file.as_deref() {
             Some(config_file) => config_file.into(),
-            None => self.compute_path("config.toml"),
+            None => {
+                let mut config_file = self.compute_path("bootstrap.toml");
+                if !config_file.as_path().exists() {
+                    // for backward compatibility.
+                    config_file = self.compute_path("config.toml");
+                }
+                config_file
+            }
         };
         let ConfigFile { gcc_path, download_gccjit } = ConfigFile::new(&config_file)?;
 
@@ -510,7 +517,7 @@ fn download_gccjit(
         eprintln!(
             "\
 Pre-compiled libgccjit.so not available for this os or architecture.
-Please compile it yourself and update the `config.toml` file
+Please compile it yourself and update the `bootstrap.toml` file
 to `download-gccjit = false` and set `gcc-path` to the appropriate directory."
         );
         return Err(String::from(
diff --git a/compiler/rustc_codegen_gcc/build_system/src/test.rs b/compiler/rustc_codegen_gcc/build_system/src/test.rs
@@ -490,7 +490,7 @@ fn setup_rustc(env: &mut Env, args: &TestArg) -> Result<PathBuf, String> {
             String::new()
         }
     };
-    let file_path = rust_dir_path.join("config.toml");
+    let file_path = rust_dir_path.join("bootstrap.toml");
     std::fs::write(
         &file_path,
         &format!(
diff --git a/compiler/rustc_codegen_gcc/doc/tips.md b/compiler/rustc_codegen_gcc/doc/tips.md
@@ -61,7 +61,7 @@ generate it in [gimple.md](./doc/gimple.md).
 #### Configuring rustc_codegen_gcc
 
  * Run `./y.sh prepare --cross` so that the sysroot is patched for the cross-compiling case.
- * Set the path to the cross-compiling libgccjit in `gcc-path` (in `config.toml`).
+ * Set the path to the cross-compiling libgccjit in `gcc-path` (in `bootstrap.toml`).
  * 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 --sysroot --target-triple m68k-unknown-linux-gnu`.
  * Build your project by specifying the target: `OVERWRITE_TARGET_TRIPLE=m68k-unknown-linux-gnu ../y.sh cargo build --target m68k-unknown-linux-gnu`.
 
@@ -77,4 +77,4 @@ If you get the following error:
 /usr/bin/ld: unrecognised emulation mode: m68kelf
 ```
 
-Make sure you set `gcc-path` (in `config.toml`) to the install directory.
+Make sure you set `gcc-path` (in `bootstrap.toml`) to the install directory.
diff --git a/compiler/rustc_codegen_gcc/tests/lang_tests_common.rs b/compiler/rustc_codegen_gcc/tests/lang_tests_common.rs
@@ -23,10 +23,10 @@ pub fn main_inner(profile: Profile) {
 
     let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
 
-    let gcc_path = std::fs::read_to_string(manifest_dir.join("config.toml"))
+    let gcc_path = std::fs::read_to_string(manifest_dir.join("bootstrap.toml"))
         .ok()
         .and_then(|v| {
-            let toml = Toml::parse(&v).expect("Failed to parse `config.toml`");
+            let toml = Toml::parse(&v).expect("Failed to parse `bootstrap.toml`");
             toml.get_string("gcc-path").map(PathBuf::from).ok()
         })
         .unwrap_or_else(|| {
diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs
@@ -389,7 +389,7 @@ top_level_options!(
         ///
         /// This directory is what the virtual `/rustc/$hash` is translated back to,
         /// if Rust was built with path remapping to `/rustc/$hash` enabled
-        /// (the `rust.remap-debuginfo` option in `config.toml`).
+        /// (the `rust.remap-debuginfo` option in `bootstrap.toml`).
         real_rust_source_base_dir: Option<PathBuf> [TRACKED_NO_CRATE_HASH],
 
         edition: Edition [TRACKED],
