@@ -154,10 +154,6 @@ jobs:
154154 dpkg -i gcc-13.deb
155155
156156 git clone --depth 1 --branch $(linux/scripts/min-tool-version.sh rustc) https://github.com/rust-lang/rust.git rust-repo
157- # FIXME: 1.75.0 only: avoid `.eh_frame` error.
158- git config --global user.email "[email protected] " 159- git config --global user.name "Your Name"
160- git -C rust-repo am ../ci/0001-Do-not-emit-.eh_frame-section-when-using-Cpanic-abor.patch
161157
162158 echo "MAKE_KRUSTFLAGS=KRUSTFLAGS=-Zcodegen-backend=$(pwd)/rust-repo/compiler/rustc_codegen_gcc/target/release/librustc_codegen_gcc.so" >> $GITHUB_ENV
163159
@@ -245,21 +241,18 @@ jobs:
245241 ${{ env.OUTPUT_DIR }}vmlinux
246242
247243 # Check `.comment` section.
248- - if : matrix.toolchain == 'llvm'
249- run : |
244+ - run : |
250245 if [ $(linux/scripts/min-tool-version.sh rustc | cut -d'.' -f2) -ge 73 ]; then
251246 llvm-readelf --string-dump .comment ${{ env.OUTPUT_DIR }}rust/core.o
252247 llvm-objcopy --dump-section .comment=comment ${{ env.OUTPUT_DIR }}rust/core.o
253248 grep --text "^.rustc version $(linux/scripts/min-tool-version.sh rustc)" comment
249+ if ${{ matrix.toolchain == 'rustc_codegen_gcc' && 'true' || 'false' }}; then
250+ grep --text 'libgccjit' comment
251+ grep --text 'GCC: ' comment
252+ fi
254253 else
255254 echo 'Skipping since `rustc` < 1.73.0.'
256255 fi
257- - if : matrix.toolchain == 'rustc_codegen_gcc'
258- run : |
259- llvm-readelf --string-dump .comment ${{ env.OUTPUT_DIR }}rust/core.o
260- llvm-objcopy --dump-section .comment=comment ${{ env.OUTPUT_DIR }}rust/core.o
261- # TODO: starting with Rust 1.76.0, we should check for the improved `.comment` section.
262- grep --text '^.GCC: ' comment
263256
264257 # Check QEMU log output.
265258 - run : |
0 commit comments