Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit dcf89f4

Browse files
borsbors
committed
Auto merge of rust-lang#116578 - antoyo:subtree-update_cg_gcc_2023-10-09, r=bjorn3
subtree update cg_gcc 2023/10/09
2 parents d627cf0 + 06c5ac4 commit dcf89f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+2844
-657
lines changed

‎compiler/rustc_codegen_gcc/.github/workflows/ci.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ jobs:
5757
uses: dawidd6/action-download-artifact@v2
5858
with:
5959
workflow: main.yml
60-
name: ${{ matrix.libgccjit_version.gcc }}
61-
path: gcc-build
60+
name: gcc-13
61+
path: gcc-13
6262
repo: antoyo/gcc
6363
branch: ${{ matrix.libgccjit_version.artifacts_branch }}
6464
event: push
@@ -71,9 +71,8 @@ jobs:
7171
- name: Setup path to libgccjit
7272
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
7373
run: |
74-
echo $(readlink -f gcc-build) > gcc_path
75-
# NOTE: the filename is still libgccjit.so even when the artifact name is different.
76-
ln gcc-build/libgccjit.so gcc-build/libgccjit.so.0
74+
sudo dpkg --force-overwrite -i gcc-13/gcc-13.deb
75+
echo /usr/lib/ > gcc_path
7776
7877
- name: Set env
7978
run: |
@@ -119,16 +118,16 @@ jobs:
119118

120119
- name: Build
121120
run: |
122-
./prepare_build.sh
123-
${{ matrix.libgccjit_version.env_extra }} ./build.sh ${{ matrix.libgccjit_version.extra }}
121+
./y.sh prepare --only-libcore
122+
${{ matrix.libgccjit_version.env_extra }} ./y.sh build ${{ matrix.libgccjit_version.extra }}
124123
${{ matrix.libgccjit_version.env_extra }} cargo test ${{ matrix.libgccjit_version.extra }}
125124
./clean_all.sh
126125
127126
- name: Prepare dependencies
128127
run: |
129128
git config --global user.email "user@example.com"
130129
git config --global user.name "User"
131-
./prepare.sh
130+
./y.sh prepare
132131
133132
# Compile is a separate step, as the actions-rs/cargo action supports error annotations
134133
- name: Compile
@@ -141,6 +140,9 @@ jobs:
141140
if: ${{ matrix.libgccjit_version.gcc == 'libgccjit12.so' }}
142141
run: cat failing-ui-tests12.txt >> failing-ui-tests.txt
143142

143+
- name: Add more failing tests because the sysroot is not compiled with LTO
144+
run: cat failing-non-lto-tests.txt >> failing-ui-tests.txt
145+
144146
- name: Run tests
145147
run: |
146148
${{ matrix.libgccjit_version.env_extra }} ./test.sh --release --clean --build-sysroot ${{ matrix.commands }} ${{ matrix.libgccjit_version.extra }}

