Skip to content

Commit

Permalink
Rollup merge of rust-lang#74639 - msirringhaus:master, r=cuviper
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@Manishearth
Manishearth authored Jul 24, 2020
2 parents e59effe + e46219c commit a4024ba
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/ci/docker/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ For targets: `powerpc-unknown-linux-gnu`
- Target options > Emit assembly for CPU = powerpc -- pure 32-bit PowerPC
- Operating System > Target OS = linux
- Operating System > Linux kernel version = 2.6.32.68 -- ~RHEL6 kernel
- C-library > glibc version = 2.12.2 -- ~RHEL6 glibc
- C-library > glibc version = 2.11.1 -- ~SLE11-SP4 glibc
- C compiler > gcc version = 5.2.0
- C compiler > C++ = ENABLE -- to cross compile LLVM
Expand All @@ -255,7 +255,7 @@ For targets: `powerpc64-unknown-linux-gnu`
- Target options > Tune for CPU = power6 -- (+)
- Operating System > Target OS = linux
- Operating System > Linux kernel version = 2.6.32.68 -- ~RHEL6 kernel
- C-library > glibc version = 2.12.2 -- ~RHEL6 glibc
- C-library > glibc version = 2.11.1 -- ~SLE11-SP4 glibc
- C compiler > gcc version = 5.2.0
- C compiler > C++ = ENABLE -- to cross compile LLVM
Expand All @@ -272,7 +272,7 @@ For targets: `s390x-unknown-linux-gnu`
- Target options > Bitness = 64-bit
- Operating System > Target OS = linux
- Operating System > Linux kernel version = 2.6.32.68 -- ~RHEL6 kernel
- C-library > glibc version = 2.12.2 -- ~RHEL6 glibc
- C-library > glibc version = 2.11.1 -- ~SLE11-SP4 glibc
- C compiler > gcc version = 5.2.0
- C compiler > gcc extra config = --with-arch=z10 -- LLVM's minimum support
- C compiler > C++ = ENABLE -- to cross compile LLVM
0 ...C-Remove-unnecessary-mnew-mnemonics.patch → ...C-Remove-unnecessary-mnew-mnemonics.patch
View file
File renamed without changes.
0 .../patches/glibc/2.12.2/002-newer-gcc.patch → .../patches/glibc/2.11.1/002-newer-gcc.patch
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions src/ci/docker/host-x86_64/dist-powerpc-linux/powerpc-linux-gnu.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
# C-library
#
CT_LIBC="glibc"
CT_LIBC_VERSION="2.12.2"
CT_LIBC_VERSION="2.11.1"
CT_LIBC_glibc=y
# CT_LIBC_musl is not set
# CT_LIBC_uClibc is not set
Expand All @@ -309,9 +309,9 @@ CT_THREADS="nptl"
# CT_LIBC_GLIBC_V_2_14_1 is not set
# CT_LIBC_GLIBC_V_2_14 is not set
# CT_LIBC_GLIBC_V_2_13 is not set
CT_LIBC_GLIBC_V_2_12_2=y
# CT_LIBC_GLIBC_V_2_12_2 is not set
# CT_LIBC_GLIBC_V_2_12_1 is not set
# CT_LIBC_GLIBC_V_2_11_1 is not set
CT_LIBC_GLIBC_V_2_11_1=y
# CT_LIBC_GLIBC_V_2_11 is not set
# CT_LIBC_GLIBC_V_2_10_1 is not set
# CT_LIBC_GLIBC_V_2_9 is not set
Expand Down
0 ...C-Remove-unnecessary-mnew-mnemonics.patch → ...C-Remove-unnecessary-mnew-mnemonics.patch
View file
File renamed without changes.
0 ...revent-inlining-in-PPC64-initfini.s.patch → ...revent-inlining-in-PPC64-initfini.s.patch
View file
File renamed without changes.
0 .../patches/glibc/2.12.2/003-newer-gcc.patch → .../patches/glibc/2.11.1/003-newer-gcc.patch
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions src/ci/docker/host-x86_64/dist-powerpc64-linux/powerpc64-linux-gnu.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
# C-library
#
CT_LIBC="glibc"
CT_LIBC_VERSION="2.12.2"
CT_LIBC_VERSION="2.11.1"
CT_LIBC_glibc=y
# CT_LIBC_musl is not set
# CT_LIBC_uClibc is not set
Expand All @@ -309,9 +309,9 @@ CT_THREADS="nptl"
# CT_LIBC_GLIBC_V_2_14_1 is not set
# CT_LIBC_GLIBC_V_2_14 is not set
# CT_LIBC_GLIBC_V_2_13 is not set
CT_LIBC_GLIBC_V_2_12_2=y
# CT_LIBC_GLIBC_V_2_12_2 is not set
# CT_LIBC_GLIBC_V_2_12_1 is not set
# CT_LIBC_GLIBC_V_2_11_1 is not set
CT_LIBC_GLIBC_V_2_11_1=y
# CT_LIBC_GLIBC_V_2_11 is not set
# CT_LIBC_GLIBC_V_2_10_1 is not set
# CT_LIBC_GLIBC_V_2_9 is not set
Expand Down
0 ...revent-AS-from-complaining-about-z9.patch → ...revent-AS-from-complaining-about-z9.patch
View file
File renamed without changes.
0 .../patches/glibc/2.12.2/002-newer-gcc.patch → .../patches/glibc/2.11.1/002-newer-gcc.patch
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions src/ci/docker/host-x86_64/dist-s390x-linux/s390x-linux-gnu.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
# C-library
#
CT_LIBC="glibc"
CT_LIBC_VERSION="2.12.2"
CT_LIBC_VERSION="2.11.1"
CT_LIBC_glibc=y
# CT_LIBC_musl is not set
# CT_LIBC_uClibc is not set
Expand All @@ -289,9 +289,9 @@ CT_THREADS="nptl"
# CT_LIBC_GLIBC_V_2_14_1 is not set
# CT_LIBC_GLIBC_V_2_14 is not set
# CT_LIBC_GLIBC_V_2_13 is not set
CT_LIBC_GLIBC_V_2_12_2=y
# CT_LIBC_GLIBC_V_2_12_2 is not set
# CT_LIBC_GLIBC_V_2_12_1 is not set
# CT_LIBC_GLIBC_V_2_11_1 is not set
CT_LIBC_GLIBC_V_2_11_1=y
# CT_LIBC_GLIBC_V_2_11 is not set
# CT_LIBC_GLIBC_V_2_10_1 is not set
# CT_LIBC_GLIBC_V_2_9 is not set
Expand Down

0 comments on commit a4024ba

Please sign in to comment.