WIP

.github/workflows/m68k.yml

@@ -0,0 +1,154 @@
+# How to chroot with qemu into a Debian created with debootstrap: https://unix.stackexchange.com/questions/41889/how-can-i-chroot-into-a-filesystem-with-a-different-architechture
+# Commands need to be run inside qemu-m68k-static, e.g. qemu-m68k-static /usr/bin/ls.
+#
+# TODO: check if qemu-user-static-binfmt is needed (perhaps to run some tests since it probably calls exec).
+
+name: m68k CI
+
+on:
+  - push
+  - pull_request
+
+permissions:
+  contents: read
+
+env:
+  # Enable backtraces for easier debugging
+  RUST_BACKTRACE: 1
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        commands: [
+          "--mini-tests",
+          "--std-tests",
+          "--test-libcore",
+          "--extended-rand-tests",
+          "--extended-regex-example-tests",
+          "--extended-regex-tests",
+          "--test-successful-rustc --nb-parts 2 --current-part 0",
+          "--test-successful-rustc --nb-parts 2 --current-part 1",
+          "--test-failing-rustc",
+        ]
+
+    steps:
+    - name: Install packages
+      run: sudo apt-get install qemu
+
+    - uses: actions/checkout@v3
+
+    - uses: actions/checkout@v3
+      with:
+        repository: llvm/llvm-project
+        path: llvm
+
+    - name: Download GCC artifact
+      uses: dawidd6/action-download-artifact@v2
+      with:
+          workflow: m68k.yml
+          name: gcc-m68k-13
+          repo: cross-cg-gcc-tools/cross-gcc
+          branch: master
+          event: push
+
+    - name: Download VM artifact
+      uses: dawidd6/action-download-artifact@v2
+      with:
+          workflow: m68k.yml
+          name: debian-m68k
+          repo: cross-cg-gcc-tools/vms
+          branch: master
+          event: push
+
+    - name: Setup path to libgccjit
+      run: |
+          sudo dpkg -i gcc-m68k-13.deb
+          ls /lib
+          echo "*********************"
+          ls /usr/lib
+          echo /usr/lib/ > gcc_path
+
+    - name: Set env
+      run: |
+        echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
+        echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
+
+    - name: Set RUST_COMPILER_RT_ROOT
+      run: echo "RUST_COMPILER_RT_ROOT="${{ env.workspace }}/llvm/compiler-rt >> $GITHUB_ENV
+
+    - name: Cache cargo installed crates
+      uses: actions/cache@v3
+      with:
+        path: ~/.cargo/bin
+        key: cargo-installed-crates2-ubuntu-latest
+
+    - name: Cache cargo registry
+      uses: actions/cache@v3
+      with:
+        path: ~/.cargo/registry
+        key: ${{ runner.os }}-cargo-registry2-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Cache cargo index
+      uses: actions/cache@v3
+      with:
+        path: ~/.cargo/git
+        key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Cache cargo target dir
+      uses: actions/cache@v3
+      with:
+        path: target
+        key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain') }}
+
+    #- name: Cache rust repository
+      ## We only clone the rust repository for rustc tests
+      #if: ${{ contains(matrix.commands, 'rustc') }}
+      #uses: actions/cache@v3
+      #id: cache-rust-repository
+      #with:
+        #path: rust
+        #key: ${{ runner.os }}-packages-${{ hashFiles('rust/.git/HEAD') }}
+
+    - name: Test build (TODO REMOVE)
+      run: |
+        cat > main.c <<EOF
+        int main(void) {
+            printf("Hello, world!");
+        }
+        EOF
+        mkdir vm
+        sudo mount debian-m68k.img vm
+        m68k-unknown-linux-gnu-gcc main.c -o vm/home/main
+        sudo chroot vm/ qemu-m68k-static /home/main
+
+    - name: Build
+      run: |
+        ./y.sh prepare --only-libcore
+        ./build.sh
+        cargo test
+        ./clean_all.sh
+
+    - name: Prepare dependencies
+      run: |
+        git config --global user.email "[email protected]"
+        git config --global user.name "User"
+        ./y.sh prepare
+
+    # Compile is a separate step, as the actions-rs/cargo action supports error annotations
+    - name: Compile
+      uses: actions-rs/[email protected]
+      with:
+        command: build
+        args: --release
+
+    - name: Add more failing tests because the sysroot is not compiled with LTO
+      run: cat failing-non-lto-tests.txt >> failing-ui-tests.txt
+
+    - name: Run tests
+      run: |
+        ./test.sh --release --clean --build-sysroot

Readme.md

@@ -307,3 +307,11 @@ generate it in [gimple.md](./doc/gimple.md).
  * Set the path to the cross-compiling libgccjit in `gcc_path`.
  * Comment the line: `context.add_command_line_option("-masm=intel");` in src/base.rs.
  * (might not be necessary) Disable the compilation of libstd.so (and possibly libcore.so?): Remove dylib from build_sysroot/sysroot_src/library/std/Cargo.toml.
+
+If you get the following error:
+
+```
+/usr/bin/ld: unrecognised emulation mode: m68kelf
+```
+
+Make sure you set `gcc_path` to the install directory.

config.sh

@@ -20,14 +20,14 @@ else
 fi
 
 HOST_TRIPLE=$(rustc -vV | grep host | cut -d: -f2 | tr -d " ")
