From 8b56d90436b5b8e4c956eba2f4a385bf8806826b Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Fri, 26 Jan 2024 17:22:49 -0800
Subject: [PATCH] downgrade binutils in stage2/3 to avoid determinism
 regression

---
 src/bootstrap/stage2/Dockerfile | 11 +++++++----
 src/bootstrap/stage3/Dockerfile | 18 ++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/bootstrap/stage2/Dockerfile b/src/bootstrap/stage2/Dockerfile
index 975426d..63e4152 100644
--- a/src/bootstrap/stage2/Dockerfile
+++ b/src/bootstrap/stage2/Dockerfile
@@ -29,10 +29,10 @@ ENV LINUX_VERSION 6.6
 ENV LINUX_HASH d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0
 ENV LINUX_FILE linux-${LINUX_VERSION}.tar.xz
 ENV LINUX_DIR ${HOME}/build-linux
-ENV BINUTILS_VERSION 2.41
+ENV BINUTILS_VERSION 2.35
 ENV BINUTILS_SITE https://ftp.gnu.org/gnu/binutils
 ENV BINUTILS_FILE binutils-${BINUTILS_VERSION}.tar.xz
-ENV BINUTILS_HASH ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ENV BINUTILS_HASH 1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85
 ENV BINUTILS_DIR ${HOME}/build-binutils
 
 FROM base as fetch
@@ -77,10 +77,13 @@ RUN set -eux; \
         --with-sysroot=/${TARGET} \
         --prefix= \
         --libdir=/lib \
-        --disable-werror \
+        --disable-nls \
         --disable-multilib \
+        --disable-plugins \
         --disable-gprofng \
-        --disable-separate-code \
+        --enable-64-bit-bfd \
+        --enable-ld=default \
+        --enable-install-libiberty \
         --enable-deterministic-archives; \
     make all
 
diff --git a/src/bootstrap/stage3/Dockerfile b/src/bootstrap/stage3/Dockerfile
index 6b9bf65..66571ab 100644
--- a/src/bootstrap/stage3/Dockerfile
+++ b/src/bootstrap/stage3/Dockerfile
@@ -16,8 +16,8 @@ ENV BUSYBOX_HASH=faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a69
 ENV BUSYBOX_SITE=https://busybox.net/downloads
 ENV BUSYBOX_FILE=busybox-${BUSYBOX_VERSION}.tar.bz2
 ENV BUSYBOX_DIR ${HOME}/build-busybox
-ENV BINUTILS_VERSION 2.41
-ENV BINUTILS_HASH ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ENV BINUTILS_VERSION 2.35
+ENV BINUTILS_HASH 1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85
 ENV BINUTILS_SITE https://ftp.gnu.org/gnu/binutils
 ENV BINUTILS_FILE binutils-${BINUTILS_VERSION}.tar.xz
 ENV BINUTILS_DIR ${HOME}/build-binutils
@@ -109,15 +109,13 @@ RUN set -eux; \
         --infodir=/usr/share/info \
         --sysconfdir=/etc \
         --disable-nls \
-        --disable-werror \
-        --disable-gprofng \
         --disable-multilib \
-        --disable-gdb \
-        --disable-separate-code \
-        --enable-deterministic-archives \
-        --enable-threads \
-        --with-mmap \
-        --with-pic; \
+        --disable-plugins \
+        --disable-gprofng \
+        --enable-64-bit-bfd \
+        --enable-ld=default \
+        --enable-install-libiberty \
+        --enable-deterministic-archives; \
     make
 WORKDIR ${MAKE_DIR}
 RUN set -ex; \