diff --git a/extra/mold/checksums b/extra/mold/checksums index f0f2cfb3..16c87849 100644 --- a/extra/mold/checksums +++ b/extra/mold/checksums @@ -1,2 +1,2 @@ -d17376ad26cf8d6201486c5a0bc627a79ae9631c9d77f99f2ccf6dcdb882fcaa0e -484496afcae58449817678293f0ca0a8d4572ff81f6b45842c76a480f46a4b8f4b +128d278267f63ca3dbf65609ae2be1e92906eac91bf87ad4cb879d508d17fd609b +9c3bb4e747caafb5f526b26ee1e27d617cb7e6af8a2bd83c9c36539e6950aa5723 diff --git a/extra/mold/patches/elf_amd64_only.patch b/extra/mold/patches/elf_amd64_only.patch index 6a2ac2cb..bc6e1e1c 100644 --- a/extra/mold/patches/elf_amd64_only.patch +++ b/extra/mold/patches/elf_amd64_only.patch @@ -1,16 +1,16 @@ -From 979677eb2560122138c5857b4c2b8e387220a0cd Mon Sep 17 00:00:00 2001 -Message-Id: <979677eb2560122138c5857b4c2b8e387220a0cd.1672107964.git.owen@owenrafferty.com> +From 9010533464e75d9ccfb822ff1871f0ad4a7d1250 Mon Sep 17 00:00:00 2001 +Message-Id: <9010533464e75d9ccfb822ff1871f0ad4a7d1250.1673057881.git.owen@owenrafferty.com> From: Owen Rafferty Date: Mon, 26 Dec 2022 20:20:01 -0600 Subject: [PATCH] only build support for elf amd64 --- - CMakeLists.txt | 12 +----------- + CMakeLists.txt | 15 +-------------- elf/main.cc | 5 ----- - 2 files changed, 1 insertion(+), 16 deletions(-) + 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6b985719..0779117c 100644 +index 07e168c2..360e3ea6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -275,8 +275,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -18,38 +18,41 @@ index 6b985719..0779117c 100644 # on a multicore machine. list(APPEND MOLD_ELF_TARGETS - X86_64 I386 ARM64 ARM32 RV32LE RV32BE RV64LE RV64BE -- PPC64V1 PPC64V2 S390X SPARC64 M68K) +- PPC32 PPC64V1 PPC64V2 S390X SPARC64 M68K SH4 ALPHA) + X86_64) list(APPEND MOLD_ELF_TEMPLATE_FILES elf/cmdline.cc -@@ -337,15 +336,6 @@ endif() +@@ -337,18 +336,6 @@ endif() target_sources(mold PRIVATE compress.cc demangle.cc +- elf/arch-alpha.cc - elf/arch-arm32.cc - elf/arch-arm64.cc - elf/arch-i386.cc - elf/arch-m68k.cc +- elf/arch-ppc32.cc - elf/arch-ppc64v1.cc - elf/arch-ppc64v2.cc - elf/arch-riscv.cc - elf/arch-s390x.cc +- elf/arch-sh4.cc - elf/arch-sparc64.cc elf/arch-x86-64.cc + elf/elf.cc filepath.cc - git-hash.cc diff --git a/elf/main.cc b/elf/main.cc -index ed5b3c03..8bd193f1 100644 +index efa116a2..58a4b3f7 100644 --- a/elf/main.cc +++ b/elf/main.cc -@@ -381,11 +381,6 @@ int elf_main(int argc, char **argv) { - if (ctx.arg.emulation == MachineType::NONE) +@@ -394,11 +394,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 (std::is_same_v) -- if (ctx.arg.emulation != MachineType::X86_64) +- if constexpr (is_x86_64) +- if (ctx.arg.emulation != X86_64::target_name) - return redo_main(argc, argv, ctx.arg.emulation); - Timer t_all(ctx, "all"); diff --git a/extra/mold/version b/extra/mold/version index ab764544..67fe23c8 100644 --- a/extra/mold/version +++ b/extra/mold/version @@ -1 +1 @@ -1.8.0 1 +1.9.0 1