From e960c1592808988fc677bb94414d8f71ea5deaab Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Wed, 26 Jul 2023 19:37:30 -0500 Subject: [PATCH] mold: 2.0.0 --- extra/mold/build | 2 +- extra/mold/checksums | 4 +-- ...{elf_amd64_only.patch => amd64_only.patch} | 29 +++++-------------- extra/mold/sources | 4 +-- extra/mold/version | 2 +- 5 files changed, 14 insertions(+), 27 deletions(-) rename extra/mold/patches/{elf_amd64_only.patch => amd64_only.patch} (57%) diff --git a/extra/mold/build b/extra/mold/build index 2ecee125..d07aff26 100755 --- a/extra/mold/build +++ b/extra/mold/build @@ -8,7 +8,7 @@ export DESTDIR="$1" # for performing LTO. # export LDFLAGS="$LDFLAGS -static" -patch -p1 < elf_amd64_only.patch +patch -p1 < amd64_only.patch cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/mold/checksums b/extra/mold/checksums index 723ce00e..36bf19c2 100644 --- a/extra/mold/checksums +++ b/extra/mold/checksums @@ -1,2 +1,2 @@ -15989da66b2ae38442ee97aa105d4573f9273940cfb5382f444701965b088e34d3 -0a8e2043fef94d47544b315a04c0c4482365387d63bd9b9dd78f2d2e8903f2e068 +79e610e83a42c19a4de6bba835c9d4f8ec3911300ec5ca16451d84e5fdffadf0af +d3d9257eea8a094b8c80d2fd59ec08811cdff5757a9c6ae6e38a1bde82eef4d5b4 diff --git a/extra/mold/patches/elf_amd64_only.patch b/extra/mold/patches/amd64_only.patch similarity index 57% rename from extra/mold/patches/elf_amd64_only.patch rename to extra/mold/patches/amd64_only.patch index 6b3549ff..89f5a9aa 100644 --- a/extra/mold/patches/elf_amd64_only.patch +++ b/extra/mold/patches/amd64_only.patch @@ -1,29 +1,18 @@ -From 3057ba9c59a4d3e8d027d1cb71c1212e287dcf84 Mon Sep 17 00:00:00 2001 -Message-Id: <3057ba9c59a4d3e8d027d1cb71c1212e287dcf84.1679014002.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 | 15 +-------------- - elf/main.cc | 5 ----- - 2 files changed, 1 insertion(+), 19 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index ef0951a2..d24b9a1c 100644 +index ceda7b2..1a5b3fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -284,8 +284,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) +@@ -288,8 +288,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) +- X86_64 I386 ARM64 ARM32 RV32LE RV32BE RV64LE RV64BE PPC32 PPC64V1 PPC64V2 +- S390X SPARC64 M68K SH4 ALPHA MIPS64LE MIPS64BE) + X86_64) list(APPEND MOLD_ELF_TEMPLATE_FILES elf/cmdline.cc -@@ -355,18 +354,6 @@ target_sources(mold PRIVATE +@@ -360,19 +359,6 @@ target_sources(mold PRIVATE common/perf.cc common/tar.cc common/uuid.cc @@ -32,6 +21,7 @@ index ef0951a2..d24b9a1c 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 @@ -43,10 +33,10 @@ index ef0951a2..d24b9a1c 100644 elf/elf.cc git-hash.cc diff --git a/elf/main.cc b/elf/main.cc -index 21da6e75..c2cac979 100644 +index 803069e..b68a8fe 100644 --- a/elf/main.cc +++ b/elf/main.cc -@@ -394,11 +394,6 @@ int elf_main(int argc, char **argv) { +@@ -402,11 +402,6 @@ int elf_main(int argc, char **argv) { if (ctx.arg.emulation.empty()) ctx.arg.emulation = deduce_machine_type(ctx, file_args); @@ -58,6 +48,3 @@ index 21da6e75..c2cac979 100644 Timer t_all(ctx, "all"); install_signal_handler(); --- -2.40.0 - diff --git a/extra/mold/sources b/extra/mold/sources index 25a64595..448a5d27 100644 --- a/extra/mold/sources +++ b/extra/mold/sources @@ -1,2 +1,2 @@ -https://github.com/rui314/mold/archive/v1.11.0.tar.gz -patches/elf_amd64_only.patch +https://github.com/rui314/mold/archive/v2.0.0.tar.gz +patches/amd64_only.patch diff --git a/extra/mold/version b/extra/mold/version index 0da43b10..b31a7f39 100644 --- a/extra/mold/version +++ b/extra/mold/version @@ -1 +1 @@ -1.11.0 1 +2.0.0 1