diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-12-15 23:41:45 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-12-15 23:41:45 +0000 |
| commit | a888806fd4e700a6aa463951d37d04167e37e6f4 (patch) | |
| tree | 2fbf01ec6eeb9de9487737dcc9ee28ca05735f0d | |
| parent | b98de9d9e49cd12839f7bffbb696368b77561acb (diff) | |
| download | pkgsrc-a888806fd4e700a6aa463951d37d04167e37e6f4.tar.gz | |
llvm: Restore SunOS patches.
| -rw-r--r-- | lang/llvm/distinfo | 4 | ||||
| -rw-r--r-- | lang/llvm/patches/patch-include_llvm-c_DataTypes.h | 34 | ||||
| -rw-r--r-- | lang/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h | 17 |
3 files changed, 54 insertions, 1 deletions
diff --git a/lang/llvm/distinfo b/lang/llvm/distinfo index 79231d1588a..5e981acb914 100644 --- a/lang/llvm/distinfo +++ b/lang/llvm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2018/12/09 20:04:38 adam Exp $ +$NetBSD: distinfo,v 1.18 2018/12/15 23:41:45 jperkin Exp $ SHA1 (llvm-7.0.0.src.tar.xz) = 27503a22614626e935a05b609ab4211be72cd78b RMD160 (llvm-7.0.0.src.tar.xz) = af7af75c7fb15a004f887f81d71eae58c24c11e6 @@ -9,4 +9,6 @@ SHA1 (patch-cmake_config-ix.cmake) = a345420169e4066e22d28ca6ad10840e83ccfa76 SHA1 (patch-cmake_modules_AddLLVM.cmake) = 31d4f47f03bef021a24d53147c1b66abd64e1d87 SHA1 (patch-cmake_modules_CheckAtomic.cmake) = 51e4fdf3bc24b50fc4d4bfa1ec5ba6c82ef946b4 SHA1 (patch-cmake_modules_HandleLLVMOptions.cmake) = 271e6f5a8cebf8162c4e3b758e96f451b434269b +SHA1 (patch-include_llvm-c_DataTypes.h) = 025c035e0e10871727391bd58936bd67b3e58244 +SHA1 (patch-include_llvm_Analysis_ConstantFolding.h) = 56b9374da236c346565897977040255b9766cab8 SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 45278d8acc6daa3d36a1a7b15e2e3b9a75a218e6 diff --git a/lang/llvm/patches/patch-include_llvm-c_DataTypes.h b/lang/llvm/patches/patch-include_llvm-c_DataTypes.h new file mode 100644 index 00000000000..2b0db55d899 --- /dev/null +++ b/lang/llvm/patches/patch-include_llvm-c_DataTypes.h @@ -0,0 +1,34 @@ +$NetBSD: patch-include_llvm-c_DataTypes.h,v 1.1 2018/12/15 23:41:45 jperkin Exp $ + +Don't implement sys/regset.h workaround, fix source instead. + +--- include/llvm-c/DataTypes.h.orig 2018-04-02 13:22:26.000000000 +0000 ++++ include/llvm-c/DataTypes.h +@@ -87,4 +87,27 @@ typedef signed int ssize_t; + #define HUGE_VALF (float)HUGE_VAL + #endif + ++#if defined(__sun) ++#include <sys/regset.h> ++#undef CS ++#undef DS ++#undef ES ++#undef FS ++#undef GS ++#undef SS ++#undef EAX ++#undef ECX ++#undef EDX ++#undef EBX ++#undef ESP ++#undef EBP ++#undef ESI ++#undef EDI ++#undef EIP ++#undef UESP ++#undef EFL ++#undef ERR ++#undef TRAPNO ++#endif ++ + #endif /* LLVM_C_DATATYPES_H */ diff --git a/lang/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h b/lang/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h new file mode 100644 index 00000000000..0287e9c89e4 --- /dev/null +++ b/lang/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h @@ -0,0 +1,17 @@ +$NetBSD: patch-include_llvm_Analysis_ConstantFolding.h,v 1.1 2018/12/15 23:41:45 jperkin Exp $ + +Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h + +--- include/llvm/Analysis/ConstantFolding.h.orig 2018-05-01 15:54:18.000000000 +0000 ++++ include/llvm/Analysis/ConstantFolding.h +@@ -20,6 +20,10 @@ + #ifndef LLVM_ANALYSIS_CONSTANTFOLDING_H + #define LLVM_ANALYSIS_CONSTANTFOLDING_H + ++#ifdef __sun ++#undef CS ++#endif ++ + namespace llvm { + class APInt; + template <typename T> class ArrayRef; |