2
0
mirror of https://codeberg.org/kiss-community/repo synced 2025-01-06 18:00:10 -07:00
repo/extra/mold/patches/amd64_only.patch

125 lines
4.0 KiB
Diff
Raw Normal View History

2022-09-27 11:10:15 -06:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
2024-09-24 23:28:30 -06:00
index d6d1500..9e831f7 100644
2022-09-27 11:10:15 -06:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
2024-09-24 23:28:30 -06:00
@@ -304,12 +304,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
2022-11-12 23:22:42 -07:00
# compiler instances. This is hacky but greatly reduces compile time
# on a multicore machine.
2022-09-27 11:10:15 -06:00
list(APPEND MOLD_ELF_TARGETS
2023-07-26 18:37:30 -06:00
- X86_64 I386 ARM64 ARM32 RV32LE RV32BE RV64LE RV64BE PPC32 PPC64V1 PPC64V2
2024-09-24 23:28:30 -06:00
- S390X SPARC64 M68K SH4 LOONGARCH32 LOONGARCH64)
2022-09-27 11:10:15 -06:00
+ X86_64)
list(APPEND MOLD_ELF_TEMPLATE_FILES
2024-09-24 23:28:30 -06:00
- src/arch-loongarch.cc
- src/arch-riscv.cc
src/cmdline.cc
src/gc-sections.cc
src/gdb-index.cc
@@ -376,16 +373,6 @@ target_sources(mold PRIVATE
lib/perf.cc
lib/random.cc
lib/tar.cc
- src/arch-arm32.cc
- src/arch-arm64.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-sh4.cc
- src/arch-sparc64.cc
src/arch-x86-64.cc
src/config.cc
src/elf.cc
diff --git a/src/main.cc b/src/main.cc
index ce94043..2373218 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -361,11 +361,6 @@ int mold_main(int argc, char **argv) {
2023-01-06 21:05:46 -07:00
if (ctx.arg.emulation.empty())
2024-05-04 12:24:42 -06:00
ctx.arg.emulation = detect_machine_type(ctx, file_args);
2022-09-27 11:10:15 -06:00
- // Redo if -m is not x86-64.
2023-01-06 21:05:46 -07:00
- if constexpr (is_x86_64<E>)
- if (ctx.arg.emulation != X86_64::target_name)
2023-10-18 16:59:13 -06:00
- return redo_main(ctx, argc, argv);
2022-09-27 11:10:15 -06:00
-
Timer t_all(ctx, "all");
install_signal_handler();
2024-09-24 23:28:30 -06:00
diff --git a/src/mold.h b/src/mold.h
index 322a0ea..9058295 100644
--- a/src/mold.h
+++ b/src/mold.h
@@ -1563,7 +1563,6 @@ std::vector<std::string> parse_nonpositional_args(Context<E> &ctx);
2023-10-18 16:59:13 -06:00
// passes.cc
//
-template <typename E> int redo_main(Context<E> &, int argc, char **argv);
template <typename E> void create_internal_file(Context<E> &);
template <typename E> void apply_exclude_libs(Context<E> &);
template <typename E> void create_synthetic_sections(Context<E> &);
2024-09-24 23:28:30 -06:00
diff --git a/src/passes.cc b/src/passes.cc
index 807bb2b..0ef86a1 100644
--- a/src/passes.cc
+++ b/src/passes.cc
@@ -14,48 +14,6 @@
2023-10-18 16:59:13 -06:00
2024-09-24 23:28:30 -06:00
namespace mold {
2023-10-18 16:59:13 -06:00
2024-09-24 23:28:30 -06:00
-// 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
2023-10-18 16:59:13 -06:00
-// wrong, re-run it with an actual machine type.
-template <typename E>
-int redo_main(Context<E> &ctx, int argc, char **argv) {
- std::string_view target = ctx.arg.emulation;
-
- if (target == I386::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<I386>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == ARM64::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<ARM64>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == ARM32::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<ARM32>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == RV64LE::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<RV64LE>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == RV64BE::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<RV64BE>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == RV32LE::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<RV32LE>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == RV32BE::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<RV32BE>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == PPC32::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<PPC32>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == PPC64V1::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<PPC64V1>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == PPC64V2::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<PPC64V2>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == S390X::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<S390X>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == SPARC64::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<SPARC64>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == M68K::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<M68K>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == SH4::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<SH4>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == LOONGARCH32::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<LOONGARCH32>(argc, argv);
2023-10-18 16:59:13 -06:00
- if (target == LOONGARCH64::target_name)
2024-09-24 23:28:30 -06:00
- return mold_main<LOONGARCH64>(argc, argv);
2023-10-18 16:59:13 -06:00
- unreachable();
-}
-
template <typename E>
void apply_exclude_libs(Context<E> &ctx) {
Timer t(ctx, "apply_exclude_libs");
2024-09-24 23:28:30 -06:00
@@ -3210,7 +3168,6 @@ void show_stats(Context<E> &ctx) {
2023-10-18 16:59:13 -06:00
using E = MOLD_TARGET;
-template int redo_main(Context<E> &, int, char **);
template void create_internal_file(Context<E> &);
template void apply_exclude_libs(Context<E> &);
template void create_synthetic_sections(Context<E> &);