45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
emutls.patch
|
|
|
|
From: Christian Prochaska <christian.prochaska@genode-labs.com>
|
|
|
|
|
|
---
|
|
libgcc/Makefile.in | 9 ++++++---
|
|
libstdc++-v3/configure.ac | 3 +++
|
|
2 files changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
|
|
index 8cae772c8..7e4cbd0ea 100644
|
|
--- a/libgcc/Makefile.in
|
|
+++ b/libgcc/Makefile.in
|
|
@@ -428,9 +428,12 @@ LIB2ADD += enable-execute-stack.c
|
|
# While emutls.c has nothing to do with EH, it is in LIB2ADDEH*
|
|
# instead of LIB2ADD because that's the way to be sure on some targets
|
|
# (e.g. *-*-darwin*) only one copy of it is linked.
|
|
-LIB2ADDEH += $(srcdir)/emutls.c
|
|
-LIB2ADDEHSTATIC += $(srcdir)/emutls.c
|
|
-LIB2ADDEHSHARED += $(srcdir)/emutls.c
|
|
+#
|
|
+# Genode implements '__emutls_get_address()' in the 'cxx' library
|
|
+#
|
|
+#LIB2ADDEH += $(srcdir)/emutls.c
|
|
+#LIB2ADDEHSTATIC += $(srcdir)/emutls.c
|
|
+#LIB2ADDEHSHARED += $(srcdir)/emutls.c
|
|
|
|
# Library members defined in libgcc2.c.
|
|
lib2funcs = _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 _cmpdi2 _ucmpdi2 \
|
|
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
|
|
index 7d7279b06..84d8c6650 100644
|
|
--- a/libstdc++-v3/configure.ac
|
|
+++ b/libstdc++-v3/configure.ac
|
|
@@ -367,6 +367,9 @@ else
|
|
AC_DEFINE(HAVE_TANL)
|
|
AC_DEFINE(HAVE_TANHL)
|
|
fi
|
|
+
|
|
+ # Genode supports TLS
|
|
+ AC_DEFINE(HAVE_TLS)
|
|
fi
|
|
|
|
# Check for _Unwind_GetIPInfo.
|