Skip to content

Commit c7bba72

Browse files
committed
Downgrade dist-powerpc-linux binutils to 2.30
With binutils 2.32, we were getting errors like this: relocation truncated to fit: R_PPC_PLTREL24 against symbol `__cxa_atexit@@GLIBC_2.1.3' defined in .plt section in /x-tools/powerpc-unknown-linux-gnu/powerpc-unknown-linux-gnu/sysroot/usr/lib/crt1.o but it builds okay with binutils 2.30.
1 parent 68df40e commit c7bba72

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

src/ci/docker/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ For targets: `powerpc-unknown-linux-gnu`
241241
- Target options > Emit assembly for CPU = powerpc -- pure 32-bit PowerPC
242242
- Operating System > Target OS = linux
243243
- Operating System > Linux kernel version = 3.2.101
244-
- Binary utilities > Version of binutils = 2.32
244+
- Binary utilities > Version of binutils = 2.30
245245
- C-library > glibc version = 2.17 -- ~RHEL7 glibc
246246
- C compiler > gcc version = 8.3.0
247247
- C compiler > C++ = ENABLE -- to cross compile LLVM

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

+4-19
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,6 @@ CT_ARCH_POWERPC=y
135135
# CT_ARCH_XTENSA is not set
136136
CT_ARCH="powerpc"
137137
CT_ARCH_CHOICE_KSYM="POWERPC"
138-
# CT_ARCH_ALPHA_EV4 is not set
139-
# CT_ARCH_ALPHA_EV45 is not set
140-
# CT_ARCH_ALPHA_EV5 is not set
141-
# CT_ARCH_ALPHA_EV56 is not set
142-
# CT_ARCH_ALPHA_EV6 is not set
143-
# CT_ARCH_ALPHA_EV67 is not set
144138
CT_ARCH_CPU="powerpc"
145139
CT_ARCH_TUNE=""
146140
CT_ARCH_POWERPC_SHOW=y
@@ -151,7 +145,6 @@ CT_ARCH_POWERPC_SHOW=y
151145
CT_ARCH_POWERPC_PKG_KSYM=""
152146
CT_ARCH_powerpc_ABI=""
153147
CT_ARCH_powerpc_ABI_DEFAULT=y
154-
# CT_ARCH_powerpc_ABI_EABI is not set
155148
# CT_ARCH_powerpc_ABI_SPE is not set
156149
CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC RISCV S390 SH SPARC X86 XTENSA"
157150
CT_ARCH_SUFFIX=""
@@ -317,22 +310,22 @@ CT_BINUTILS_USE="BINUTILS"
317310
CT_BINUTILS_PKG_NAME="binutils"
318311
CT_BINUTILS_SRC_RELEASE=y
319312
CT_BINUTILS_PATCH_ORDER="global"
320-
CT_BINUTILS_V_2_32=y
313+
# CT_BINUTILS_V_2_32 is not set
321314
# CT_BINUTILS_V_2_31 is not set
322-
# CT_BINUTILS_V_2_30 is not set
315+
CT_BINUTILS_V_2_30=y
323316
# CT_BINUTILS_V_2_29 is not set
324317
# CT_BINUTILS_V_2_28 is not set
325318
# CT_BINUTILS_V_2_27 is not set
326319
# CT_BINUTILS_V_2_26 is not set
327320
# CT_BINUTILS_NO_VERSIONS is not set
328-
CT_BINUTILS_VERSION="2.32"
321+
CT_BINUTILS_VERSION="2.30"
329322
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
330323
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
331324
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
332325
CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
333326
CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
334-
CT_BINUTILS_later_than_2_30=y
335327
CT_BINUTILS_2_30_or_later=y
328+
CT_BINUTILS_2_30_or_older=y
336329
CT_BINUTILS_later_than_2_27=y
337330
CT_BINUTILS_2_27_or_later=y
338331
CT_BINUTILS_later_than_2_25=y
@@ -361,8 +354,6 @@ CT_ALL_BINUTILS_CHOICES="BINUTILS"
361354
# C-library
362355
#
363356
CT_LIBC_GLIBC=y
364-
# CT_LIBC_NEWLIB is not set
365-
# CT_LIBC_NONE is not set
366357
# CT_LIBC_UCLIBC is not set
367358
CT_LIBC="glibc"
368359
CT_LIBC_CHOICE_KSYM="GLIBC"
@@ -437,12 +428,6 @@ CT_GLIBC_FORCE_UNWIND=y
437428
CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
438429
# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
439430
CT_GLIBC_MIN_KERNEL="3.2.101"
440-
# CT_GLIBC_SSP_DEFAULT is not set
441-
# CT_GLIBC_SSP_NO is not set
442-
# CT_GLIBC_SSP_YES is not set
443-
# CT_GLIBC_SSP_ALL is not set
444-
# CT_GLIBC_SSP_STRONG is not set
445-
# CT_NEWLIB_USE_REDHAT is not set
446431
CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
447432
CT_LIBC_SUPPORT_THREADS_ANY=y
448433
CT_LIBC_SUPPORT_THREADS_NATIVE=y

0 commit comments

Comments
 (0)