Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (88913fdc3fed702078de6121c718a6eb1a09fd5b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (88913fdc3fed702078de6121c718a6eb1a09fd5b)
  • Date: Fri, 31 Mar 2023 18:46:41 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

devel/llvm/0001-Include-libunwind-from-source-directory.patch |
25 --------
devel/llvm/PRE_BUILD |
8 --
devel/llvm/patches-libcxx/libcxxabi-dl.patch |
27 ---------
devel/llvm/patches-lld/0001-Include-libunwind-from-source-directory.patch |
28 ++++++++++
devel/llvm/patches-lld/libcxxabi-dl.patch |
27 +++++++++
5 files changed, 56 insertions(+), 59 deletions(-)

New commits:
commit 88913fdc3fed702078de6121c718a6eb1a09fd5b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

llvm: Reorganize LLD patches

diff --git a/devel/llvm/0001-Include-libunwind-from-source-directory.patch
b/devel/llvm/0001-Include-libunwind-from-source-directory.patch
deleted file mode 100644
index 2b9bc64..0000000
--- a/devel/llvm/0001-Include-libunwind-from-source-directory.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2cf2b1af0f0be6431c1e239d482056ef4d4ac17f Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <Florian.Franzmann AT bandrate.org>
-Date: Sun, 2 May 2021 13:24:21 +0200
-Subject: [PATCH] Include libunwind from source directory
-
----
- lld/MachO/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lld/MachO/CMakeLists.txt b/lld/MachO/CMakeLists.txt
-index b76f37dcc6e6..69ca3fc6de67 100644
---- a/lld/MachO/CMakeLists.txt
-+++ b/lld/MachO/CMakeLists.txt
-@@ -2,7 +2,7 @@ set(LLVM_TARGET_DEFINITIONS Options.td)
- tablegen(LLVM Options.inc -gen-opt-parser-defs)
- add_public_tablegen_target(MachOOptionsTableGen)
-
--include_directories(${LLVM_MAIN_SRC_DIR}/../libunwind/include)
-+include_directories(${LLVM_MAIN_SRC_DIR}/libunwind/include)
-
- add_lld_library(lldMachO2
- Arch/X86_64.cpp
---
-2.31.1
-
diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index d47db4a..721c301 100755
--- a/devel/llvm/PRE_BUILD
+++ b/devel/llvm/PRE_BUILD
@@ -35,13 +35,7 @@ if [[ "$LLVM_WITH_LLD" == y ]]; then
mv libcxx-${VERSION}.src runtimes/libcxx &&
unpack_file 19 &&
mv libcxxabi-${VERSION}.src runtimes/libcxxabi &&
- apply_patch_dir patches-libcxx &&
-
- # Bugfix for llvm 12.0.0, cf.
https://groups.google.com/g/llvm-dev/c/gIY5COm6V5E
- # This will probably be fixed in llvm 12.0.1.
- # As of 2021-07-10 this has not been fixed.
- cd "$SOURCE_DIRECTORY/tools" &&
- patch -p1 <
"$SPELL_DIRECTORY/0001-Include-libunwind-from-source-directory.patch"
+ apply_patch_dir patches-lld
fi &&

cd "$SOURCE_DIRECTORY" &&
diff --git a/devel/llvm/patches-libcxx/libcxxabi-dl.patch
b/devel/llvm/patches-libcxx/libcxxabi-dl.patch
deleted file mode 100644
index d47a227..0000000
--- a/devel/llvm/patches-libcxx/libcxxabi-dl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Also link to -ldl to prevent undefined references.
-
-Origin: Void Linux
-
---- a/runtimes/libcxxabi/src/CMakeLists.txt
-+++ b/runtimes/libcxxabi/src/CMakeLists.txt
-@@ -73,6 +73,7 @@
- endif()
-
- add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
-+ add_library_flags_if(LIBCXXABI_HAS_C_LIB dl)
- endif()
-
- if (LIBCXXABI_USE_LLVM_UNWINDER)
---- a/runtimes/libcxx/CMakeLists.txt
-+++ b/runtimes/libcxx/CMakeLists.txt
-@@ -745,6 +745,10 @@
- target_link_libraries(${target} PRIVATE m)
- endif()
-
-+ if (LIBCXX_HAS_C_LIB)
-+ target_link_libraries(${target} PRIVATE dl)
-+ endif()
-+
- if (LIBCXX_HAS_RT_LIB)
- target_link_libraries(${target} PRIVATE rt)
- endif()
diff --git
a/devel/llvm/patches-lld/0001-Include-libunwind-from-source-directory.patch
b/devel/llvm/patches-lld/0001-Include-libunwind-from-source-directory.patch
new file mode 100644
index 0000000..f33f200
--- /dev/null
+++
b/devel/llvm/patches-lld/0001-Include-libunwind-from-source-directory.patch
@@ -0,0 +1,28 @@
+From 2cf2b1af0f0be6431c1e239d482056ef4d4ac17f Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <Florian.Franzmann AT bandrate.org>
+Date: Sun, 2 May 2021 13:24:21 +0200
+Subject: [PATCH] Include libunwind from source directory
+
+Ref: https://groups.google.com/g/llvm-dev/c/gIY5COm6V5E
+Upstream-Status: Unknown [should have been fixed in LLZM 12.0.1;
+ as of LLVM 16.0.0 this has not been fixed.]
+---
+ tools/lld/MachO/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/lld/MachO/CMakeLists.txt b/tools/lld/MachO/CMakeLists.txt
+index b76f37dcc6e6..69ca3fc6de67 100644
+--- a/tools/lld/MachO/CMakeLists.txt
++++ b/tools/lld/MachO/CMakeLists.txt
+@@ -2,7 +2,7 @@ set(LLVM_TARGET_DEFINITIONS Options.td)
+ tablegen(LLVM Options.inc -gen-opt-parser-defs)
+ add_public_tablegen_target(MachOOptionsTableGen)
+
+-include_directories(${LLVM_MAIN_SRC_DIR}/../libunwind/include)
++include_directories(${LLVM_MAIN_SRC_DIR}/libunwind/include)
+
+ add_lld_library(lldMachO2
+ Arch/X86_64.cpp
+--
+2.31.1
+
diff --git a/devel/llvm/patches-lld/libcxxabi-dl.patch
b/devel/llvm/patches-lld/libcxxabi-dl.patch
new file mode 100644
index 0000000..d47a227
--- /dev/null
+++ b/devel/llvm/patches-lld/libcxxabi-dl.patch
@@ -0,0 +1,27 @@
+Also link to -ldl to prevent undefined references.
+
+Origin: Void Linux
+
+--- a/runtimes/libcxxabi/src/CMakeLists.txt
++++ b/runtimes/libcxxabi/src/CMakeLists.txt
+@@ -73,6 +73,7 @@
+ endif()
+
+ add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
++ add_library_flags_if(LIBCXXABI_HAS_C_LIB dl)
+ endif()
+
+ if (LIBCXXABI_USE_LLVM_UNWINDER)
+--- a/runtimes/libcxx/CMakeLists.txt
++++ b/runtimes/libcxx/CMakeLists.txt
+@@ -745,6 +745,10 @@
+ target_link_libraries(${target} PRIVATE m)
+ endif()
+
++ if (LIBCXX_HAS_C_LIB)
++ target_link_libraries(${target} PRIVATE dl)
++ endif()
++
+ if (LIBCXX_HAS_RT_LIB)
+ target_link_libraries(${target} PRIVATE rt)
+ endif()



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (88913fdc3fed702078de6121c718a6eb1a09fd5b), Ismael Luceno, 03/31/2023

Archive powered by MHonArc 2.6.24.

Top of Page