Skip to content

Commit 184ae01

Browse files
sunfishcodesunfishcode
authored
Update archives for Ubuntu 22.04. (#483)
Github's ubuntu-latest is now on Ubuntu 22.04, which has a newer binutils, which produces slightly different prebuilt libraries. Update the checked-in libraries to match the builds produced in CI.
1 parent 8847b8e commit 184ae01

13 files changed

+40
-32
lines changed

‎.github/workflows/main.yml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -219,20 +219,20 @@ jobs:
219219
build: [ubuntu, ubuntu-18.04, i686-linux, aarch64-linux, powerpc64le-linux, riscv64-linux, s390x-linux, arm-linux, ubuntu-stable, ubuntu-1.48, i686-linux-stable, aarch64-linux-stable, riscv64-linux-stable, s390x-linux-stable, mipsel-linux-stable, mips64el-linux-stable, powerpc64le-linux-stable, arm-linux-stable, ubuntu-1.48, i686-linux-1.48, aarch64-linux-1.48, riscv64-linux-1.48, s390x-linux-1.48, mipsel-linux-1.48, mips64el-linux-1.48, powerpc64le-linux-1.48, arm-linux-1.48, macos-latest, macos-10.15, windows, windows-2019]
220220
include:
221221
- build: ubuntu
222-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
222+
os: ubuntu-latest
223223
rust: nightly
224224
- build: ubuntu-18.04
225225
os: ubuntu-18.04
226226
rust: nightly
227227
- build: i686-linux
228-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
228+
os: ubuntu-latest
229229
rust: nightly
230230
target: i686-unknown-linux-gnu
231231
gcc_package: gcc-i686-linux-gnu
232232
gcc: i686-linux-gnu-gcc
233233
libc_package: libc-dev-i386-cross
234234
- build: aarch64-linux
235-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
235+
os: ubuntu-latest
236236
rust: nightly
237237
target: aarch64-unknown-linux-gnu
238238
gcc_package: gcc-aarch64-linux-gnu
@@ -241,7 +241,7 @@ jobs:
241241
qemu_args: -L /usr/aarch64-linux-gnu
242242
qemu_target: aarch64-linux-user
243243
- build: powerpc64le-linux
244-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
244+
os: ubuntu-latest
245245
rust: nightly
246246
target: powerpc64le-unknown-linux-gnu
247247
gcc_package: gcc-powerpc64le-linux-gnu
@@ -250,7 +250,7 @@ jobs:
250250
qemu_args: -L /usr/powerpc64le-linux-gnu
251251
qemu_target: ppc64le-linux-user
252252
- build: mips64el-linux
253-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
253+
os: ubuntu-latest
254254
rust: nightly
255255
target: mips64el-unknown-linux-gnuabi64
256256
gcc_package: gcc-mips64el-linux-gnuabi64
@@ -259,7 +259,7 @@ jobs:
259259
qemu_args: -L /usr/mips64el-linux-gnuabi64
260260
qemu_target: mips64el-linux-user
261261
- build: mipsel-linux
262-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
262+
os: ubuntu-latest
263263
rust: nightly
264264
target: mipsel-unknown-linux-gnu
265265
gcc_package: gcc-mipsel-linux-gnu
@@ -268,7 +268,7 @@ jobs:
268268
qemu_args: -L /usr/mipsel-linux-gnu
269269
qemu_target: mipsel-linux-user
270270
- build: riscv64-linux
271-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
271+
os: ubuntu-latest
272272
rust: nightly
273273
target: riscv64gc-unknown-linux-gnu
274274
gcc_package: gcc-riscv64-linux-gnu
@@ -277,7 +277,7 @@ jobs:
277277
qemu_args: -L /usr/riscv64-linux-gnu
278278
qemu_target: riscv64-linux-user
279279
- build: s390x-linux
280-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
280+
os: ubuntu-latest
281281
rust: nightly
282282
target: s390x-unknown-linux-gnu
283283
gcc_package: gcc-s390x-linux-gnu
@@ -286,7 +286,7 @@ jobs:
286286
qemu_args: -L /usr/s390x-linux-gnu
287287
qemu_target: s390x-linux-user
288288
- build: arm-linux
289-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
289+
os: ubuntu-latest
290290
rust: nightly
291291
target: armv5te-unknown-linux-gnueabi
292292
gcc_package: gcc-arm-linux-gnueabi
@@ -295,17 +295,17 @@ jobs:
295295
qemu_args: -L /usr/arm-linux-gnueabi
296296
qemu_target: arm-linux-user
297297
- build: ubuntu-stable
298-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
298+
os: ubuntu-latest
299299
rust: stable
300300
- build: i686-linux-stable
301-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
301+
os: ubuntu-latest
302302
rust: stable
303303
target: i686-unknown-linux-gnu
304304
gcc_package: gcc-i686-linux-gnu
305305
gcc: i686-linux-gnu-gcc
306306
libc_package: libc-dev-i386-cross
307307
- build: aarch64-linux-stable
308-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
308+
os: ubuntu-latest
309309
rust: stable
310310
target: aarch64-unknown-linux-gnu
311311
gcc_package: gcc-aarch64-linux-gnu
@@ -314,7 +314,7 @@ jobs:
314314
qemu_args: -L /usr/aarch64-linux-gnu
315315
qemu_target: aarch64-linux-user
316316
- build: riscv64-linux-stable
317-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
317+
os: ubuntu-latest
318318
rust: stable
319319
target: riscv64gc-unknown-linux-gnu
320320
gcc_package: gcc-riscv64-linux-gnu
@@ -323,7 +323,7 @@ jobs:
323323
qemu_args: -L /usr/riscv64-linux-gnu
324324
qemu_target: riscv64-linux-user
325325
- build: s390x-linux-stable
326-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
326+
os: ubuntu-latest
327327
rust: stable
328328
target: s390x-unknown-linux-gnu
329329
gcc_package: gcc-s390x-linux-gnu
@@ -332,7 +332,7 @@ jobs:
332332
qemu_args: -L /usr/s390x-linux-gnu
333333
qemu_target: s390x-linux-user
334334
- build: powerpc64le-linux-stable
335-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
335+
os: ubuntu-latest
336336
rust: stable
337337
target: powerpc64le-unknown-linux-gnu
338338
gcc_package: gcc-powerpc64le-linux-gnu
@@ -341,7 +341,7 @@ jobs:
341341
qemu_args: -L /usr/powerpc64le-linux-gnu
342342
qemu_target: ppc64le-linux-user
343343
- build: mips64el-linux-stable
344-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
344+
os: ubuntu-latest
345345
rust: stable
346346
target: mips64el-unknown-linux-gnuabi64
347347
gcc_package: gcc-mips64el-linux-gnuabi64
@@ -350,7 +350,7 @@ jobs:
350350
qemu_args: -L /usr/mips64el-linux-gnuabi64
351351
qemu_target: mips64el-linux-user
352352
- build: mipsel-linux-stable
353-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
353+
os: ubuntu-latest
354354
rust: stable
355355
target: mipsel-unknown-linux-gnu
356356
gcc_package: gcc-mipsel-linux-gnu
@@ -359,7 +359,7 @@ jobs:
359359
qemu_args: -L /usr/mipsel-linux-gnu
360360
qemu_target: mipsel-linux-user
361361
- build: arm-linux-stable
362-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
362+
os: ubuntu-latest
363363
rust: stable
364364
target: armv5te-unknown-linux-gnueabi
365365
gcc_package: gcc-arm-linux-gnueabi
@@ -368,17 +368,17 @@ jobs:
368368
qemu_args: -L /usr/arm-linux-gnueabi
369369
qemu_target: arm-linux-user
370370
- build: ubuntu-1.48
371-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
371+
os: ubuntu-latest
372372
rust: 1.48
373373
- build: i686-linux-1.48
374-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
374+
os: ubuntu-latest
375375
rust: 1.48
376376
target: i686-unknown-linux-gnu
377377
gcc_package: gcc-i686-linux-gnu
378378
gcc: i686-linux-gnu-gcc
379379
libc_package: libc-dev-i386-cross
380380
- build: aarch64-linux-1.48
381-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
381+
os: ubuntu-latest
382382
rust: 1.48
383383
target: aarch64-unknown-linux-gnu
384384
gcc_package: gcc-aarch64-linux-gnu
@@ -387,7 +387,7 @@ jobs:
387387
qemu_args: -L /usr/aarch64-linux-gnu
388388
qemu_target: aarch64-linux-user
389389
- build: riscv64-linux-1.48
390-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
390+
os: ubuntu-latest
391391
rust: 1.48
392392
target: riscv64gc-unknown-linux-gnu
393393
gcc_package: gcc-riscv64-linux-gnu
@@ -396,7 +396,7 @@ jobs:
396396
qemu_args: -L /usr/riscv64-linux-gnu
397397
qemu_target: riscv64-linux-user
398398
- build: s390x-linux-1.48
399-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
399+
os: ubuntu-latest
400400
rust: 1.48
401401
target: s390x-unknown-linux-gnu
402402
gcc_package: gcc-s390x-linux-gnu
@@ -405,7 +405,7 @@ jobs:
405405
qemu_args: -L /usr/s390x-linux-gnu
406406
qemu_target: s390x-linux-user
407407
- build: powerpc64le-linux-1.48
408-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
408+
os: ubuntu-latest
409409
rust: 1.48
410410
target: powerpc64le-unknown-linux-gnu
411411
gcc_package: gcc-powerpc64le-linux-gnu
@@ -414,7 +414,7 @@ jobs:
414414
qemu_args: -L /usr/powerpc64le-linux-gnu
415415
qemu_target: ppc64le-linux-user
416416
- build: mips64el-linux-1.48
417-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
417+
os: ubuntu-latest
418418
rust: 1.48
419419
target: mips64el-unknown-linux-gnuabi64
420420
gcc_package: gcc-mips64el-linux-gnuabi64
@@ -423,7 +423,7 @@ jobs:
423423
qemu_args: -L /usr/mips64el-linux-gnuabi64
424424
qemu_target: mips64el-linux-user
425425
- build: mipsel-linux-1.48
426-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
426+
os: ubuntu-latest
427427
rust: 1.48
428428
target: mipsel-unknown-linux-gnu
429429
gcc_package: gcc-mipsel-linux-gnu
@@ -432,7 +432,7 @@ jobs:
432432
qemu_args: -L /usr/mipsel-linux-gnu
433433
qemu_target: mipsel-linux-user
434434
- build: arm-linux-1.48
435-
os: ubuntu-20.04 # TODO: remove pin when fixed (#483)
435+
os: ubuntu-latest
436436
rust: 1.48
437437
target: armv5te-unknown-linux-gnueabi
438438
gcc_package: gcc-arm-linux-gnueabi
@@ -470,7 +470,7 @@ jobs:
470470
with:
471471
path: ${{ runner.tool_cache }}/qemu
472472
key: qemu-${{ matrix.target }}-${{ env.QEMU_BUILD_VERSION }}-patched
473-
if: matrix.target != '' && matrix.os == 'ubuntu-20.04' # TODO: remove pin when fixed (#483)
473+
if: matrix.target != '' && matrix.os == 'ubuntu-latest'
474474

475475
- name: Install cross-compilation tools
476476
run: |
@@ -479,14 +479,14 @@ jobs:
479479
sudo apt-get install -y ${{ matrix.gcc_package }} ninja-build
480480
upcase=$(echo ${{ matrix.target }} | awk '{ print toupper($0) }' | sed 's/-/_/g')
481481
echo CARGO_TARGET_${upcase}_LINKER=${{ matrix.gcc }} >> $GITHUB_ENV
482-
if: matrix.gcc_package != '' && matrix.os == 'ubuntu-20.04' # TODO: remove pin when fixed (#483)
482+
if: matrix.gcc_package != '' && matrix.os == 'ubuntu-latest'
483483

484484
- name: Install cross-compilation libraries
485485
run: |
486486
set -ex
487487
sudo apt-get update
488488
sudo apt-get install -y ${{ matrix.libc_package }}
489-
if: matrix.libc_package != '' && matrix.os == 'ubuntu-20.04' # TODO: remove pin when fixed (#483)
489+
if: matrix.libc_package != '' && matrix.os == 'ubuntu-latest'
490490

491491
- name: Install qemu
492492
run: |
@@ -512,7 +512,7 @@ jobs:
512512
patch -p1 < $GITHUB_WORKSPACE/ci/s390x-stat-have-nsec.patch
513513
./configure --target-list=${{ matrix.qemu_target }} --prefix=${{ runner.tool_cache }}/qemu --disable-tools --disable-slirp --disable-fdt --disable-capstone --disable-docs
514514
ninja -C build install
515-
if: matrix.qemu != '' && matrix.os == 'ubuntu-20.04' # TODO: remove pin when fixed (#483)
515+
if: matrix.qemu != '' && matrix.os == 'ubuntu-latest'
516516

517517
- name: Use specific dependency versions for Rust 1.48 compatibility.
518518
if: matrix.rust == '1.48'

‎build.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,15 @@ fn link_in_librustix_outline(arch: &str, asm_name: &str) {
175175
#[cfg(feature = "cc")]
176176
{
177177
let out_dir = var("OUT_DIR").unwrap();
178-
Build::new().file(&asm_name).compile(&name);
178+
// Add `-gdwarf-3` so that we always get the same output, regardless of
179+
// the Rust version we're using. DWARF3 is the version used in
180+
// Rust 1.48 and is entirely adequate for our simple needs here.
181+
let mut build = Build::new();
182+
if profile == "debug" {
183+
build.flag("-gdwarf-3");
184+
}
185+
build.file(&asm_name);
186+
build.compile(&name);
179187
println!("cargo:rerun-if-changed={}", asm_name);
180188
if std::fs::metadata(".git").is_ok() {
181189
let from = format!("{}/lib{}.a", out_dir, name);

‎src/backend/linux_raw/arch/outline/debug/librustix_outline_aarch64.a

0 Bytes
Binary file not shown.

‎src/backend/linux_raw/arch/outline/debug/librustix_outline_arm.a

0 Bytes
Binary file not shown.

‎src/backend/linux_raw/arch/outline/debug/librustix_outline_mips.a

0 Bytes
Binary file not shown.

‎src/backend/linux_raw/arch/outline/debug/librustix_outline_mips64.a

0 Bytes
Binary file not shown.

‎src/backend/linux_raw/arch/outline/debug/librustix_outline_powerpc64.a

0 Bytes
Binary file not shown.

‎src/backend/linux_raw/arch/outline/debug/librustix_outline_riscv64.a

376 Bytes
Binary file not shown.

‎src/backend/linux_raw/arch/outline/debug/librustix_outline_x86.a

-96 Bytes
Binary file not shown.

‎src/backend/linux_raw/arch/outline/debug/librustix_outline_x86_64.a

-144 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)