Skip to content

Commit

Permalink
libcxxabi: Replace __refstring patch with the one used upstream
Browse files Browse the repository at this point in the history 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
  • Loading branch information
@jeremyhu
jeremyhu committed Dec 28, 2017
1 parent f4214b1 commit 4a869f4
Show file tree
Hide file tree
Showing 5 changed files with 213 additions and 186 deletions.
7 changes: 4 additions & 3 deletions lang/libcxxabi/Portfile
View file
Expand Up @@ -4,7 +4,7 @@ PortGroup compiler_blacklist_versions 1.0
name libcxxabi
epoch 1
version 3.9.1
revision 1
revision 2
categories lang
platforms darwin
license MIT NCSA
Expand Down Expand Up @@ -33,8 +33,9 @@ set root_name ${name}-${version}-${revision}

patch.pre_args -p1
patchfiles \
0001-Update-buildit-script-to-read-EXTRA_LDFLAGS-from-the.patch \
0002-Revert-Make-libc-abi-use-the-implementation-of-__num.patch
0001-Remove-dependancy-on-__refstring-header-use-local-co.patch \
0002-Update-buildit-script-to-read-EXTRA_LDFLAGS-from-the.patch \
0003-Define-_LIBCPP_BUILDING_LIBRARY-during-build-to-supp.patch

variant universal {}
default_variants +universal
Expand Down
177 changes: 177 additions & 0 deletions lang/libcxxabi/files/0001-Remove-dependancy-on-__refstring-header-use-local-co.patch
View file
@@ -0,0 +1,177 @@
From 422536dca703ec16150ae4792c944eb2c516d5dc Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Wed, 12 Jul 2017 01:34:21 +0000
Subject: [PATCH 1/3] Remove dependancy on __refstring header; use local copy
instead.

This patch removes the dependancy on libc++'s __refstring header,
which was only a header in the first place so that libc++abi could
build library code using it, and not because libc++ needed it in
the headers.

This patch allows libc++ to stop shipping <__refstring> publicaly
at the cost of duplicating it across projects. Ideally libc++abi
would always require the libc++ sources when building, but that's
a separate discussion I plan to start on the mailing lists shortly.

git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@307748 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 28942d3ba886b4f215ac6ddaa05c55d35d927621)
---
src/include/refstring.h | 131 ++++++++++++++++++++++++++++++++++++++++++++++++
src/stdexcept.cpp | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 src/include/refstring.h

diff --git a/src/include/refstring.h b/src/include/refstring.h
new file mode 100644
index 0000000..bc131ae
--- /dev/null
+++ b/src/include/refstring.h
@@ -0,0 +1,131 @@
+//===------------------------ __refstring ---------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// FIXME: This file is copied from libcxx/src/include/refstring.h. Instead of
+// duplicating the file in libc++abi we should require that the libc++ sources
+// are available when building libc++abi.
+
+#ifndef _LIBCPPABI_REFSTRING_H
+#define _LIBCPPABI_REFSTRING_H
+
+#include <__config>
+#include <stdexcept>
+#include <cstddef>
+#include <cstring>
+#ifdef __APPLE__
+#include <dlfcn.h>
+#include <mach-o/dyld.h>
+#endif
+
+_LIBCPP_BEGIN_NAMESPACE_STD
+
+namespace __refstring_imp { namespace {
+typedef int count_t;
+
+struct _Rep_base {
+ std::size_t len;
+ std::size_t cap;
+ count_t count;
+};
+
+inline _Rep_base* rep_from_data(const char *data_) noexcept {
+ char *data = const_cast<char *>(data_);
+ return reinterpret_cast<_Rep_base *>(data - sizeof(_Rep_base));
+}
+
+inline char * data_from_rep(_Rep_base *rep) noexcept {
+ char *data = reinterpret_cast<char *>(rep);
+ return data + sizeof(*rep);
+}
+
+#if defined(__APPLE__)
+inline
+const char* compute_gcc_empty_string_storage() _NOEXCEPT
+{
+ void* handle = dlopen("/usr/lib/libstdc++.6.dylib", RTLD_NOLOAD);
+ if (handle == nullptr)
+ return nullptr;
+ void* sym = dlsym(handle, "_ZNSs4_Rep20_S_empty_rep_storageE");
+ if (sym == nullptr)
+ return nullptr;
+ return data_from_rep(reinterpret_cast<_Rep_base *>(sym));
+}
+
+inline
+const char*
+get_gcc_empty_string_storage() _NOEXCEPT
+{
+ static const char* p = compute_gcc_empty_string_storage();
+ return p;
+}
+#endif
+
+}} // namespace __refstring_imp
+
+using namespace __refstring_imp;
+
+inline
+__libcpp_refstring::__libcpp_refstring(const char* msg) {
+ std::size_t len = strlen(msg);
+ _Rep_base* rep = static_cast<_Rep_base *>(::operator new(sizeof(*rep) + len + 1));
+ rep->len = len;
+ rep->cap = len;
+ rep->count = 0;
+ char *data = data_from_rep(rep);
+ std::memcpy(data, msg, len + 1);
+ __imp_ = data;
+}
+
+inline
+__libcpp_refstring::__libcpp_refstring(const __libcpp_refstring &s) _NOEXCEPT
+ : __imp_(s.__imp_)
+{
+ if (__uses_refcount())
+ __sync_add_and_fetch(&rep_from_data(__imp_)->count, 1);
+}
+
+inline
+__libcpp_refstring& __libcpp_refstring::operator=(__libcpp_refstring const& s) _NOEXCEPT {
+ bool adjust_old_count = __uses_refcount();
+ struct _Rep_base *old_rep = rep_from_data(__imp_);
+ __imp_ = s.__imp_;
+ if (__uses_refcount())
+ __sync_add_and_fetch(&rep_from_data(__imp_)->count, 1);
+ if (adjust_old_count)
+ {
+ if (__sync_add_and_fetch(&old_rep->count, count_t(-1)) < 0)
+ {
+ ::operator delete(old_rep);
+ }
+ }
+ return *this;
+}
+
+inline
+__libcpp_refstring::~__libcpp_refstring() {
+ if (__uses_refcount()) {
+ _Rep_base* rep = rep_from_data(__imp_);
+ if (__sync_add_and_fetch(&rep->count, count_t(-1)) < 0) {
+ ::operator delete(rep);
+ }
+ }
+}
+
+inline
+bool __libcpp_refstring::__uses_refcount() const {
+#ifdef __APPLE__
+ return __imp_ != get_gcc_empty_string_storage();
+#else
+ return true;
+#endif
+}
+
+_LIBCPP_END_NAMESPACE_STD
+
+#endif //_LIBCPPABI_REFSTRING_H
diff --git a/src/stdexcept.cpp b/src/stdexcept.cpp
index bd6789e..e3b7cd4 100644
--- a/src/stdexcept.cpp
+++ b/src/stdexcept.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//

-#include "__refstring"
+#include "include/refstring.h"
#include "stdexcept"
#include "new"
#include <cstdlib>
--
2.15.1

179 changes: 0 additions & 179 deletions lang/libcxxabi/files/0002-Revert-Make-libc-abi-use-the-implementation-of-__num.patch
View file

This file was deleted.

0 comments on commit 4a869f4

Please sign in to comment.