Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/
Date: Thu, 22 Apr 2021 10:00:06
Message-Id: 1619084998.c272e3cd4f02c3b2d4a2073cabdc3e78d6a0d61e.mgorny@gentoo
1 commit: c272e3cd4f02c3b2d4a2073cabdc3e78d6a0d61e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 22 09:49:58 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 22 09:49:58 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c272e3cd
7
8 sys-devel/llvm: Remove stale musl patch
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-devel/llvm/files/9999/musl-fixes.patch | 33 ------------------------------
13 1 file changed, 33 deletions(-)
14
15 diff --git a/sys-devel/llvm/files/9999/musl-fixes.patch b/sys-devel/llvm/files/9999/musl-fixes.patch
16 deleted file mode 100644
17 index 5c516534abc..00000000000
18 --- a/sys-devel/llvm/files/9999/musl-fixes.patch
19 +++ /dev/null
20 @@ -1,33 +0,0 @@
21 -diff --git a/include/llvm/Analysis/TargetLibraryInfo.def b/include/llvm/Analysis/TargetLibraryInfo.def
22 -index 7798e3c..ade2b96 100644
23 ---- a/include/llvm/Analysis/TargetLibraryInfo.def
24 -+++ b/include/llvm/Analysis/TargetLibraryInfo.def
25 -@@ -27,6 +27,15 @@
26 - #define TLI_DEFINE_STRING_INTERNAL(string_repr) string_repr,
27 - #endif
28 -
29 -+// avoid name conflicts with musl-libc
30 -+#undef fopen64
31 -+#undef fseeko64
32 -+#undef ftello64
33 -+#undef fstat64
34 -+#undef lstat64
35 -+#undef stat64
36 -+#undef tmpfile64
37 -+
38 - /// void *new(unsigned int);
39 - TLI_DEFINE_ENUM_INTERNAL(msvc_new_int)
40 - TLI_DEFINE_STRING_INTERNAL("??2@YAPAXI@Z")
41 -diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp
42 -index 9a7aeb5..e98ad80 100644
43 ---- a/lib/Support/DynamicLibrary.cpp
44 -+++ b/lib/Support/DynamicLibrary.cpp
45 -@@ -143,7 +143,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) {
46 - // On linux we have a weird situation. The stderr/out/in symbols are both
47 - // macros and global variables because of standards requirements. So, we
48 - // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first.
49 --#if defined(__linux__) and !defined(__ANDROID__)
50 -+#if defined(__linux__) && defined(__GLIBC__)
51 - {
52 - EXPLICIT_SYMBOL(stderr);
53 - EXPLICIT_SYMBOL(stdout);