This is an archive of the discontinued LLVM Phabricator instance.

Differential D31970

[libcxx] Direct support for Fuchsia
ClosedPublic

Authored by phosek on Apr 11 2017, 8:50 PM.

Details

Reviewers
mclow.lists
EricWF
Commits
rGd0e9481c55e1: [libcxx] Direct support for Fuchsia
rCXX300261: [libcxx] Direct support for Fuchsia
rL300261: [libcxx] Direct support for Fuchsia
Summary

Fuchsia's libc was forked from musl, but has evolved sufficiently since then so it no longer makes sense to pretend it's musl. This change implements direct support for Fuchsia rather than piggybacking on musl support.

Diff Detail

Repository
rL LLVM

Event Timeline

phosek created this revision.Apr 11 2017, 8:50 PM
Herald edited edge metadata. · View Herald TranscriptApr 11 2017, 8:50 PM
phosek updated this revision to Diff 95026.Apr 12 2017, 1:54 PM
EricWF accepted this revision.Apr 12 2017, 2:23 PM

LGTM minus inline comments.

include/__locale
44

This #endif comment is no longer correct. Please remove it as part of this change.

include/support/fuchsia/xlocale.h
15

I don't see the need for this guard, since the header should never be included outside of a Fuchsia environment.
If anything it should read:

#if !defined(__Fuchsia__)
#error Fuchsia specific header incorrectly included
#endif
This revision is now accepted and ready to land.Apr 12 2017, 2:23 PM
phosek updated this revision to Diff 95076.Apr 12 2017, 7:42 PM
phosek marked an inline comment as done.
phosek added inline comments.Apr 12 2017, 8:29 PM
include/support/fuchsia/xlocale.h
15

I was following the pattern used by Android and Newlib, but I'm happy to remove this if you prefer?

Closed by commit rL300261: [libcxx] Direct support for Fuchsia (authored by phosek). · Explain WhyApr 13 2017, 2:42 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
include/
2 lines
4 lines
support/
fuchsia/
23 lines

Diff 95076

include/__config

Show First 20 Lines • Show All 1,007 Lines • ▼ Show 20 Lines
// CloudABI is intended for running networked services. Processes do not // CloudABI is intended for running networked services. Processes do not
// have standard input and output channels. // have standard input and output channels.
#ifdef __CloudABI__ #ifdef __CloudABI__
#define _LIBCPP_HAS_NO_STDIN #define _LIBCPP_HAS_NO_STDIN
#define _LIBCPP_HAS_NO_STDOUT #define _LIBCPP_HAS_NO_STDOUT
#endif #endif
#if defined(__BIONIC__) || defined(__CloudABI__) || \ #if defined(__BIONIC__) || defined(__CloudABI__) || \
defined(_LIBCPP_HAS_MUSL_LIBC) defined(__Fuchsia__) || defined(_LIBCPP_HAS_MUSL_LIBC)
#define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE #define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE
#endif #endif
// Thread-unsafe functions such as strtok() and localtime() // Thread-unsafe functions such as strtok() and localtime()
// are not available. // are not available.
#ifdef __CloudABI__ #ifdef __CloudABI__
#define _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS #define _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS
#endif #endif
▲ Show 20 Lines • Show All 73 Lines • Show Last 20 Lines

include/__locale

Show All 31 Lines
#elif defined(__sun__) #elif defined(__sun__)
# include <xlocale.h> # include <xlocale.h>
# include <support/solaris/xlocale.h> # include <support/solaris/xlocale.h>
#elif defined(_NEWLIB_VERSION) #elif defined(_NEWLIB_VERSION)
# include <support/newlib/xlocale.h> # include <support/newlib/xlocale.h>
#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \ #elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) || defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
# include <xlocale.h> # include <xlocale.h>
#elif defined(__Fuchsia__)
# include <support/fuchsia/xlocale.h>
#elif defined(_LIBCPP_HAS_MUSL_LIBC) #elif defined(_LIBCPP_HAS_MUSL_LIBC)
# include <support/musl/xlocale.h> # include <support/musl/xlocale.h>
#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ #endif
EricWFUnsubmitted
Done
ReplyInline Actions

This #endif comment is no longer correct. Please remove it as part of this change.

EricWF: This `#endif` comment is no longer correct. Please remove it as part of this change.
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
class _LIBCPP_TYPE_VIS locale; class _LIBCPP_TYPE_VIS locale;
▲ Show 20 Lines • Show All 1,429 Lines • Show Last 20 Lines

include/support/fuchsia/xlocale.h

  • This file was added.
// -*- C++ -*-
//===------------------- support/fuchsia/xlocale.h ------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//
#ifndef _LIBCPP_SUPPORT_FUCHSIA_XLOCALE_H
#define _LIBCPP_SUPPORT_FUCHSIA_XLOCALE_H
#if defined(__Fuchsia__)
EricWFUnsubmitted
Not Done
ReplyInline Actions

I don't see the need for this guard, since the header should never be included outside of a Fuchsia environment.
If anything it should read:

#if !defined(__Fuchsia__)
#error Fuchsia specific header incorrectly included
#endif
EricWF: I don't see the need for this guard, since the header should never be included outside of a…
phosekAuthorUnsubmitted
Not Done
ReplyInline Actions

I was following the pattern used by Android and Newlib, but I'm happy to remove this if you prefer?

phosek: I was following the pattern used by Android and Newlib, but I'm happy to remove this if you…
#include <cstdlib>
#include <cwchar>
#include <support/xlocale/__posix_l_fallback.h>
#include <support/xlocale/__strtonum_fallback.h>
#endif // defined(__Fuchsia__)
#endif // _LIBCPP_SUPPORT_FUCHSIA_XLOCALE_H