| author |  Michael Dusan <michael.dusan@gmail.com> 2021-07-19 13:28:03-04:00 |
| committer |  Veikka Tuominen <git@vexu.eu> 2021-08-21 15:17:08+03:00 |
| log | d57c0cc3bfeff9af297279759ec2b631e6d95140 |
| tree | 18d7291e0ff6d402eee45e12e4f1d36f7fcad952 |
| parent | 4c18da1ef3ef21033394041be21774bf13882b54 |
dragonfly: port libc++
Used https://github.com/DragonFlyBSD/DPorts/tree/master/devel/libc++/files
for hints as to which patches were needed.4 files changed, 12 insertions(+), 11 deletions(-)
lib- libcxx
- src
lib/libcxx/include/__config+7-6
| ... | @@ -122,7 +122,7 @@ | ... | @@ -122,7 +122,7 @@ |
| 122 | # endif | 122 | # endif |
| 123 | // Feature macros for disabling pre ABI v1 features. All of these options | 123 | // Feature macros for disabling pre ABI v1 features. All of these options |
| 124 | // are deprecated. | 124 | // are deprecated. |
| 125 | # if defined(__FreeBSD__) | 125 | # if defined(__FreeBSD__) || defined(__DragonFly__) |
| 126 | # define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR | 126 | # define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR |
| 127 | # endif | 127 | # endif |
| 128 | #endif | 128 | #endif |
| ... | @@ -366,7 +366,7 @@ | ... | @@ -366,7 +366,7 @@ |
| 366 | # if __ANDROID_API__ >= 29 | 366 | # if __ANDROID_API__ >= 29 |
| 367 | # define _LIBCPP_HAS_TIMESPEC_GET | 367 | # define _LIBCPP_HAS_TIMESPEC_GET |
| 368 | # endif | 368 | # endif |
| 369 | # elif defined(__Fuchsia__) || defined(__wasi__) || defined(__NetBSD__) | 369 | # elif defined(__Fuchsia__) || defined(__wasi__) || defined(__NetBSD__) || defined(__DragonFly__) |
| 370 | # define _LIBCPP_HAS_ALIGNED_ALLOC | 370 | # define _LIBCPP_HAS_ALIGNED_ALLOC |
| 371 | # define _LIBCPP_HAS_QUICK_EXIT | 371 | # define _LIBCPP_HAS_QUICK_EXIT |
| 372 | # define _LIBCPP_HAS_TIMESPEC_GET | 372 | # define _LIBCPP_HAS_TIMESPEC_GET |
| ... | @@ -914,7 +914,7 @@ typedef unsigned int char32_t; | ... | @@ -914,7 +914,7 @@ typedef unsigned int char32_t; |
| 914 | #endif | 914 | #endif |
| 915 | 915 | ||
| 916 | #if defined(__APPLE__) || defined(__FreeBSD__) || defined(_LIBCPP_MSVCRT_LIKE) || \ | 916 | #if defined(__APPLE__) || defined(__FreeBSD__) || defined(_LIBCPP_MSVCRT_LIKE) || \ |
| 917 | defined(__sun__) || defined(__NetBSD__) || defined(__CloudABI__) | 917 | defined(__sun__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__CloudABI__) |
| 918 | #define _LIBCPP_LOCALE__L_EXTENSIONS 1 | 918 | #define _LIBCPP_LOCALE__L_EXTENSIONS 1 |
| 919 | #endif | 919 | #endif |
| 920 | 920 | ||
| ... | @@ -925,7 +925,7 @@ typedef unsigned int char32_t; | ... | @@ -925,7 +925,7 @@ typedef unsigned int char32_t; |
| 925 | # endif | 925 | # endif |
| 926 | #endif | 926 | #endif |
| 927 | 927 | ||
| 928 | #ifdef __FreeBSD__ | 928 | #if defined(__FreeBSD__) || defined(__DragonFly__) |
| 929 | #define _DECLARE_C99_LDBL_MATH 1 | 929 | #define _DECLARE_C99_LDBL_MATH 1 |
| 930 | #endif | 930 | #endif |
| 931 | 931 | ||
| ... | @@ -954,11 +954,11 @@ typedef unsigned int char32_t; | ... | @@ -954,11 +954,11 @@ typedef unsigned int char32_t; |
| 954 | # define _LIBCPP_HAS_NO_ALIGNED_ALLOCATION | 954 | # define _LIBCPP_HAS_NO_ALIGNED_ALLOCATION |
| 955 | #endif | 955 | #endif |
| 956 | 956 | ||
| 957 | #if defined(__APPLE__) || defined(__FreeBSD__) | 957 | #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) |
| 958 | #define _LIBCPP_HAS_DEFAULTRUNELOCALE | 958 | #define _LIBCPP_HAS_DEFAULTRUNELOCALE |
| 959 | #endif | 959 | #endif |
| 960 | 960 | ||
| 961 | #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__) | 961 | #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__sun__) |
| 962 | #define _LIBCPP_WCTYPE_IS_MASK | 962 | #define _LIBCPP_WCTYPE_IS_MASK |
| 963 | #endif | 963 | #endif |
| 964 | 964 | ||
| ... | @@ -1125,6 +1125,7 @@ extern "C" _LIBCPP_FUNC_VIS void __sanitizer_annotate_contiguous_container( | ... | @@ -1125,6 +1125,7 @@ extern "C" _LIBCPP_FUNC_VIS void __sanitizer_annotate_contiguous_container( |
| 1125 | defined(__wasi__) || \ | 1125 | defined(__wasi__) || \ |
| 1126 | defined(__NetBSD__) || \ | 1126 | defined(__NetBSD__) || \ |
| 1127 | defined(__OpenBSD__) || \ | 1127 | defined(__OpenBSD__) || \ |
| 1128 | defined(__DragonFly__) || \ | ||
| 1128 | defined(__NuttX__) || \ | 1129 | defined(__NuttX__) || \ |
| 1129 | defined(__linux__) || \ | 1130 | defined(__linux__) || \ |
| 1130 | defined(__GNU__) || \ | 1131 | defined(__GNU__) || \ |
lib/libcxx/include/__locale+3-3
| ... | @@ -35,7 +35,7 @@ | ... | @@ -35,7 +35,7 @@ |
| 35 | # include <__support/newlib/xlocale.h> | 35 | # include <__support/newlib/xlocale.h> |
| 36 | #elif defined(__OpenBSD__) | 36 | #elif defined(__OpenBSD__) |
| 37 | # include <__support/openbsd/xlocale.h> | 37 | # include <__support/openbsd/xlocale.h> |
| 38 | #elif (defined(__APPLE__) || defined(__FreeBSD__) \ | 38 | #elif (defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) \ |
| 39 | || defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) | 39 | || defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) |
| 40 | # include <xlocale.h> | 40 | # include <xlocale.h> |
| 41 | #elif defined(__Fuchsia__) | 41 | #elif defined(__Fuchsia__) |
| ... | @@ -450,10 +450,10 @@ public: | ... | @@ -450,10 +450,10 @@ public: |
| 450 | static const mask blank = _BLANK; | 450 | static const mask blank = _BLANK; |
| 451 | static const mask __regex_word = 0x80; | 451 | static const mask __regex_word = 0x80; |
| 452 | # define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_PRINT | 452 | # define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_PRINT |
| 453 | #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__) | 453 | #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__) || defined(__DragonFly__) |
| 454 | # ifdef __APPLE__ | 454 | # ifdef __APPLE__ |
| 455 | typedef __uint32_t mask; | 455 | typedef __uint32_t mask; |
| 456 | # elif defined(__FreeBSD__) | 456 | # elif defined(__FreeBSD__) || defined(__DragonFly__) |
| 457 | typedef unsigned long mask; | 457 | typedef unsigned long mask; |
| 458 | # elif defined(__EMSCRIPTEN__) || defined(__NetBSD__) | 458 | # elif defined(__EMSCRIPTEN__) || defined(__NetBSD__) |
| 459 | typedef unsigned short mask; | 459 | typedef unsigned short mask; |
lib/libcxx/include/locale+1-1
| ... | @@ -223,7 +223,7 @@ _LIBCPP_PUSH_MACROS | ... | @@ -223,7 +223,7 @@ _LIBCPP_PUSH_MACROS |
| 223 | 223 | ||
| 224 | _LIBCPP_BEGIN_NAMESPACE_STD | 224 | _LIBCPP_BEGIN_NAMESPACE_STD |
| 225 | 225 | ||
| 226 | #if defined(__APPLE__) || defined(__FreeBSD__) | 226 | #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) |
| 227 | # define _LIBCPP_GET_C_LOCALE 0 | 227 | # define _LIBCPP_GET_C_LOCALE 0 |
| 228 | #elif defined(__CloudABI__) || defined(__NetBSD__) | 228 | #elif defined(__CloudABI__) || defined(__NetBSD__) |
| 229 | # define _LIBCPP_GET_C_LOCALE LC_C_LOCALE | 229 | # define _LIBCPP_GET_C_LOCALE LC_C_LOCALE |
lib/libcxx/src/locale.cpp+1-1
| ... | @@ -1133,7 +1133,7 @@ ctype<char>::classic_table() _NOEXCEPT | ... | @@ -1133,7 +1133,7 @@ ctype<char>::classic_table() _NOEXCEPT |
| 1133 | const ctype<char>::mask* | 1133 | const ctype<char>::mask* |
| 1134 | ctype<char>::classic_table() _NOEXCEPT | 1134 | ctype<char>::classic_table() _NOEXCEPT |
| 1135 | { | 1135 | { |
| 1136 | #if defined(__APPLE__) || defined(__FreeBSD__) | 1136 | #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) |
| 1137 | return _DefaultRuneLocale.__runetype; | 1137 | return _DefaultRuneLocale.__runetype; |
| 1138 | #elif defined(__NetBSD__) | 1138 | #elif defined(__NetBSD__) |
| 1139 | return _C_ctype_tab_ + 1; | 1139 | return _C_ctype_tab_ + 1; |