Skip to content

Commit

Permalink
Merge pull request JuliaLang#12425 from JuliaLang/jn/signals
Browse files Browse the repository at this point in the history
rearrangement of the signals code
  • Loading branch information
vtjnash committed Aug 3, 2015
2 parents ddbcd73 + 5eac04d commit 339033f
Show file tree
Hide file tree
Showing 13 changed files with 1,169 additions and 1,161 deletions.
4 changes: 3 additions & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ BUILDDIR ?= .

SRCS = \
jltypes gf ast builtins module codegen disasm debuginfo interpreter \
alloc dlload sys init task array dump toplevel jl_uv jlapi profile llvm-simdloop simplevector
alloc dlload sys init task array dump toplevel jl_uv jlapi signal-handling \
llvm-simdloop simplevector

HEADERS = julia.h julia_internal.h julia_version.h options.h $(wildcard support/*.h) $(LIBUV_INC)/uv.h

Expand Down Expand Up @@ -93,6 +94,7 @@ $(BUILDDIR)/ast.o $(BUILDDIR)/ast.dbg.obj: $(BUILDDIR)/julia_flisp.boot.inc flis
$(BUILDDIR)/codegen.o $(BUILDDIR)/codegen.dbg.obj: intrinsics.cpp cgutils.cpp ccall.cpp abi_*.cpp
$(BUILDDIR)/builtins.o $(BUILDDIR)/builtins.dbg.obj: table.c
$(BUILDDIR)/gc.o $(BUILDDIR)/gc.dbg.obj: gc-debug.c
$(BUILDDIR)/signal-handling.o $(BUILDDIR)/signal-handling.dbg.obj: signals-*.c

$(BUILDDIR)/support/libsupport.a: support/*.h support/*.c
$(MAKE) -C support BUILDDIR='$(abspath $(BUILDDIR)/support)'
Expand Down
2 changes: 0 additions & 2 deletions src/codegen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3429,8 +3429,6 @@ static Value *emit_expr(jl_value_t *expr, jl_codectx_t *ctx, bool isboxed, bool

// --- generate function bodies ---

extern char *jl_stack_lo;

extern "C" jl_svec_t *jl_svec_tvars_to_symbols(jl_svec_t *t);

// gc frame emission
Expand Down
Loading

0 comments on commit 339033f

Please sign in to comment.