Attachment 151389 Details for Bug 196536 – FreeBSD-specific diff against libc++ trunk r224926

[patch] FreeBSD-specific diff against libc++ trunk r224926

libc++-r224926-fbsd11-1.diff (text/plain), 2.28 KB, created by Dimitry Andric on 2015-01-06 08:03:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2015-01-06 08:03:57 UTC

Size: 2.28 KB

patch

obsolete

>Index: include/__config
>===================================================================
>--- include/__config	(revision 224926)
>+++ include/__config	(working copy)
>@@ -259,6 +259,8 @@ typedef __char32_t char32_t;
> #  define _LIBCPP_NORETURN __attribute__ ((noreturn))
> #endif
> 
>+#define _LIBCPP_UNUSED __attribute__((__unused__))
>+
> #if !(__has_feature(cxx_defaulted_functions))
> #define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
> #endif  // !(__has_feature(cxx_defaulted_functions))
>@@ -381,6 +383,8 @@ namespace std {
> 
> #define _LIBCPP_NORETURN __attribute__((noreturn))
> 
>+#define _LIBCPP_UNUSED __attribute__((__unused__))
>+
> #if _GNUC_VER >= 407
> #define _LIBCPP_UNDERLYING_TYPE(T) __underlying_type(T)
> #define _LIBCPP_IS_LITERAL(T) __is_literal_type(T)
>@@ -478,6 +482,7 @@ using namespace _LIBCPP_NAMESPACE __attribute__((_
> #define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
> #define __alignof__ __alignof
> #define _LIBCPP_NORETURN __declspec(noreturn)
>+#define _LIBCPP_UNUSED
> #define _ALIGNAS(x) __declspec(align(x))
> #define _LIBCPP_HAS_NO_VARIADICS
> 
>@@ -501,6 +506,7 @@ namespace std {
> #define _ALIGNAS_TYPE(x) __attribute__((__aligned__(__alignof(x))))
> #define _ATTRIBUTE(x) __attribute__((x))
> #define _LIBCPP_NORETURN __attribute__((noreturn))
>+#define _LIBCPP_UNUSED
> 
> #define _NOEXCEPT throw()
> #define _NOEXCEPT_(x)
>@@ -659,7 +665,14 @@ template <unsigned> struct __static_assert_check {
> #endif
> 
> #ifndef _LIBCPP_TRIVIAL_PAIR_COPY_CTOR
>-#  define _LIBCPP_TRIVIAL_PAIR_COPY_CTOR 1
>+#  if defined(__FreeBSD__)
>+// Making the std::pair copy constructor trivial breaks ABI compatibility with
>+// earlier versions of libc++ shipped by FreeBSD, so turn it off by default.
>+// See also http://svnweb.freebsd.org/changeset/base/261801
>+#    define _LIBCPP_TRIVIAL_PAIR_COPY_CTOR 0
>+#  else
>+#    define _LIBCPP_TRIVIAL_PAIR_COPY_CTOR 1
>+#  endif
> #endif
> 
> #ifndef _LIBCPP_STD_VER
>Index: include/stdexcept
>===================================================================
>--- include/stdexcept	(revision 224926)
>+++ include/stdexcept	(working copy)
>@@ -53,7 +53,7 @@ class xxx_error : public exception // at least ind
> #ifndef _LIBCPP___REFSTRING
> _LIBCPP_BEGIN_NAMESPACE_STD
> class _LIBCPP_HIDDEN __libcpp_refstring {
>-    const char *__imp_;
>+    const char *__imp_ _LIBCPP_UNUSED;
> };
> _LIBCPP_END_NAMESPACE_STD
> #endif

Actions: View | Diff

Attachments on bug 196536: 151389 | 151641