Skip to content

Commit d46ba07

Browse files
authored
Rollup merge of rust-lang#58986 - cuviper:ppc64-binutils, r=alexcrichton
[CI] Update binutils for powerpc64 and powerpc64le Cargo powerpc64 and powerpc64le are seeing `SIGILL` crashes in openssl, which was found to be a linking problem, fixed by newer binutils. See <rust-lang#57345 (comment)> For powerpc64 we're using crosstool-ng, which doesn't offer a newer binutils version, but we can just compile it separately. On powerpc64le we're already building binutils. Both are now updated to binutils 2.32. Closes rust-lang/cargo#6320 Closes rust-lang#57345 Closes rust-lang/rustup#1620 r? @alexcrichton
2 parents 9200f05 + c843fe7 commit d46ba07

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

src/ci/docker/dist-powerpc64-linux/build-powerpc64-toolchain.sh

+20
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,29 @@ set -ex
33

44
source shared.sh
55

6+
BINUTILS=2.32
7+
TARGET=powerpc64-unknown-linux-gnu
8+
PREFIX=/x-tools/$TARGET
9+
SYSROOT=$PREFIX/$TARGET/sysroot
10+
611
mkdir build
712
cd build
813
cp ../powerpc64-linux-gnu.config .config
914
hide_output ct-ng build
1015
cd ..
1116
rm -rf build
17+
18+
chmod -R u+w $PREFIX
19+
20+
# Next, download and build newer binutils.
21+
mkdir binutils-$TARGET
22+
pushd binutils-$TARGET
23+
curl https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS.tar.bz2 | tar xjf -
24+
mkdir binutils-build
25+
cd binutils-build
26+
hide_output ../binutils-$BINUTILS/configure --target=$TARGET \
27+
--prefix=$PREFIX --with-sysroot=$SYSROOT
28+
hide_output make -j10
29+
hide_output make install
30+
popd
31+
rm -rf binutils-$TARGET

src/ci/docker/dist-powerpc64le-linux/build-powerpc64le-toolchain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -ex
44

55
source shared.sh
66

7-
BINUTILS=2.25.1
7+
BINUTILS=2.32
88
GCC=5.3.0
99
TARGET=powerpc64le-linux-gnu
1010
SYSROOT=/usr/local/$TARGET/sysroot

0 commit comments

Comments
 (0)