Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit a1d2a28

Browse files
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents 17f2df3 + b3dbfc2 commit a1d2a28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+883
-298
lines changed

CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ src/checkedint.d @redstar @andralex @JackStouffer
1717

1818
src/core/atomic.d @WalterBright @ibuclaw
1919
src/core/attribute.d @jacob-carlborg
20-
src/core/bitop.d @schveiguy @tsbockman @mathias-lang-sociomantic @Geod24
20+
src/core/bitop.d @schveiguy @tsbockman @Geod24
2121
src/core/cpuid.d @WalterBright @ibuclaw @JackStouffer
2222
src/core/demangle.d @WalterBright @MartinNowak @rainers @ibuclaw
2323
src/core/exception.d @MartinNowak @WalterBright @jmdavis @CyberShadow
@@ -27,7 +27,7 @@ src/core/runtime.d @MartinNowak @Abscissa
2727
src/core/simd.d @WalterBright @MartinNowak
2828
src/core/stdc/* @schveiguy @ibuclaw
2929
src/core/stdcpp/* @WalterBright @Darredevil
30-
src/core/sync/* @MartinNowak @mathias-lang-sociomantic @Geod24 @WalterBright @ZombineDev
30+
src/core/sync/* @MartinNowak @Geod24 @WalterBright @ZombineDev
3131
src/core/sys/bionic/* @joakim-noah
3232
src/core/sys/darwin/* @jacob-carlborg @klickverbot @etcimon @MartinNowak
3333
src/core/sys/freebsd/* @redstar @MartinNowak @Calrama @jmdavis
@@ -57,7 +57,7 @@ src/rt/sections_win* @rainers @CyberShadow
5757
src/rt/sections_osx* @jacob-carlborg @klickverbot
5858
src/rt/osx_tls.c @jacob-carlborg @klickverbot
5959
src/rt/sections_elf_shared* @Burgos
60-
src/rt/typeinfo/* @mathias-lang-sociomantic @Geod24 @WalterBright @redstar
60+
src/rt/typeinfo/* @Geod24 @WalterBright @redstar
6161
src/rt/util/* @MartinNowak @WalterBright @klickverbot
6262

6363
src/test_runner.d @atilaneves @wilzbach @MartinNowak @andralex

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ DRuntime: Runtime Library for the D Programming Language
22
========================================================
33

44
[![GitHub tag](https://img.shields.io/github/tag/dlang/druntime.svg?maxAge=86400)](https://github.com/dlang/druntime/releases)
5+
[![Bugzilla Issues](https://img.shields.io/badge/issues-Bugzilla-green.svg)](https://issues.dlang.org/buglist.cgi?component=druntime&list_id=220148&product=D&resolution=---)
56
[![Build status](https://img.shields.io/circleci/project/dlang/druntime.svg?maxAge=86400)](https://circleci.com/gh/dlang/druntime)
67
[![Code coverage](https://img.shields.io/codecov/c/github/dlang/druntime.svg?maxAge=86400)](https://codecov.io/gh/dlang/druntime)
78
[![Issue Stats](https://img.shields.io/issuestats/p/github/dlang/druntime.svg?maxAge=2592000)](http://www.issuestats.com/github/dlang/druntime)

mak/COPY

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ COPY=\
153153
$(IMPDIR)\core\sys\osx\sys\mman.d \
154154
\
155155
$(IMPDIR)\core\sys\posix\arpa\inet.d \
156+
$(IMPDIR)\core\sys\posix\aio.d \
156157
$(IMPDIR)\core\sys\posix\config.d \
157158
$(IMPDIR)\core\sys\posix\dirent.d \
158159
$(IMPDIR)\core\sys\posix\dlfcn.d \

src/core/exception.d

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/**
2-
* The exception module defines all system-level exceptions and provides a
3-
* mechanism to alter system-level error handling.
4-
*
5-
* Copyright: Copyright Sean Kelly 2005 - 2013.
6-
* License: Distributed under the
7-
* $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost Software License 1.0).
8-
* (See accompanying file LICENSE)
9-
* Authors: Sean Kelly and Jonathan M Davis
10-
* Source: $(DRUNTIMESRC core/_exception.d)
2+
The exception module defines all system-level exceptions and provides a
3+
mechanism to alter system-level error handling.
4+
5+
Copyright: Copyright Sean Kelly 2005 - 2013.
6+
License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
7+
Authors: Sean Kelly and $(HTTP jmdavisprog.com, Jonathan M Davis)
8+
Source: $(DRUNTIMESRC core/_exception.d)
119
*/
1210
module core.exception;
1311

