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

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinNowak committed Oct 4, 2015
2 parents a0daf0f + 8ddfb8d commit 480dc88
Show file tree
Hide file tree
Showing 121 changed files with 3,626 additions and 1,619 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ doc/*
lib/*
obj/*
import/*
generated/*
druntime.json
.DS_Store
trace.def
trace.log
Makefile
/errno_c.obj
make
test/*
2 changes: 1 addition & 1 deletion benchmark/gcbench/vdparser.extra/vdc/versions.d
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static @property int[string] sPredefinedVersions()
"SPARC_HardFloat" : -1,
"SPARC64" : -1,
"S390" : -1,
"S390X" : -1,
"SystemZ" : -1,
"HPPA" : -1,
"HPPA64" : -1,
"SH" : -1,
Expand Down
26 changes: 25 additions & 1 deletion changelog.dd
Original file line number Diff line number Diff line change
@@ -1,12 +1,35 @@
Ddoc

$(COMMENT Pending changelog for 2.068.1.
$(COMMENT Pending changelog for 2.069.0.
)

$(BUGSTITLE Library Changes,
$(LI $(RELATIVE_LINK2 backtraces-with-line-numbers, Backtraces now include file name and line number.))
)

$(BUGSTITLE Library Changes,
$(LI $(LNAME2 backtraces-with-line-numbers, Backtraces now include file name and line number.)

$(P The default tracehandler on linux and FreeBSD now parses DWARF
debug info to add file names and line numbers to backtraces.
)

$(PRE
std.conv.ConvException@DPL/dmd/src/../../phobos/std/conv.d(1720): Unexpected 'a' when converting from type string to type ulong

DPL/dmd/src/../../phobos/std/conv.d:1720 pure @safe ulong std.conv.toImpl!(ulong, immutable(char)[]).toImpl(immutable(char)[]) [0x43b339]
DPL/dmd/src/../../phobos/std/conv.d:298 pure @safe ulong std.conv.to!(ulong).to!(immutable(char)[]).to(immutable(char)[]) [0x437717]
example.d:5 ulong example.foo(immutable(char)[]) [0x4376c7]
example.d:10 _Dmain [0x4376e5]
??:? _D2rt6dmain211_d_run_mainUiPPaPUAAaZiZ6runAllMFZ9__lambda1MFZv [0x444576]
??:? void rt.dmain2._d_run_main(int, char**, extern (C) int function(char[][])*).tryExec(scope void delegate()) [0x4444cc]
??:? void rt.dmain2._d_run_main(int, char**, extern (C) int function(char[][])*).runAll() [0x444532]
??:? void rt.dmain2._d_run_main(int, char**, extern (C) int function(char[][])*).tryExec(scope void delegate()) [0x4444cc]
??:? _d_run_main [0x444429]
??:? main [0x44039f]
??:? __libc_start_main [0xc3ae96ff]
)
)
)

Macros:
Expand All @@ -23,3 +46,4 @@ Macros:
CXREF = <a href="phobos/core_$1.html#$2">$2</a>

BOOKTABLE = <table><caption>$1</caption>$+</table>
PRE = <pre>$0</pre>
5 changes: 5 additions & 0 deletions mak/COPY
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
COPY=\
$(IMPDIR)\object.d \
$(IMPDIR)\core\atomic.d \
$(IMPDIR)\core\attribute.d \
$(IMPDIR)\core\bitop.d \
$(IMPDIR)\core\checkedint.d \
$(IMPDIR)\core\cpuid.d \
Expand All @@ -14,8 +15,10 @@ COPY=\
$(IMPDIR)\core\time.d \
$(IMPDIR)\core\vararg.d \
\
$(IMPDIR)\core\internal\abort.d \
$(IMPDIR)\core\internal\convert.d \
$(IMPDIR)\core\internal\hash.d \
$(IMPDIR)\core\internal\string.d \
$(IMPDIR)\core\internal\traits.d \
\
$(IMPDIR)\core\stdc\complex.d \
Expand Down Expand Up @@ -59,10 +62,12 @@ COPY=\
$(IMPDIR)\core\sys\linux\epoll.d \
$(IMPDIR)\core\sys\linux\errno.d \
$(IMPDIR)\core\sys\linux\execinfo.d \
$(IMPDIR)\core\sys\linux\fcntl.d \
$(IMPDIR)\core\sys\linux\link.d \
$(IMPDIR)\core\sys\linux\termios.d \
$(IMPDIR)\core\sys\linux\time.d \
$(IMPDIR)\core\sys\linux\tipc.d \
$(IMPDIR)\core\sys\linux\unistd.d \
\
$(IMPDIR)\core\sys\linux\sys\inotify.d \
$(IMPDIR)\core\sys\linux\sys\mman.d \
Expand Down
1 change: 1 addition & 0 deletions mak/DOCS
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
DOCS=\
$(DOCDIR)\object.html \
$(DOCDIR)\core_atomic.html \
$(DOCDIR)\core_attribute.html \
$(DOCDIR)\core_bitop.html \
$(DOCDIR)\core_checkedint.html \
$(DOCDIR)\core_cpuid.html \
Expand Down
43 changes: 41 additions & 2 deletions mak/MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ MANIFEST=\
src\test_runner.d \
\
src\core\atomic.d \
src\core\attribute.d \
src\core\bitop.d \
src\core\checkedint.d \
src\core\cpuid.d \
Expand All @@ -32,8 +33,10 @@ MANIFEST=\
src\core\time.d \
src\core\vararg.d \
\
src\core\internal\abort.d \
src\core\internal\convert.d \
src\core\internal\hash.d \
src\core\internal\string.d \
src\core\internal\traits.d \
\
src\core\stdc\complex.d \
Expand Down Expand Up @@ -86,6 +89,7 @@ MANIFEST=\
src\core\sys\linux\epoll.d \
src\core\sys\linux\errno.d \
src\core\sys\linux\execinfo.d \
src\core\sys\linux\fcntl.d \
src\core\sys\linux\link.d \
src\core\sys\linux\stdio.d \
src\core\sys\linux\termios.d \
Expand All @@ -110,6 +114,7 @@ MANIFEST=\
src\core\sys\osx\mach\thread_act.d \
\
src\core\sys\osx\sys\cdefs.d \
src\core\sys\osx\sys\event.d \
src\core\sys\osx\sys\mman.d \
\
src\core\sys\posix\config.d \
Expand Down Expand Up @@ -145,6 +150,7 @@ MANIFEST=\
src\core\sys\posix\sys\ioctl.d \
src\core\sys\posix\sys\ipc.d \
src\core\sys\posix\sys\mman.d \
src\core\sys\posix\sys\msg.d \
src\core\sys\posix\sys\resource.d \
src\core\sys\posix\sys\select.d \
src\core\sys\posix\sys\shm.d \
Expand Down Expand Up @@ -245,7 +251,6 @@ MANIFEST=\
src\rt\util\array.d \
src\rt\util\hash.d \
src\rt\util\random.d \
src\rt\util\string.d \
src\rt\util\typeinfo.d \
src\rt\util\utf.d \
src\rt\util\container\array.d \
Expand Down Expand Up @@ -291,4 +296,38 @@ MANIFEST=\
src\rt\typeinfo\ti_void.d \
src\rt\typeinfo\ti_wchar.d \
\
src\etc\linux\memoryerror.d
src\etc\linux\memoryerror.d \
\
test\common.mak \
test\coverage\Makefile \
test\coverage\src-basic.lst.exp \
test\coverage\src-merge.lst.exp \
test\coverage\src-merge_true.lst.exp \
test\coverage\src\basic.d \
test\coverage\src\merge.d \
test\coverage\src\merge_true.d \
test\exceptions\Makefile \
test\exceptions\src\stderr_msg.d \
test\exceptions\src\unittest_assert.d \
test\init_fini\Makefile \
test\init_fini\src\runtime_args.d \
test\init_fini\src\thread_join.d \
test\shared\Makefile \
test\shared\src\finalize.d \
test\shared\src\host.c \
test\shared\src\lib.d \
test\shared\src\lib_13414.d \
test\shared\src\liblinkdep.d \
test\shared\src\libloaddep.d \
test\shared\src\link.d \
test\shared\src\linkD.c \
test\shared\src\linkDR.c \
test\shared\src\link_linkdep.d \
test\shared\src\link_loaddep.d \
test\shared\src\load.d \
test\shared\src\loadDR.c \
test\shared\src\load_13414.d \
test\shared\src\load_linkdep.d \
test\shared\src\load_loaddep.d \
test\shared\src\plugin.d

7 changes: 6 additions & 1 deletion mak/SRCS
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ SRCS=\
src\object.d \
\
src\core\atomic.d \
src\core\attribute.d \
src\core\bitop.d \
src\core\checkedint.d \
src\core\cpuid.d \
Expand All @@ -15,8 +16,10 @@ SRCS=\
src\core\time.d \
src\core\vararg.d \
\
src\core\internal\abort.d \
src\core\internal\convert.d \
src\core\internal\hash.d \
src\core\internal\string.d \
src\core\internal\traits.d \
\
src\core\stdc\config.d \
Expand Down Expand Up @@ -127,10 +130,12 @@ SRCS=\
src\rt\trace.d \
src\rt\tracegc.d \
\
src\rt\backtrace\dwarf.d \
src\rt\backtrace\elf.d \
\
src\rt\util\array.d \
src\rt\util\hash.d \
src\rt\util\random.d \
src\rt\util\string.d \
src\rt\util\typeinfo.d \
src\rt\util\utf.d \
src\rt\util\container\array.d \
Expand Down
Loading

0 comments on commit 480dc88

Please sign in to comment.