forked from kiss-community/repo
mold: 1.8.0
This commit is contained in:
parent
0600f6507e
commit
30107ff240
@ -1,2 +1,2 @@
|
|||||||
ba6532fd8cfcd3f865430ea062eca0d70011f10b296f749f2abfbef3879b17d24e
|
d17376ad26cf8d6201486c5a0bc627a79ae9631c9d77f99f2ccf6dcdb882fcaa0e
|
||||||
f4fc8dc3809f71dfd1875bc77f9dfa18638ab6e99055e0dee1af5bbeedd13ced75
|
484496afcae58449817678293f0ca0a8d4572ff81f6b45842c76a480f46a4b8f4b
|
||||||
|
@ -1,8 +1,19 @@
|
|||||||
|
From 979677eb2560122138c5857b4c2b8e387220a0cd Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <979677eb2560122138c5857b4c2b8e387220a0cd.1672107964.git.owen@owenrafferty.com>
|
||||||
|
From: Owen Rafferty <owen@owenrafferty.com>
|
||||||
|
Date: Mon, 26 Dec 2022 20:20:01 -0600
|
||||||
|
Subject: [PATCH] only build support for elf amd64
|
||||||
|
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 12 +-----------
|
||||||
|
elf/main.cc | 5 -----
|
||||||
|
2 files changed, 1 insertion(+), 16 deletions(-)
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index 3c14940..3541b40 100644
|
index 6b985719..0779117c 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -262,8 +262,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
@@ -275,8 +275,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||||
# compiler instances. This is hacky but greatly reduces compile time
|
# compiler instances. This is hacky but greatly reduces compile time
|
||||||
# on a multicore machine.
|
# on a multicore machine.
|
||||||
list(APPEND MOLD_ELF_TARGETS
|
list(APPEND MOLD_ELF_TARGETS
|
||||||
@ -12,17 +23,7 @@ index 3c14940..3541b40 100644
|
|||||||
|
|
||||||
list(APPEND MOLD_ELF_TEMPLATE_FILES
|
list(APPEND MOLD_ELF_TEMPLATE_FILES
|
||||||
elf/cmdline.cc
|
elf/cmdline.cc
|
||||||
@@ -312,33 +311,15 @@ foreach (SOURCE IN LISTS MOLD_ELF_TEMPLATE_FILES)
|
@@ -337,15 +336,6 @@ endif()
|
||||||
endforeach()
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
-foreach (SOURCE IN LISTS MOLD_MACHO_TEMPLATE_FILES)
|
|
||||||
- foreach(TARGET IN LISTS MOLD_MACHO_TARGETS)
|
|
||||||
- mold_instantiate_templates(${SOURCE} ${TARGET})
|
|
||||||
- endforeach()
|
|
||||||
-endforeach()
|
|
||||||
-
|
|
||||||
# Add other non-template source files.
|
|
||||||
target_sources(mold PRIVATE
|
target_sources(mold PRIVATE
|
||||||
compress.cc
|
compress.cc
|
||||||
demangle.cc
|
demangle.cc
|
||||||
@ -38,19 +39,11 @@ index 3c14940..3541b40 100644
|
|||||||
elf/arch-x86-64.cc
|
elf/arch-x86-64.cc
|
||||||
filepath.cc
|
filepath.cc
|
||||||
git-hash.cc
|
git-hash.cc
|
||||||
glob.cc
|
|
||||||
hyperloglog.cc
|
|
||||||
- macho/arch-arm64.cc
|
|
||||||
- macho/arch-x86-64.cc
|
|
||||||
- macho/yaml.cc
|
|
||||||
main.cc
|
|
||||||
multi-glob.cc
|
|
||||||
perf.cc
|
|
||||||
diff --git a/elf/main.cc b/elf/main.cc
|
diff --git a/elf/main.cc b/elf/main.cc
|
||||||
index 8b6cf3fb..46e07424 100644
|
index ed5b3c03..8bd193f1 100644
|
||||||
--- a/elf/main.cc
|
--- a/elf/main.cc
|
||||||
+++ b/elf/main.cc
|
+++ b/elf/main.cc
|
||||||
@@ -422,11 +422,6 @@ int elf_main(int argc, char **argv) {
|
@@ -381,11 +381,6 @@ int elf_main(int argc, char **argv) {
|
||||||
if (ctx.arg.emulation == MachineType::NONE)
|
if (ctx.arg.emulation == MachineType::NONE)
|
||||||
ctx.arg.emulation = deduce_machine_type(ctx, file_args);
|
ctx.arg.emulation = deduce_machine_type(ctx, file_args);
|
||||||
|
|
||||||
@ -62,16 +55,6 @@ index 8b6cf3fb..46e07424 100644
|
|||||||
Timer t_all(ctx, "all");
|
Timer t_all(ctx, "all");
|
||||||
|
|
||||||
install_signal_handler();
|
install_signal_handler();
|
||||||
diff --git a/main.cc b/main.cc
|
--
|
||||||
index db834c69..181e045e 100644
|
2.39.0
|
||||||
--- a/main.cc
|
|
||||||
+++ b/main.cc
|
|
||||||
@@ -144,8 +144,5 @@ i64 get_default_thread_count() {
|
|
||||||
int main(int argc, char **argv) {
|
|
||||||
mold::mold_version = mold::get_mold_version();
|
|
||||||
|
|
||||||
- std::string cmd = mold::filepath(argv[0]).filename().string();
|
|
||||||
- if (cmd == "ld64" || cmd == "ld64.mold")
|
|
||||||
- return mold::macho::main(argc, argv);
|
|
||||||
return mold::elf::main(argc, argv);
|
|
||||||
}
|
|
||||||
|
@ -1 +1 @@
|
|||||||
1.7.1 1
|
1.8.0 1
|
||||||
|
Loading…
Reference in New Issue
Block a user