From d2cc50addbd6995c044cc6927d43e6f072ff4e51 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Wed, 27 Sep 2023 21:07:49 -0500
Subject: [PATCH] mold: 2.2.0

---
 extra/mold/checksums                |  4 ++--
 extra/mold/patches/amd64_only.patch | 15 +++++++--------
 extra/mold/sources                  |  2 +-
 extra/mold/version                  |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/extra/mold/checksums b/extra/mold/checksums
index f194507a..a6114000 100644
--- a/extra/mold/checksums
+++ b/extra/mold/checksums
@@ -1,2 +1,2 @@
-1ec3a467e110affec952be7823a93de2c56700107da4179dd0ee401754914fb68e
-432ad04c4a6e1f98fcaf04fb8fdf9d50e0dbd6fabfb0d0a85e9965dccbcd0f8a4d
+3dda6e60c2d463efa586fffa52a6dfdf34e5e983140888ad372677bf882699cd38
+ffcb3fce3fe805b11c955feb4067d5b650934267d47df7239b45e8f8e7830cbe85
diff --git a/extra/mold/patches/amd64_only.patch b/extra/mold/patches/amd64_only.patch
index 6a57f5a2..f06a3435 100644
--- a/extra/mold/patches/amd64_only.patch
+++ b/extra/mold/patches/amd64_only.patch
@@ -1,18 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1c4f1f9..78cc7c0 100644
+index 0cff71f..e9dad4e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -288,8 +288,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+@@ -294,8 +294,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
  # compiler instances. This is hacky but greatly reduces compile time
  # on a multicore machine.
  list(APPEND MOLD_ELF_TARGETS
 -  X86_64 I386 ARM64 ARM32 RV32LE RV32BE RV64LE RV64BE PPC32 PPC64V1 PPC64V2
--  S390X SPARC64 M68K SH4 ALPHA MIPS64LE MIPS64BE LOONGARCH32 LOONGARCH64)
+-  S390X SPARC64 M68K SH4 ALPHA LOONGARCH32 LOONGARCH64)
 +  X86_64)
  
  list(APPEND MOLD_ELF_TEMPLATE_FILES
    elf/arch-loongarch.cc
-@@ -362,18 +361,6 @@ target_sources(mold PRIVATE
+@@ -370,17 +369,6 @@ target_sources(mold PRIVATE
    common/perf.cc
    common/tar.cc
    common/uuid.cc
@@ -21,7 +21,6 @@ index 1c4f1f9..78cc7c0 100644
 -  elf/arch-arm64.cc
 -  elf/arch-i386.cc
 -  elf/arch-m68k.cc
--  elf/arch-mips64.cc
 -  elf/arch-ppc32.cc
 -  elf/arch-ppc64v1.cc
 -  elf/arch-ppc64v2.cc
@@ -32,17 +31,17 @@ index 1c4f1f9..78cc7c0 100644
    elf/elf.cc
    git-hash.cc
 diff --git a/elf/main.cc b/elf/main.cc
-index 90ceed9..2452cbd 100644
+index 8827a8c..64388cd 100644
 --- a/elf/main.cc
 +++ b/elf/main.cc
-@@ -408,11 +408,6 @@ int elf_main(int argc, char **argv) {
+@@ -399,11 +399,6 @@ int elf_main(int argc, char **argv) {
    if (ctx.arg.emulation.empty())
      ctx.arg.emulation = deduce_machine_type(ctx, file_args);
  
 -  // Redo if -m is not x86-64.
 -  if constexpr (is_x86_64<E>)
 -    if (ctx.arg.emulation != X86_64::target_name)
--      return redo_main<E>(argc, argv, ctx.arg.emulation);
+-      return redo_main(argc, argv, ctx.arg.emulation);
 -
    Timer t_all(ctx, "all");
  
diff --git a/extra/mold/sources b/extra/mold/sources
index b2038539..48914ef9 100644
--- a/extra/mold/sources
+++ b/extra/mold/sources
@@ -1,2 +1,2 @@
-https://github.com/rui314/mold/archive/v2.1.0.tar.gz
+https://github.com/rui314/mold/archive/v2.2.0.tar.gz
 patches/amd64_only.patch
diff --git a/extra/mold/version b/extra/mold/version
index ef862396..d3291fa3 100644
--- a/extra/mold/version
+++ b/extra/mold/version
@@ -1 +1 @@
-2.1.0 1
+2.2.0 1