-TARGET_TRIPLE=$HOST_TRIPLE
-#TARGET_TRIPLE="m68k-unknown-linux-gnu"
+#TARGET_TRIPLE=$HOST_TRIPLE
+TARGET_TRIPLE="m68k-unknown-linux-gnu"
 
 linker=''
 RUN_WRAPPER=''
 if [[ "$HOST_TRIPLE" != "$TARGET_TRIPLE" ]]; then
    if [[ "$TARGET_TRIPLE" == "m68k-unknown-linux-gnu" ]]; then
-       TARGET_TRIPLE="mips-unknown-linux-gnu"
+       #TARGET_TRIPLE="mips-unknown-linux-gnu"
        linker='-Clinker=m68k-linux-gcc'
    elif [[ "$TARGET_TRIPLE" == "aarch64-unknown-linux-gnu" ]]; then
       # We are cross-compiling for aarch64. Use the correct linker and run tests in qemu.
@@ -60,4 +60,5 @@ export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
 # NOTE: To avoid the -fno-inline errors, use /opt/gcc/bin/gcc instead of cc.
 # To do so, add a symlink for cc to /opt/gcc/bin/gcc in our PATH.
 # Another option would be to add the following Rust flag: -Clinker=/opt/gcc/bin/gcc
-export PATH="/opt/gcc/bin:$PATH"
+export PATH="/opt/m68k-gcc/bin:$PATH"
+export TARGET=$TARGET_TRIPLE

src/base.rs

@@ -105,13 +105,13 @@ pub fn compile_codegen_unit(tcx: TyCtxt<'_>, cgu_name: Symbol, target_info: Arc<
         let add_cpu_feature_flag = |feature: &str| {
             // FIXME(antoyo): some tests cause a segfault in GCC when not enabling all these
             // features.
-            if (true || target_info.cpu_supports(feature)) && !disabled_features.contains(feature) {
+            if (/*true ||*/ target_info.cpu_supports(feature)) && !disabled_features.contains(feature) {
                 context.add_command_line_option(&format!("-m{}", feature));
             }
         };
 
         // TODO(antoyo): only set on x86 platforms.
-        context.add_command_line_option("-masm=intel");
+        //context.add_command_line_option("-masm=intel");
 
         let features = ["sse2", "avx", "avx2", "sha", "fma", "gfni", "f16c", "aes", "bmi2", "rtm",
             "vaes", "vpclmulqdq", "xsavec",
@@ -122,10 +122,10 @@ pub fn compile_codegen_unit(tcx: TyCtxt<'_>, cgu_name: Symbol, target_info: Arc<
         }
 
         // TODO(antoyo): only add the following cli arguments if the feature is supported.
-        context.add_command_line_option("-mpclmul");
+        /*context.add_command_line_option("-mpclmul");
         context.add_command_line_option("-mfma4");
         context.add_command_line_option("-m64");
-        context.add_command_line_option("-mbmi");
+        context.add_command_line_option("-mbmi");*/
         //context.add_command_line_option("-mavxvnni"); // The CI doesn't support this option.
 
         for arg in &tcx.sess.opts.cg.llvm_args {

src/builder.rs

@@ -1218,7 +1218,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
         #[cfg(feature="master")]
         {
             let personality = self.rvalue_as_function(_personality);
-            self.current_func().set_personality_function(personality);
+            //self.current_func().set_personality_function(personality);
         }
     }
 

src/context.rs

@@ -166,13 +166,13 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
         let ulonglong_type = context.new_c_type(CType::ULongLong);
         let sizet_type = context.new_c_type(CType::SizeT);
 
-        let isize_type = context.new_c_type(CType::LongLong);
-        let usize_type = context.new_c_type(CType::ULongLong);
+        let isize_type = context.new_c_type(CType::Int);
+        let usize_type = context.new_c_type(CType::UInt);
         let bool_type = context.new_type::<bool>();
 
         // TODO(antoyo): only have those assertions on x86_64.
-        assert_eq!(isize_type.get_size(), i64_type.get_size());
-        assert_eq!(usize_type.get_size(), u64_type.get_size());
+        /*assert_eq!(isize_type.get_size(), i64_type.get_size());
+        assert_eq!(usize_type.get_size(), u64_type.get_size());*/
 
         let mut functions = FxHashMap::default();
         let builtins = [

src/lib.rs

@@ -211,7 +211,7 @@ impl ExtraBackendMethods for GccCodegenBackend {
         };
 
         // TODO(antoyo): only set for x86.
-        mods.context.add_command_line_option("-masm=intel");
+        //mods.context.add_command_line_option("-masm=intel");
         unsafe { allocator::codegen(tcx, &mut mods, module_name, kind, alloc_error_handler_kind); }
         mods
     }
@@ -309,12 +309,18 @@ pub fn __rustc_codegen_backend() -> Box<dyn CodegenBackend> {
     let target_info = {
         // Get the native arch and check whether the target supports 128-bit integers.
         let context = Context::default();
-        let arch = context.get_target_info().arch().unwrap();
-
-        // Get the second TargetInfo with the correct CPU features by setting the arch.
-        let context = Context::default();
-        context.add_driver_option(&format!("-march={}", arch.to_str().unwrap()));
-        Arc::new(context.get_target_info())
+        match context.get_target_info().arch() {
+            Some(arch) => {
+                // Get the second TargetInfo with the correct CPU features by setting the arch.
+                let context = Context::default();
+                context.add_driver_option(&format!("-march={}", arch.to_str().unwrap()));
+                Arc::new(context.get_target_info())
+            },
+            None => {
+                let context = Context::default();
+                Arc::new(context.get_target_info())
+            },
+        }
     };
     #[cfg(not(feature="master"))]
     let target_info = Arc::new(TargetInfo {