aboutsummaryrefslogtreecommitdiffstats
path: root/main/llvm/llvm-0003-musl-hacks.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-05-22 13:43:22 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-05-22 13:43:22 +0000
commit70622e24effd147a1d3e6206607f73ccdba33e8f (patch)
tree9f6ad37ec2977a564c47819340add467227c9dc0 /main/llvm/llvm-0003-musl-hacks.patch
parent95623fb7c14e2129b8e4f39e947d99dc85d3e158 (diff)
downloadaports-70622e24effd147a1d3e6206607f73ccdba33e8f.tar.bz2
aports-70622e24effd147a1d3e6206607f73ccdba33e8f.tar.xz
Revert "main/llvm: update patchset, switch to cmake, perform two-stage build with a minimal bootstrap compile of clang, add clang extras, update package list to split out clang documentation"
Diffstat (limited to 'main/llvm/llvm-0003-musl-hacks.patch')
-rw-r--r--main/llvm/llvm-0003-musl-hacks.patch97
1 files changed, 0 insertions, 97 deletions
diff --git a/main/llvm/llvm-0003-musl-hacks.patch b/main/llvm/llvm-0003-musl-hacks.patch
deleted file mode 100644
index 7d11534c8d..0000000000
--- a/main/llvm/llvm-0003-musl-hacks.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From cbfa6c322a8082ad40e765a73df9ea9bf695cd6f Mon Sep 17 00:00:00 2001
-From: Travis Tilley <ttilley@gmail.com>
-Date: Sat, 9 May 2015 03:43:33 -0400
-Subject: [PATCH 3/3] weirder musl fixes/hacks that would require refactoring
- before being acceptable upstream
-
----
- include/llvm/Target/TargetLibraryInfo.h | 9 +++++++++
- lib/Support/DynamicLibrary.cpp | 2 +-
- lib/Support/Unix/Signals.inc | 2 +-
- lib/Target/TargetLibraryInfo.cpp | 5 +++--
- utils/unittest/googletest/src/gtest.cc | 1 +
- 5 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/include/llvm/Target/TargetLibraryInfo.h b/include/llvm/Target/TargetLibraryInfo.h
-index 46f87b9..41ac5fd 100644
---- a/include/llvm/Target/TargetLibraryInfo.h
-+++ b/include/llvm/Target/TargetLibraryInfo.h
-@@ -13,6 +13,15 @@
- #include "llvm/ADT/DenseMap.h"
- #include "llvm/Pass.h"
-
-+#undef fopen64
-+#undef fseeko64
-+#undef fstat64
-+#undef fstatvfs64
-+#undef ftello64
-+#undef lstat64
-+#undef stat64
-+#undef tmpfile64
-+
- namespace llvm {
- class Triple;
-
-diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp
-index d2b551e..4634a13 100644
---- a/lib/Support/DynamicLibrary.cpp
-+++ b/lib/Support/DynamicLibrary.cpp
-@@ -138,7 +138,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) {
-
- // This macro returns the address of a well-known, explicit symbol
- #define EXPLICIT_SYMBOL(SYM) \
-- if (!strcmp(symbolName, #SYM)) return &SYM
-+ if (!strcmp(symbolName, #SYM)) return (void *) &SYM
-
- // On linux we have a weird situation. The stderr/out/in symbols are both
- // macros and global variables because of standards requirements. So, we
-diff --git a/lib/Support/Unix/Signals.inc b/lib/Support/Unix/Signals.inc
-index e8f4643..8a320ef 100644
---- a/lib/Support/Unix/Signals.inc
-+++ b/lib/Support/Unix/Signals.inc
-@@ -416,7 +416,7 @@ static bool printSymbolizedStackTrace(void **StackTrace, int Depth, FILE *FD) {
- // On glibc systems we have the 'backtrace' function, which works nicely, but
- // doesn't demangle symbols.
- void llvm::sys::PrintStackTrace(FILE *FD) {
--#if defined(HAVE_BACKTRACE) && defined(ENABLE_BACKTRACES)
-+#if defined(__GLIBC__) && defined(HAVE_BACKTRACE) && defined(ENABLE_BACKTRACES)
- static void* StackTrace[256];
- // Use backtrace() to output a backtrace on Linux systems with glibc.
- int depth = backtrace(StackTrace,
-diff --git a/lib/Target/TargetLibraryInfo.cpp b/lib/Target/TargetLibraryInfo.cpp
-index c0abdbd..ed908f8 100644
---- a/lib/Target/TargetLibraryInfo.cpp
-+++ b/lib/Target/TargetLibraryInfo.cpp
-@@ -664,14 +664,15 @@ static void initialize(TargetLibraryInfo &TLI, const Triple &T,
- }
-
- // The following functions are available on at least Linux:
-- if (!T.isOSLinux()) {
-+ if (!T.isOSLinux())
-+ TLI.setUnavailable(LibFunc::memalign);
-+ if (1 /*!T.isGlibc()*/) {
- TLI.setUnavailable(LibFunc::dunder_strdup);
- TLI.setUnavailable(LibFunc::dunder_strtok_r);
- TLI.setUnavailable(LibFunc::dunder_isoc99_scanf);
- TLI.setUnavailable(LibFunc::dunder_isoc99_sscanf);
- TLI.setUnavailable(LibFunc::under_IO_getc);
- TLI.setUnavailable(LibFunc::under_IO_putc);
-- TLI.setUnavailable(LibFunc::memalign);
- TLI.setUnavailable(LibFunc::fopen64);
- TLI.setUnavailable(LibFunc::fseeko64);
- TLI.setUnavailable(LibFunc::fstat64);
-diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc
-index bf850c6..9e9088c 100644
---- a/utils/unittest/googletest/src/gtest.cc
-+++ b/utils/unittest/googletest/src/gtest.cc
-@@ -120,6 +120,7 @@
-
- #if GTEST_CAN_STREAM_RESULTS_
- # include <arpa/inet.h> // NOLINT
-+# include <sys/socket.h> // NOLINT
- # include <netdb.h> // NOLINT
- #endif
-
---
-2.1.4
-