about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-10-07 07:28:11 +0200
committerGitHub <noreply@github.com>2022-10-07 07:28:11 +0200
commit04459f7a6ac04ca0adb98b04e5fca38e5760e00a (patch)
treec906a37a372f3956e838df2033560d405e40cfba
parentd6c05fb9f170b9a8e2dce52e13ac57eac4cd51ea (diff)
parent11583986887d0ebab90f4b77faa20668112259b8 (diff)
downloadrust-04459f7a6ac04ca0adb98b04e5fca38e5760e00a.tar.gz
rust-04459f7a6ac04ca0adb98b04e5fca38e5760e00a.zip
Rollup merge of #102748 - cuviper:i586-gnu-uncompress, r=pietroalbini
Disable compressed debug sections on i586-gnu

Compressed debug is enabled by default for gas (assembly) on Linux/x86
targets, and we started building our own in #102530, but that made our
`compiler_builtins` incompatible with binutils < 2.32. Add an explicit
option to disable that in our crosstool-ng config. Fixes #102703.
-rw-r--r--src/ci/docker/README.md4
-rw-r--r--src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/i586-linux-gnu.config2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ci/docker/README.md b/src/ci/docker/README.md
index 64faaf4f19b..38629c4fae7 100644
--- a/src/ci/docker/README.md
+++ b/src/ci/docker/README.md
@@ -242,10 +242,14 @@ For targets: `i586-unknown-linux-gnu`
 - Operating System > Target OS = linux
 - Operating System > Linux kernel version = 3.2.101
 - Binary utilities > Version of binutils = 2.32
+- Binary utilities > binutils extra config = --enable-compressed-debug-sections=none -- (\*)
 - C-library > glibc version = 2.17.0
 - C compiler > gcc version = 8.3.0
 - C compiler > C++ = ENABLE
 
+(\*) Compressed debug is enabled by default for gas (assembly) on Linux/x86 targets,
+     but that makes our `compiler_builtins` incompatible with binutils < 2.32.
+
 ### `powerpc-linux-gnu.config`
 
 For targets: `powerpc-unknown-linux-gnu`
diff --git a/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/i586-linux-gnu.config b/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/i586-linux-gnu.config
index ef2e9467f4a..cdbd52d23bc 100644
--- a/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/i586-linux-gnu.config
+++ b/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/i586-linux-gnu.config
@@ -336,7 +336,7 @@ CT_BINUTILS_LINKERS_LIST="ld"
 CT_BINUTILS_LINKER_DEFAULT="bfd"
 # CT_BINUTILS_PLUGINS is not set
 CT_BINUTILS_RELRO=m
-CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
+CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-compressed-debug-sections=none"
 # CT_BINUTILS_FOR_TARGET is not set
 CT_ALL_BINUTILS_CHOICES="BINUTILS"