src/core/internal/abort.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ module core.internal.abort;
44
* Use instead of assert(0, msg), since this does not print a message for -release compiled
55
* code, and druntime is -release compiled.
66
*/
7-
void abort(string msg, string filename = __FILE__, size_t line = __LINE__) @nogc nothrow @safe
7+
void abort(scope string msg, scope string filename = __FILE__, size_t line = __LINE__) @nogc nothrow @safe
88
{
99
import core.stdc.stdlib: c_abort = abort;
1010
// use available OS system calls to print the message to stderr
1111
version(Posix)
1212
{
1313
import core.sys.posix.unistd: write;
14-
static void writeStr(const(char)[][] m...) @nogc nothrow @trusted
14+
static void writeStr(scope const(char)[][] m...) @nogc nothrow @trusted
1515
{
1616
foreach(s; m)
1717
write(2, s.ptr, s.length);
@@ -24,7 +24,7 @@ void abort(string msg, string filename = __FILE__, size_t line = __LINE__) @nogc
2424
if(h == INVALID_HANDLE_VALUE)
2525
// attempt best we can to print the message
2626
assert(0, msg);
27-
void writeStr(const(char)[][] m...) @nogc nothrow @trusted
27+
void writeStr(scope const(char)[][] m...) @nogc nothrow @trusted
2828
{
2929
foreach(s; m)
3030
{

src/core/internal/parseoptions.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ bool parse(const(char)[] optname, ref inout(char)[] str, ref inout(char)[] res,
211211
in { assert(str.length); }
212212
do
213213
{
214-
auto tail = str.find!(c => c == ':' || c == '=' || c == ' ');
214+
auto tail = str.find!(c => c == ' ');
215215
res = str[0 .. $ - tail.length];
216216
if (!res.length)
217217
return parseError("an identifier", optname, str, errName);

src/core/runtime.d

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,8 @@ extern (C) UnitTestResult runModuleUnitTests()
594594
import core.sys.windows.stacktrace;
595595
else version( Solaris )
596596
import core.sys.solaris.execinfo;
597+
else version( CRuntime_UClibc )
598+
import core.sys.linux.execinfo;
597599

598600
static if( __traits( compiles, backtrace ) )
599601
{
@@ -713,6 +715,8 @@ Throwable.TraceInfo defaultTraceHandler( void* ptr = null )
713715
import core.sys.windows.stacktrace;
714716
else version( Solaris )
715717
import core.sys.solaris.execinfo;
718+
else version( CRuntime_UClibc )
719+
import core.sys.linux.execinfo;
716720

717721
// avoid recursive GC calls in finalizer, trace handlers should be made @nogc instead
718722
import core.memory : gc_inFinalizer;

src/core/stdc/fenv.d

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,16 @@ else version( CRuntime_UClibc )
397397

398398
alias fexcept_t = ushort;
399399
}
400-
else version(ARM)
400+
else version (MIPS32)
401+
{
402+
struct fenv_t
403+
{
404+
uint __fp_control_register;
405+
}
406+
407+
alias fexcept_t = ushort;
408+
}
409+
else version (ARM)
401410
{
402411
struct fenv_t
403412
{

0 commit comments

Comments
 (0)