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

Commit fe07ece

Browse files
borsbors
committed
Auto merge of rust-lang#74724 - Manishearth:rollup-plbt8fe, r=Manishearth
Rollup of 8 pull requests Successful merges: - rust-lang#72954 (revise RwLock for HermitCore) - rust-lang#74367 (Rearrange the pipeline of `pow` to gain efficiency) - rust-lang#74491 (Optimize away BitAnd and BitOr when possible) - rust-lang#74639 (Downgrade glibc to 2.11.1 for ppc, ppc64 and s390x) - rust-lang#74661 (Refactor `region_name`: add `RegionNameHighlight`) - rust-lang#74692 (delay_span_bug instead of silent ignore) - rust-lang#74698 (fixed error reporting for mismatched traits) - rust-lang#74715 (Add a system for creating diffs across multiple mir optimizations.) Failed merges: r? @ghost
2 parents cfb6114 + 5d1d94e commit fe07ece

37 files changed

+963
-722
lines changed

‎Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,9 +1242,9 @@ dependencies = [
12421242

12431243
[[package]]
12441244
name = "hermit-abi"
1245-
version = "0.1.14"
1245+
version = "0.1.15"
12461246
source = "registry+https://github.com/rust-lang/crates.io-index"
1247-
checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909"
1247+
checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
12481248
dependencies = [
12491249
"compiler_builtins",
12501250
"libc",

‎src/ci/docker/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ For targets: `powerpc-unknown-linux-gnu`
238238
- Target options > Emit assembly for CPU = powerpc -- pure 32-bit PowerPC
239239
- Operating System > Target OS = linux
240240
- Operating System > Linux kernel version = 2.6.32.68 -- ~RHEL6 kernel
241-
- C-library > glibc version = 2.12.2 -- ~RHEL6 glibc
241+
- C-library > glibc version = 2.11.1 -- ~SLE11-SP4 glibc
242242
- C compiler > gcc version = 5.2.0
243243
- C compiler > C++ = ENABLE -- to cross compile LLVM
244244
@@ -255,7 +255,7 @@ For targets: `powerpc64-unknown-linux-gnu`
255255
- Target options > Tune for CPU = power6 -- (+)
256256
- Operating System > Target OS = linux
257257
- Operating System > Linux kernel version = 2.6.32.68 -- ~RHEL6 kernel
258-
- C-library > glibc version = 2.12.2 -- ~RHEL6 glibc
258+
- C-library > glibc version = 2.11.1 -- ~SLE11-SP4 glibc
259259
- C compiler > gcc version = 5.2.0
260260
- C compiler > C++ = ENABLE -- to cross compile LLVM
261261
@@ -272,7 +272,7 @@ For targets: `s390x-unknown-linux-gnu`
272272
- Target options > Bitness = 64-bit
273273
- Operating System > Target OS = linux
274274
- Operating System > Linux kernel version = 2.6.32.68 -- ~RHEL6 kernel
275-
- C-library > glibc version = 2.12.2 -- ~RHEL6 glibc
275+
- C-library > glibc version = 2.11.1 -- ~SLE11-SP4 glibc
276276
- C compiler > gcc version = 5.2.0
277277
- C compiler > gcc extra config = --with-arch=z10 -- LLVM's minimum support
278278
- C compiler > C++ = ENABLE -- to cross compile LLVM

‎src/ci/docker/host-x86_64/dist-powerpc-linux/patches/glibc/2.12.2/001-PowerPC-Remove-unnecessary-mnew-mnemonics.patch‎ renamed to ‎src/ci/docker/host-x86_64/dist-powerpc-linux/patches/glibc/2.11.1/001-PowerPC-Remove-unnecessary-mnew-mnemonics.patch‎

File renamed without changes.

‎src/ci/docker/host-x86_64/dist-powerpc-linux/patches/glibc/2.12.2/002-newer-gcc.patch‎ renamed to ‎src/ci/docker/host-x86_64/dist-powerpc-linux/patches/glibc/2.11.1/002-newer-gcc.patch‎

File renamed without changes.

‎src/ci/docker/host-x86_64/dist-powerpc-linux/powerpc-linux-gnu.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
290290
# C-library
291291
#
292292
CT_LIBC="glibc"
293-
CT_LIBC_VERSION="2.12.2"
293+
CT_LIBC_VERSION="2.11.1"
294294
CT_LIBC_glibc=y
295295
# CT_LIBC_musl is not set
296296
# CT_LIBC_uClibc is not set
@@ -309,9 +309,9 @@ CT_THREADS="nptl"
309309
# CT_LIBC_GLIBC_V_2_14_1 is not set
310310
# CT_LIBC_GLIBC_V_2_14 is not set
311311
# CT_LIBC_GLIBC_V_2_13 is not set
312-
CT_LIBC_GLIBC_V_2_12_2=y
312+
# CT_LIBC_GLIBC_V_2_12_2 is not set
313313
# CT_LIBC_GLIBC_V_2_12_1 is not set
314-
# CT_LIBC_GLIBC_V_2_11_1 is not set
314+
CT_LIBC_GLIBC_V_2_11_1=y
315315
# CT_LIBC_GLIBC_V_2_11 is not set
316316
# CT_LIBC_GLIBC_V_2_10_1 is not set
317317
# CT_LIBC_GLIBC_V_2_9 is not set

‎src/ci/docker/host-x86_64/dist-powerpc64-linux/patches/glibc/2.12.2/001-PowerPC-Remove-unnecessary-mnew-mnemonics.patch‎ renamed to ‎src/ci/docker/host-x86_64/dist-powerpc64-linux/patches/glibc/2.11.1/001-PowerPC-Remove-unnecessary-mnew-mnemonics.patch‎

File renamed without changes.

‎src/ci/docker/host-x86_64/dist-powerpc64-linux/patches/glibc/2.12.2/002-Prevent-inlining-in-PPC64-initfini.s.patch‎ renamed to ‎src/ci/docker/host-x86_64/dist-powerpc64-linux/patches/glibc/2.11.1/002-Prevent-inlining-in-PPC64-initfini.s.patch‎

File renamed without changes.

‎src/ci/docker/host-x86_64/dist-powerpc64-linux/patches/glibc/2.12.2/003-newer-gcc.patch‎ renamed to ‎src/ci/docker/host-x86_64/dist-powerpc64-linux/patches/glibc/2.11.1/003-newer-gcc.patch‎

File renamed without changes.

‎src/ci/docker/host-x86_64/dist-powerpc64-linux/powerpc64-linux-gnu.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
290290
# C-library
291291
#
292292
CT_LIBC="glibc"
293-
CT_LIBC_VERSION="2.12.2"
293+
CT_LIBC_VERSION="2.11.1"
294294
CT_LIBC_glibc=y
295295
# CT_LIBC_musl is not set
296296
# CT_LIBC_uClibc is not set
@@ -309,9 +309,9 @@ CT_THREADS="nptl"
309309
# CT_LIBC_GLIBC_V_2_14_1 is not set
310310
# CT_LIBC_GLIBC_V_2_14 is not set
311311
# CT_LIBC_GLIBC_V_2_13 is not set
312-
CT_LIBC_GLIBC_V_2_12_2=y
312+
# CT_LIBC_GLIBC_V_2_12_2 is not set
313313
# CT_LIBC_GLIBC_V_2_12_1 is not set
314-
# CT_LIBC_GLIBC_V_2_11_1 is not set
314+
CT_LIBC_GLIBC_V_2_11_1=y
315315
# CT_LIBC_GLIBC_V_2_11 is not set
316316
# CT_LIBC_GLIBC_V_2_10_1 is not set
317317
# CT_LIBC_GLIBC_V_2_9 is not set

‎src/ci/docker/host-x86_64/dist-s390x-linux/patches/glibc/2.12.2/001-Use-.machine-to-prevent-AS-from-complaining-about-z9.patch‎ renamed to ‎src/ci/docker/host-x86_64/dist-s390x-linux/patches/glibc/2.11.1/001-Use-.machine-to-prevent-AS-from-complaining-about-z9.patch‎

File renamed without changes.

0 commit comments

Comments
 (0)