Showing with 5 additions and 17 deletions.
  1. +0 −2 mak/COPY
  2. +1 −2 mak/MANIFEST
  3. +1 −2 mak/SRCS
  4. +1 −1 src/rt/dwarfeh.d
  5. +2 −4 src/{core/sys → rt}/unwind.d
  6. +0 −3 win32.mak
  7. +0 −3 win64.mak
2 changes: 0 additions & 2 deletions mak/COPY
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ COPY=\
$(IMPDIR)\core\stdc\wchar_.d \
$(IMPDIR)\core\stdc\wctype.d \
\
$(IMPDIR)\core\sys\unwind.d \
\
$(IMPDIR)\core\sys\freebsd\dlfcn.d \
$(IMPDIR)\core\sys\freebsd\execinfo.d \
\
Expand Down
3 changes: 1 addition & 2 deletions mak/MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ MANIFEST=\
src\core\sync\rwmutex.d \
src\core\sync\semaphore.d \
\
src\core\sys\unwind.d \
\
src\core\sys\freebsd\dlfcn.d \
src\core\sys\freebsd\execinfo.d \
src\core\sys\freebsd\time.d \
Expand Down Expand Up @@ -411,6 +409,7 @@ MANIFEST=\
src\rt\tlsgc.d \
src\rt\trace.d \
src\rt\tracegc.d \
src\rt\unwind.d \
\
src\rt\backtrace\dwarf.d \
src\rt\backtrace\elf.d \
Expand Down
3 changes: 1 addition & 2 deletions mak/SRCS
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ SRCS=\
src\core\sync\rwmutex.d \
src\core\sync\semaphore.d \
\
src\core\sys\unwind.d \
\
src\core\sys\freebsd\execinfo.d \
src\core\sys\freebsd\sys\event.d \
\
Expand Down Expand Up @@ -289,6 +287,7 @@ SRCS=\
src\rt\tlsgc.d \
src\rt\trace.d \
src\rt\tracegc.d \
src\rt\unwind.d \
\
src\rt\backtrace\dwarf.d \
src\rt\backtrace\elf.d \
Expand Down
2 changes: 1 addition & 1 deletion src/rt/dwarfeh.d
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module rt.dwarfeh;

version (Posix):

import core.sys.unwind;
import rt.unwind;
import core.stdc.stdio;
import core.stdc.stdlib;

Expand Down
6 changes: 2 additions & 4 deletions src/core/sys/unwind.d → src/rt/unwind.d
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
*
* See_Also:
* Itanium C++ ABI: Exception Handling ($Revision: 1.22 $)
* Source: $(DRUNTIMESRC src/core/sys/_unwind.d)
* Source: $(DRUNTIMESRC src/rt/_unwind.d)
*/

module core.sys.unwind;
module rt.unwind;

import core.stdc.stdint;

Expand Down Expand Up @@ -124,5 +124,3 @@ _Unwind_Reason_Code _Unwind_SjLj_RaiseException(_Unwind_Exception*);
_Unwind_Reason_Code _Unwind_SjLj_ForcedUnwind(_Unwind_Exception , _Unwind_Stop_Fn, void*);
void _Unwind_SjLj_Resume(_Unwind_Exception*);
_Unwind_Reason_Code _Unwind_SjLj_Resume_or_Rethrow(_Unwind_Exception*);


3 changes: 0 additions & 3 deletions win32.mak
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,6 @@ $(IMPDIR)\core\stdc\wchar_.d : src\core\stdc\wchar_.d
$(IMPDIR)\core\stdc\wctype.d : src\core\stdc\wctype.d
copy $** $@

$(IMPDIR)\core\sys\unwind.d : src\core\sys\unwind.d
copy $** $@

$(IMPDIR)\core\sys\freebsd\dlfcn.d : src\core\sys\freebsd\dlfcn.d
copy $** $@

Expand Down
3 changes: 0 additions & 3 deletions win64.mak
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,6 @@ $(IMPDIR)\core\stdc\wchar_.d : src\core\stdc\wchar_.d
$(IMPDIR)\core\stdc\wctype.d : src\core\stdc\wctype.d
copy $** $@

$(IMPDIR)\core\sys\unwind.d : src\core\sys\unwind.d
copy $** $@

$(IMPDIR)\core\sys\freebsd\dlfcn.d : src\core\sys\freebsd\dlfcn.d
copy $** $@

Expand Down