57 lines
2 KiB
Diff
57 lines
2 KiB
Diff
From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001
|
|
From: Andrea Brancaleoni <miwaxe@gmail.com>
|
|
Date: Tue, 8 Sep 2015 22:03:02 +0200
|
|
Subject: [PATCH 3/3] musl
|
|
|
|
---
|
|
include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++
|
|
lib/Support/DynamicLibrary.cpp | 2 +-
|
|
lib/Support/Unix/Signals.inc | 6 +++---
|
|
utils/unittest/googletest/src/gtest.cc | 1 +
|
|
5 files changed, 17 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h
|
|
index 34a8a1e3..1214ece5 100644
|
|
--- a/llvm/include/llvm/Analysis/TargetLibraryInfo.h
|
|
+++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.h
|
|
@@ -18,6 +18,15 @@
|
|
#include "llvm/IR/PassManager.h"
|
|
#include "llvm/Pass.h"
|
|
|
|
+#undef fopen64
|
|
+#undef fseeko64
|
|
+#undef fstat64
|
|
+#undef fstatvfs64
|
|
+#undef ftello64
|
|
+#undef lstat64
|
|
+#undef stat64
|
|
+#undef tmpfile64
|
|
+
|
|
namespace llvm {
|
|
template <typename T> class ArrayRef;
|
|
class Triple;
|
|
diff --git a/lib/Support/Unix/DynamicLibrary.inc b/lib/Support/Unix/DynamicLibrary.inc
|
|
index a2a37996..2f86c470 100644
|
|
--- a/llvm/lib/Support/Unix/DynamicLibrary.inc
|
|
+++ b/llvm/lib/Support/Unix/DynamicLibrary.inc
|
|
@@ -102,7 +102,7 @@ static void *DoSearch(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
|
|
|
|
// Under glibc 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/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc
|
|
index d882ab2e..f1fb12d0 100644
|
|
--- a/llvm/utils/unittest/googletest/src/gtest.cc
|
|
+++ b/llvm/utils/unittest/googletest/src/gtest.cc
|
|
@@ -128,6 +128,7 @@
|
|
|
|
#if GTEST_CAN_STREAM_RESULTS_
|
|
# include <arpa/inet.h> // NOLINT
|
|
+# include <sys/socket.h> // NOLINT
|
|
# include <netdb.h> // NOLINT
|
|
# include <sys/socket.h> // NOLINT
|
|
# include <sys/types.h> // NOLINT
|