Skip to content

Commit a4024ba

Browse files
ManishearthManishearth
authored
Rollup merge of rust-lang#74639 - msirringhaus:master, r=cuviper
Downgrade glibc to 2.11.1 for ppc, ppc64 and s390x As discussed in rust-lang#73782 I've tested these changes on rust 1.43.0 for all the specified archs and used the resulting binaries to bootstrap building rust 1.43.1. I've also shortly tested these changes on master on ppc64.
2 parents e59effe + e46219c commit a4024ba

11 files changed

+12
-12
lines changed

‎src/ci/docker/README.md

+3-3
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 ‎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 ‎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

+3-3
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 ‎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 ‎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 ‎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

+3-3
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 ‎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.

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

File renamed without changes.

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
270270
# C-library
271271
#
272272
CT_LIBC="glibc"
273-
CT_LIBC_VERSION="2.12.2"
273+
CT_LIBC_VERSION="2.11.1"
274274
CT_LIBC_glibc=y
275275
# CT_LIBC_musl is not set
276276
# CT_LIBC_uClibc is not set
@@ -289,9 +289,9 @@ CT_THREADS="nptl"
289289
# CT_LIBC_GLIBC_V_2_14_1 is not set
290290
# CT_LIBC_GLIBC_V_2_14 is not set
291291
# CT_LIBC_GLIBC_V_2_13 is not set
292-
CT_LIBC_GLIBC_V_2_12_2=y
292+
# CT_LIBC_GLIBC_V_2_12_2 is not set
293293
# CT_LIBC_GLIBC_V_2_12_1 is not set
294-
# CT_LIBC_GLIBC_V_2_11_1 is not set
294+
CT_LIBC_GLIBC_V_2_11_1=y
295295
# CT_LIBC_GLIBC_V_2_11 is not set
296296
# CT_LIBC_GLIBC_V_2_10_1 is not set
297297
# CT_LIBC_GLIBC_V_2_9 is not set

0 commit comments

Comments
 (0)