intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-13 11:02:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove workarounds for NDK versions before 2017's r16. (#148879)

Browse Source
This commit is contained in:
enh-google
2025-07-16 07:39:17 -04:00
committed by GitHub
parent 402b989693
commit 62bd778fd4
5 changed files with 0 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libcxx/include/CMakeLists.txt
View File

@@ -514,7 +514,6 @@ set(files
__locale_dir/check_grouping.h
__locale_dir/get_c_locale.h
__locale_dir/locale_base_api.h
__locale_dir/locale_base_api/android.h
__locale_dir/locale_base_api/bsd_locale_fallbacks.h
__locale_dir/locale_base_api/ibm.h
__locale_dir/locale_base_api/musl.h

2
libcxx/include/__locale_dir/locale_base_api.h
View File

@@ -129,8 +129,6 @@
// will define those directly.
# if defined(_AIX) || defined(__MVS__)
# include <__locale_dir/locale_base_api/ibm.h>
# elif defined(__ANDROID__)
# include <__locale_dir/locale_base_api/android.h>
# elif defined(__OpenBSD__)
# include <__locale_dir/locale_base_api/openbsd.h>
# elif defined(__wasi__) || _LIBCPP_HAS_MUSL_LIBC

45
libcxx/include/__locale_dir/locale_base_api/android.h
View File

@@ -1,45 +0,0 @@
// -*- C++ -*-
//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_ANDROID_H
#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_ANDROID_H
#include <stdlib.h>
// FIXME: Is this actually required?
extern "C" {
#include <xlocale.h>
}
#include <android/api-level.h>
// If we do not have this header, we are in a platform build rather than an NDK
// build, which will always be at least as new as the ToT NDK, in which case we
// don't need any of the inlines below since libc provides them.
#if __has_include(<android/ndk-version.h>)
# include <android/ndk-version.h>
// In NDK versions later than 16, locale-aware functions are provided by
// legacy_stdlib_inlines.h
# if __NDK_MAJOR__ <= 16
# if __ANDROID_API__ < 26
inline _LIBCPP_HIDE_FROM_ABI float strtof_l(const char* __nptr, char** __endptr, locale_t) {
return ::strtof(__nptr, __endptr);
}
inline _LIBCPP_HIDE_FROM_ABI double strtod_l(const char* __nptr, char** __endptr, locale_t) {
return ::strtod(__nptr, __endptr);
}
# endif // __ANDROID_API__ < 26
# endif // __NDK_MAJOR__ <= 16
#endif // __has_include(<android/ndk-version.h>)
#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_ANDROID_H

1
libcxx/include/module.modulemap.in
View File

@@ -1590,7 +1590,6 @@ module std [system] {
}
module locale_base_api {
textual header "__locale_dir/locale_base_api/android.h"
textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h"
textual header "__locale_dir/locale_base_api/ibm.h"
textual header "__locale_dir/locale_base_api/musl.h"

1
llvm/utils/gn/secondary/libcxx/include/BUILD.gn
View File

@@ -1172,7 +1172,6 @@ if (current_toolchain == default_toolchain) {
"__locale_dir/check_grouping.h",
"__locale_dir/get_c_locale.h",
"__locale_dir/locale_base_api.h",
"__locale_dir/locale_base_api/android.h",
"__locale_dir/locale_base_api/bsd_locale_fallbacks.h",
"__locale_dir/locale_base_api/ibm.h",
"__locale_dir/locale_base_api/musl.h",