(From OE-Core rev: 16ab55220c4b602a8406c7a4405c737caae5907b) Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
88 lines
2.9 KiB
Diff
88 lines
2.9 KiB
Diff
From d2d9dd756c4356d14dd7ae003856344cb4f37985 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Fri, 29 Mar 2013 08:40:12 +0400
|
|
Subject: [PATCH 03/35] gcc-uclibc-locale-ctype_touplow_t
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
|
Upstream-Status: Pending
|
|
---
|
|
libstdc++-v3/config/locale/generic/c_locale.cc | 5 +++++
|
|
libstdc++-v3/config/locale/generic/c_locale.h | 9 +++++++++
|
|
libstdc++-v3/config/os/gnu-linux/ctype_base.h | 9 +++++++++
|
|
3 files changed, 23 insertions(+)
|
|
|
|
diff --git a/libstdc++-v3/config/locale/generic/c_locale.cc b/libstdc++-v3/config/locale/generic/c_locale.cc
|
|
index 0d309a5..f2f1e1f 100644
|
|
--- a/libstdc++-v3/config/locale/generic/c_locale.cc
|
|
+++ b/libstdc++-v3/config/locale/generic/c_locale.cc
|
|
@@ -263,5 +263,10 @@ _GLIBCXX_END_NAMESPACE_VERSION
|
|
#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
|
|
#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
|
|
extern "C" void ldbl (void) __attribute__ ((alias (#dbl)))
|
|
+#ifdef __UCLIBC__
|
|
+// This is because __c_locale is of type __ctype_touplow_t* which is short on uclibc. for glibc its int*
|
|
+_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPs, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPs);
|
|
+#else
|
|
_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPi, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi);
|
|
+#endif
|
|
#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
|
|
diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h
|
|
index b5fd989..3da9a5d 100644
|
|
--- a/libstdc++-v3/config/locale/generic/c_locale.h
|
|
+++ b/libstdc++-v3/config/locale/generic/c_locale.h
|
|
@@ -40,13 +40,22 @@
|
|
|
|
#include <clocale>
|
|
|
|
+#ifdef __UCLIBC__
|
|
+#include <features.h>
|
|
+#include <ctype.h>
|
|
+#endif
|
|
+
|
|
#define _GLIBCXX_NUM_CATEGORIES 0
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
+#ifdef __UCLIBC__
|
|
+ typedef __ctype_touplow_t* __c_locale;
|
|
+#else
|
|
typedef int* __c_locale;
|
|
+#endif
|
|
|
|
// Convert numeric value of type double and long double to string and
|
|
// return length of string. If vsnprintf is available use it, otherwise
|
|
diff --git a/libstdc++-v3/config/os/gnu-linux/ctype_base.h b/libstdc++-v3/config/os/gnu-linux/ctype_base.h
|
|
index 2d8e978..14eb08f 100644
|
|
--- a/libstdc++-v3/config/os/gnu-linux/ctype_base.h
|
|
+++ b/libstdc++-v3/config/os/gnu-linux/ctype_base.h
|
|
@@ -33,6 +33,11 @@
|
|
|
|
// Information as gleaned from /usr/include/ctype.h
|
|
|
|
+#ifdef __UCLIBC__
|
|
+#include <features.h>
|
|
+#include <ctype.h>
|
|
+#endif
|
|
+
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
@@ -41,7 +46,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
struct ctype_base
|
|
{
|
|
// Non-standard typedefs.
|
|
+#ifdef __UCLIBC__
|
|
+ typedef const __ctype_touplow_t* __to_type;
|
|
+#else
|
|
typedef const int* __to_type;
|
|
+#endif
|
|
|
|
// NB: Offsets into ctype<char>::_M_table force a particular size
|
|
// on the mask type. Because of this, we don't use an enum.
|
|
--
|
|
1.7.10.4
|
|
|