OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libphobos: Merge upstream phobos 66ae77ac3 

Finishes off phobos support for musl targets.

Reviewed-on: https://github.com/dlang/phobos/pull/7108

From-SVN: r274770
This commit is contained in:
Iain Buclaw 2019-08-21 07:53:55 +00:00
parent 7cc9cfd2ca
commit 71043642d5
4 changed files with 28 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libphobos/src/MERGE
View File

@ -1,4 +1,4 @@
3dc363783ea7b1e82336983486a14f3f44bbeadd 66ae77ac3f97a007a12738e4bc02b3bbfef99bba
The first line of this file holds the git revision number of the last The first line of this file holds the git revision number of the last
merge done from the dlang/phobos repository. merge done from the dlang/phobos repository.

6
libphobos/src/std/experimental/allocator/building_blocks/region.d
View File

@ -580,6 +580,12 @@ struct InSituRegion(size_t size, size_t minAlign = platformAlignment)
assert(a.length == 2001); assert(a.length == 2001);
} }
version(CRuntime_Musl)
{
// sbrk and brk are disabled in Musl:
// https://git.musl-libc.org/cgit/musl/commit/?id=7a995fe706e519a4f55399776ef0df9596101f93
// https://git.musl-libc.org/cgit/musl/commit/?id=863d628d93ea341b6a32661a1654320ce69f6a07
} else:
private extern(C) void* sbrk(long); private extern(C) void* sbrk(long);
private extern(C) int brk(shared void*); private extern(C) int brk(shared void*);

56
libphobos/src/std/socket.d
View File

@ -163,56 +163,14 @@ string formatSocketError(int err) @trusted
{ {
cs = strerror_r(err, buf.ptr, buf.length); cs = strerror_r(err, buf.ptr, buf.length);
} }
else version (OSX)
{
auto errs = strerror_r(err, buf.ptr, buf.length);
if (errs == 0)
cs = buf.ptr;
else
return "Socket error " ~ to!string(err);
}
else version (FreeBSD)
{
auto errs = strerror_r(err, buf.ptr, buf.length);
if (errs == 0)
cs = buf.ptr;
else
return "Socket error " ~ to!string(err);
}
else version (NetBSD)
{
auto errs = strerror_r(err, buf.ptr, buf.length);
if (errs == 0)
cs = buf.ptr;
else
return "Socket error " ~ to!string(err);
}
else version (DragonFlyBSD)
{
auto errs = strerror_r(err, buf.ptr, buf.length);
if (errs == 0)
cs = buf.ptr;
else
return "Socket error " ~ to!string(err);
}
else version (Solaris)
{
auto errs = strerror_r(err, buf.ptr, buf.length);
if (errs == 0)
cs = buf.ptr;
else
return "Socket error " ~ to!string(err);
}
else version (CRuntime_Bionic)
{
auto errs = strerror_r(err, buf.ptr, buf.length);
if (errs == 0)
cs = buf.ptr;
else
return "Socket error " ~ to!string(err);
}
else else
static assert(0); {
auto errs = strerror_r(err, buf.ptr, buf.length);
if (errs == 0)
cs = buf.ptr;
else
return "Socket error " ~ to!string(err);
}
auto len = strlen(cs); auto len = strlen(cs);

28
libphobos/src/std/stdio.d
View File

@ -44,38 +44,38 @@ version (CRuntime_Glibc)
version = GCC_IO; version = GCC_IO;
version = HAS_GETDELIM; version = HAS_GETDELIM;
} }
else version (CRuntime_Bionic)
{
version = GENERIC_IO;
version = HAS_GETDELIM;
}
else version (CRuntime_Musl)
{
version = GENERIC_IO;
version = HAS_GETDELIM;
}
version (OSX) version (OSX)
{ {
version = GENERIC_IO; version = GENERIC_IO;
version = HAS_GETDELIM; version = HAS_GETDELIM;
} }
else version (FreeBSD)
version (FreeBSD)
{ {
version = GENERIC_IO; version = GENERIC_IO;
version = HAS_GETDELIM; version = HAS_GETDELIM;
} }
else version (NetBSD)
version (NetBSD)
{ {
version = GENERIC_IO; version = GENERIC_IO;
version = HAS_GETDELIM; version = HAS_GETDELIM;
} }
else version (DragonFlyBSD)
version (DragonFlyBSD)
{ {
version = GENERIC_IO; version = GENERIC_IO;
version = HAS_GETDELIM; version = HAS_GETDELIM;
} }
else version (Solaris)
version (Solaris)
{
version = GENERIC_IO;
version = NO_GETDELIM;
}
version (CRuntime_Bionic)
{ {
version = GENERIC_IO; version = GENERIC_IO;
version = NO_GETDELIM; version = NO_GETDELIM;