From 00c98ed82ca409f8537322a00ede82297389cdb7 Mon Sep 17 00:00:00 2001 From: Woodpecker CI Date: Tue, 10 Jun 2025 11:42:19 +0000 Subject: Woodpecker CI 7cbd6585f10cc503bb5c3a819451148545d55447 [SKIP CI] --- mold/amd64_only.patch | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 mold/amd64_only.patch (limited to 'mold/amd64_only.patch') diff --git a/mold/amd64_only.patch b/mold/amd64_only.patch new file mode 100644 index 00000000..1a1574a2 --- /dev/null +++ b/mold/amd64_only.patch @@ -0,0 +1,131 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bb88c8d..4f0e084 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -314,16 +314,9 @@ 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 ARM64LE ARM64BE ARM32LE ARM32BE RV32LE RV32BE RV64LE +- RV64BE PPC32 PPC64V1 PPC64V2 S390X SPARC64 M68K SH4LE SH4BE +- LOONGARCH32 LOONGARCH64) ++ X86_64) + + list(APPEND MOLD_ELF_TEMPLATE_FILES +- src/arch-arm32.cc +- src/arch-arm64.cc +- src/arch-loongarch.cc +- src/arch-riscv.cc +- src/arch-sh4.cc + src/cmdline.cc + src/filetype.cc + src/gc-sections.cc +@@ -390,13 +383,6 @@ target_sources(mold PRIVATE + lib/perf.cc + lib/random.cc + lib/tar.cc +- src/arch-i386.cc +- src/arch-m68k.cc +- src/arch-ppc32.cc +- src/arch-ppc64v1.cc +- src/arch-ppc64v2.cc +- src/arch-s390x.cc +- src/arch-sparc64.cc + src/arch-x86-64.cc + src/elf.cc + src/entry.cc +diff --git a/src/main.cc b/src/main.cc +index c2faf27..0ea5d4c 100644 +--- a/src/main.cc ++++ b/src/main.cc +@@ -279,11 +279,6 @@ int mold_main(int argc, char **argv) { + if (ctx.arg.emulation.empty()) + ctx.arg.emulation = detect_machine_type(ctx, file_args); + +- // Redo if -m is not x86-64. +- if constexpr (is_x86_64) +- if (ctx.arg.emulation != X86_64::name) +- return redo_main(ctx, argc, argv); +- + Timer t_all(ctx, "all"); + + install_signal_handler(); +diff --git a/src/mold.h b/src/mold.h +index 237af93..8bf58bd 100644 +--- a/src/mold.h ++++ b/src/mold.h +@@ -1665,7 +1665,6 @@ std::vector parse_nonpositional_args(Context &ctx); + // passes.cc + // + +-template int redo_main(Context &, int argc, char **argv); + template void create_internal_file(Context &); + template void apply_exclude_libs(Context &); + template void create_synthetic_sections(Context &); +diff --git a/src/passes.cc b/src/passes.cc +index 4e8ba24..3ebc333 100644 +--- a/src/passes.cc ++++ b/src/passes.cc +@@ -13,54 +13,6 @@ + + namespace mold { + +-// Since mold_main is a template, we can't run it without a type parameter. +-// We speculatively run mold_main with X86_64, and if the speculation was +-// wrong, re-run it with an actual machine type. +-template +-int redo_main(Context &ctx, int argc, char **argv) { +- std::string_view target = ctx.arg.emulation; +- +- if (target == I386::name) +- return mold_main(argc, argv); +- if (target == ARM64LE::name) +- return mold_main(argc, argv); +- if (target == ARM64BE::name) +- return mold_main(argc, argv); +- if (target == ARM32LE::name) +- return mold_main(argc, argv); +- if (target == ARM32BE::name) +- return mold_main(argc, argv); +- if (target == RV64LE::name) +- return mold_main(argc, argv); +- if (target == RV64BE::name) +- return mold_main(argc, argv); +- if (target == RV32LE::name) +- return mold_main(argc, argv); +- if (target == RV32BE::name) +- return mold_main(argc, argv); +- if (target == PPC32::name) +- return mold_main(argc, argv); +- if (target == PPC64V1::name) +- return mold_main(argc, argv); +- if (target == PPC64V2::name) +- return mold_main(argc, argv); +- if (target == S390X::name) +- return mold_main(argc, argv); +- if (target == SPARC64::name) +- return mold_main(argc, argv); +- if (target == M68K::name) +- return mold_main(argc, argv); +- if (target == SH4LE::name) +- return mold_main(argc, argv); +- if (target == SH4BE::name) +- return mold_main(argc, argv); +- if (target == LOONGARCH32::name) +- return mold_main(argc, argv); +- if (target == LOONGARCH64::name) +- return mold_main(argc, argv); +- abort(); +-} +- + template + void apply_exclude_libs(Context &ctx) { + Timer t(ctx, "apply_exclude_libs"); +@@ -3513,7 +3465,6 @@ void show_stats(Context &ctx) { + + using E = MOLD_TARGET; + +-template int redo_main(Context &, int, char **); + template void create_internal_file(Context &); + template void apply_exclude_libs(Context &); + template void create_synthetic_sections(Context &); -- cgit v1.2.3