‎compiler/rustc_codegen_gcc/.github/workflows/release.yml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
libgccjit_version:
22-
- { gcc: "libgccjit.so", artifacts_branch: "master" }
2321
commands: [
2422
"--test-successful-rustc --nb-parts 2 --current-part 0",
2523
"--test-successful-rustc --nb-parts 2 --current-part 1",
@@ -40,18 +38,17 @@ jobs:
4038
uses: dawidd6/action-download-artifact@v2
4139
with:
4240
workflow: main.yml
43-
name: ${{ matrix.libgccjit_version.gcc }}
44-
path: gcc-build
41+
name: gcc-13
42+
path: gcc-13
4543
repo: antoyo/gcc
46-
branch: ${{ matrix.libgccjit_version.artifacts_branch }}
44+
branch: "master"
4745
event: push
4846
search_artifacts: true # Because, instead, the action only check the last job ran and that won't work since we want multiple artifacts.
4947

5048
- name: Setup path to libgccjit
5149
run: |
52-
echo $(readlink -f gcc-build) > gcc_path
53-
# NOTE: the filename is still libgccjit.so even when the artifact name is different.
54-
ln gcc-build/libgccjit.so gcc-build/libgccjit.so.0
50+
sudo dpkg --force-overwrite -i gcc-13/gcc-13.deb
51+
echo /usr/lib/ > gcc_path
5552
5653
- name: Set env
5754
run: |
@@ -88,16 +85,18 @@ jobs:
8885

8986
- name: Build
9087
run: |
91-
./prepare_build.sh
92-
./build.sh --release --release-sysroot
88+
./y.sh prepare --only-libcore
89+
EMBED_LTO_BITCODE=1 ./y.sh build --release --release-sysroot
9390
cargo test
9491
./clean_all.sh
9592
9693
- name: Prepare dependencies
9794
run: |
9895
git config --global user.email "user@example.com"
9996
git config --global user.name "User"
100-
./prepare.sh
97+
./y.sh prepare
98+
# FIXME(antoyo): we cannot enable LTO for stdarch tests currently because of some failing LTO tests using proc-macros.
99+
echo -n 'lto = "fat"' >> build_sysroot/Cargo.toml
101100
102101
# Compile is a separate step, as the actions-rs/cargo action supports error annotations
103102
- name: Compile
@@ -106,6 +105,9 @@ jobs:
106105
command: build
107106
args: --release
108107

108+
- name: Add more failing tests because of undefined symbol errors (FIXME)
109+
run: cat failing-lto-tests.txt >> failing-ui-tests.txt
110+
109111
- name: Run tests
110112
run: |
111-
./test.sh --release --clean --release-sysroot --build-sysroot ${{ matrix.commands }}
113+
EMBED_LTO_BITCODE=1 ./test.sh --release --clean --release-sysroot --build-sysroot ${{ matrix.commands }}

‎compiler/rustc_codegen_gcc/.github/workflows/stdarch.yml‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
libgccjit_version:
22-
- { gcc: "libgccjit.so", artifacts_branch: "master" }
2321
cargo_runner: [
2422
"sde -future -rtm_mode full --",
2523
"",
@@ -54,18 +52,17 @@ jobs:
5452
uses: dawidd6/action-download-artifact@v2
5553
with:
5654
workflow: main.yml
57-
name: ${{ matrix.libgccjit_version.gcc }}
58-
path: gcc-build
55+
name: gcc-13
56+
path: gcc-13
5957
repo: antoyo/gcc
60-
branch: ${{ matrix.libgccjit_version.artifacts_branch }}
58+
branch: "master"
6159
event: push
6260
search_artifacts: true # Because, instead, the action only check the last job ran and that won't work since we want multiple artifacts.
6361

6462
- name: Setup path to libgccjit
6563
run: |
66-
echo $(readlink -f gcc-build) > gcc_path
67-
# NOTE: the filename is still libgccjit.so even when the artifact name is different.
68-
ln gcc-build/libgccjit.so gcc-build/libgccjit.so.0
64+
sudo dpkg --force-overwrite -i gcc-13/gcc-13.deb
65+
echo /usr/lib/ > gcc_path
6966
7067
- name: Set env
7168
run: |
@@ -102,8 +99,8 @@ jobs:
10299

103100
- name: Build
104101
run: |
105-
./prepare_build.sh
106-
./build.sh --release --release-sysroot
102+
./y.sh prepare --only-libcore
103+
./y.sh build --release --release-sysroot
107104
cargo test
108105
109106
- name: Clean
@@ -115,7 +112,7 @@ jobs:
115112
run: |
116113
git config --global user.email "user@example.com"
117114
git config --global user.name "User"
118-
./prepare.sh
115+
./y.sh prepare
119116
120117
# Compile is a separate step, as the actions-rs/cargo action supports error annotations
121118
- name: Compile
@@ -133,10 +130,11 @@ jobs:
133130
if: ${{ !matrix.cargo_runner }}
134131
run: |
135132
cd build_sysroot/sysroot_src/library/stdarch/
136-
CHANNEL=release TARGET=x86_64-unknown-linux-gnu ../../../../cargo.sh test
133+
CHANNEL=release TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ../../../../cargo.sh test
137134
138135
- name: Run stdarch tests
139136
if: ${{ matrix.cargo_runner }}
140137
run: |
141138
cd build_sysroot/sysroot_src/library/stdarch/
142-
STDARCH_TEST_EVERYTHING=1 CHANNEL=release CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="${{ matrix.cargo_runner }}" TARGET=x86_64-unknown-linux-gnu ../../../../cargo.sh test -- --skip rtm --skip tbm --skip sse4a
139+
# FIXME: these tests fail when the sysroot is compiled with LTO because of a missing symbol in proc-macro.
140+
STDARCH_TEST_EVERYTHING=1 CHANNEL=release CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="${{ matrix.cargo_runner }}" TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ../../../../cargo.sh test -- --skip rtm --skip tbm --skip sse4a

‎compiler/rustc_codegen_gcc/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ tools/llvmint
2525
tools/llvmint-2
2626
# The `llvm` folder is generated by the `tools/generate_intrinsics.py` script to update intrinsics.
2727
llvm
28+
build_system/target

0 commit comments

Comments
 (0)