LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[libc++] Replace uses of _LIBCPP_ALWAYS_INLINE by _LIBCPP_INLINE_VISIBILITY"

Browse Source 
This reverts commit r336369. The commit had two problems:
1. __pbump was marked as _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY instead of
   _LIBCPP_INLINE_VISIBILITY, which lead to two symbols being added in the
   dylib and the check-cxx-abilist failing.

2. The LLDB tests started failing because they undefine
   `_LIBCPP_INLINE_VISIBILITY`. I need to figure out why they do that and
   fix the tests before we can go forward with this change.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@336382 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Louis Dionne
2018-07-05 18:41:50 +00:00
parent 1f655099cf
commit 4e7ffcaae6
30 changed files with 387 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/support/android/locale_bionic.h
View File

@@ -40,18 +40,18 @@ extern "C" {
extern "C" {
#endif
inline _LIBCPP_INLINE_VISIBILITY float strtof_l(const char* __nptr, char** __endptr,
locale_t) {
inline _LIBCPP_ALWAYS_INLINE float strtof_l(const char* __nptr, char** __endptr,
locale_t) {
return ::strtof(__nptr, __endptr);
}
inline _LIBCPP_INLINE_VISIBILITY double strtod_l(const char* __nptr,
char** __endptr, locale_t) {
inline _LIBCPP_ALWAYS_INLINE double strtod_l(const char* __nptr,
char** __endptr, locale_t) {
return ::strtod(__nptr, __endptr);
}
inline _LIBCPP_INLINE_VISIBILITY long strtol_l(const char* __nptr, char** __endptr,
int __base, locale_t) {
inline _LIBCPP_ALWAYS_INLINE long strtol_l(const char* __nptr, char** __endptr,
int __base, locale_t) {
return ::strtol(__nptr, __endptr, __base);
}

78
include/support/xlocale/__posix_l_fallback.h
View File

@@ -20,141 +20,141 @@
extern "C" {
#endif
inline _LIBCPP_INLINE_VISIBILITY int isalnum_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int isalnum_l(int c, locale_t) {
return ::isalnum(c);
}
inline _LIBCPP_INLINE_VISIBILITY int isalpha_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int isalpha_l(int c, locale_t) {
return ::isalpha(c);
}
inline _LIBCPP_INLINE_VISIBILITY int isblank_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int isblank_l(int c, locale_t) {
return ::isblank(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iscntrl_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iscntrl_l(int c, locale_t) {
return ::iscntrl(c);
}
inline _LIBCPP_INLINE_VISIBILITY int isdigit_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int isdigit_l(int c, locale_t) {
return ::isdigit(c);
}
inline _LIBCPP_INLINE_VISIBILITY int isgraph_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int isgraph_l(int c, locale_t) {
return ::isgraph(c);
}
inline _LIBCPP_INLINE_VISIBILITY int islower_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int islower_l(int c, locale_t) {
return ::islower(c);
}
inline _LIBCPP_INLINE_VISIBILITY int isprint_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int isprint_l(int c, locale_t) {
return ::isprint(c);
}
inline _LIBCPP_INLINE_VISIBILITY int ispunct_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int ispunct_l(int c, locale_t) {
return ::ispunct(c);
}
inline _LIBCPP_INLINE_VISIBILITY int isspace_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int isspace_l(int c, locale_t) {
return ::isspace(c);
}
inline _LIBCPP_INLINE_VISIBILITY int isupper_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int isupper_l(int c, locale_t) {
return ::isupper(c);
}
inline _LIBCPP_INLINE_VISIBILITY int isxdigit_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int isxdigit_l(int c, locale_t) {
return ::isxdigit(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswalnum_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswalnum_l(wint_t c, locale_t) {
return ::iswalnum(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswalpha_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswalpha_l(wint_t c, locale_t) {
return ::iswalpha(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswblank_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswblank_l(wint_t c, locale_t) {
return ::iswblank(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswcntrl_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswcntrl_l(wint_t c, locale_t) {
return ::iswcntrl(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswdigit_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswdigit_l(wint_t c, locale_t) {
return ::iswdigit(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswgraph_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswgraph_l(wint_t c, locale_t) {
return ::iswgraph(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswlower_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswlower_l(wint_t c, locale_t) {
return ::iswlower(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswprint_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswprint_l(wint_t c, locale_t) {
return ::iswprint(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswpunct_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswpunct_l(wint_t c, locale_t) {
return ::iswpunct(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswspace_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswspace_l(wint_t c, locale_t) {
return ::iswspace(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswupper_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswupper_l(wint_t c, locale_t) {
return ::iswupper(c);
}
inline _LIBCPP_INLINE_VISIBILITY int iswxdigit_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int iswxdigit_l(wint_t c, locale_t) {
return ::iswxdigit(c);
}
inline _LIBCPP_INLINE_VISIBILITY int toupper_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int toupper_l(int c, locale_t) {
return ::toupper(c);
}
inline _LIBCPP_INLINE_VISIBILITY int tolower_l(int c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int tolower_l(int c, locale_t) {
return ::tolower(c);
}
inline _LIBCPP_INLINE_VISIBILITY wint_t towupper_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE wint_t towupper_l(wint_t c, locale_t) {
return ::towupper(c);
}
inline _LIBCPP_INLINE_VISIBILITY wint_t towlower_l(wint_t c, locale_t) {
inline _LIBCPP_ALWAYS_INLINE wint_t towlower_l(wint_t c, locale_t) {
return ::towlower(c);
}
inline _LIBCPP_INLINE_VISIBILITY int strcoll_l(const char *s1, const char *s2,
locale_t) {
inline _LIBCPP_ALWAYS_INLINE int strcoll_l(const char *s1, const char *s2,
locale_t) {
return ::strcoll(s1, s2);
}
inline _LIBCPP_INLINE_VISIBILITY size_t strxfrm_l(char *dest, const char *src,
size_t n, locale_t) {
inline _LIBCPP_ALWAYS_INLINE size_t strxfrm_l(char *dest, const char *src,
size_t n, locale_t) {
return ::strxfrm(dest, src, n);
}
inline _LIBCPP_INLINE_VISIBILITY size_t strftime_l(char *s, size_t max,
const char *format,
const struct tm *tm, locale_t) {
inline _LIBCPP_ALWAYS_INLINE size_t strftime_l(char *s, size_t max,
const char *format,
const struct tm *tm, locale_t) {
return ::strftime(s, max, format, tm);
}
inline _LIBCPP_INLINE_VISIBILITY int wcscoll_l(const wchar_t *ws1,
const wchar_t *ws2, locale_t) {
inline _LIBCPP_ALWAYS_INLINE int wcscoll_l(const wchar_t *ws1,
const wchar_t *ws2, locale_t) {
return ::wcscoll(ws1, ws2);
}
inline _LIBCPP_INLINE_VISIBILITY size_t wcsxfrm_l(wchar_t *dest, const wchar_t *src,
size_t n, locale_t) {
inline _LIBCPP_ALWAYS_INLINE size_t wcsxfrm_l(wchar_t *dest, const wchar_t *src,
size_t n, locale_t) {
return ::wcsxfrm(dest, src, n);
}

24
include/support/xlocale/__strtonum_fallback.h
View File

@@ -20,43 +20,43 @@
extern "C" {
#endif
inline _LIBCPP_INLINE_VISIBILITY float strtof_l(const char *nptr,
char **endptr, locale_t) {
inline _LIBCPP_ALWAYS_INLINE float strtof_l(const char *nptr,
char **endptr, locale_t) {
return ::strtof(nptr, endptr);
}
inline _LIBCPP_INLINE_VISIBILITY double strtod_l(const char *nptr,
char **endptr, locale_t) {
inline _LIBCPP_ALWAYS_INLINE double strtod_l(const char *nptr,
char **endptr, locale_t) {
return ::strtod(nptr, endptr);
}
inline _LIBCPP_INLINE_VISIBILITY long double strtold_l(const char *nptr,
char **endptr, locale_t) {
inline _LIBCPP_ALWAYS_INLINE long double strtold_l(const char *nptr,
char **endptr, locale_t) {
return ::strtold(nptr, endptr);
}
inline _LIBCPP_INLINE_VISIBILITY long long
inline _LIBCPP_ALWAYS_INLINE long long
strtoll_l(const char *nptr, char **endptr, int base, locale_t) {
return ::strtoll(nptr, endptr, base);
}
inline _LIBCPP_INLINE_VISIBILITY unsigned long long
inline _LIBCPP_ALWAYS_INLINE unsigned long long
strtoull_l(const char *nptr, char **endptr, int base, locale_t) {
return ::strtoull(nptr, endptr, base);
}
inline _LIBCPP_INLINE_VISIBILITY long long
inline _LIBCPP_ALWAYS_INLINE long long
wcstoll_l(const wchar_t *nptr, wchar_t **endptr, int base, locale_t) {
return ::wcstoll(nptr, endptr, base);
}
inline _LIBCPP_INLINE_VISIBILITY unsigned long long
inline _LIBCPP_ALWAYS_INLINE unsigned long long
wcstoull_l(const wchar_t *nptr, wchar_t **endptr, int base, locale_t) {
return ::wcstoull(nptr, endptr, base);
}
inline _LIBCPP_INLINE_VISIBILITY long double wcstold_l(const wchar_t *nptr,
wchar_t **endptr, locale_t) {
inline _LIBCPP_ALWAYS_INLINE long double wcstold_l(const wchar_t *nptr,
wchar_t **endptr, locale_t) {
return ::wcstold(nptr, endptr);
}