diff options
| author | Lukas Larsson <[email protected]> | 2016-07-14 15:56:26 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-07-14 15:56:26 +0200 |
| commit | f7b0cbbab08f2d3f733dfe2e201ce0ff614daaf3 (patch) | |
| tree | 6b6d7a25c3602b119feade654b310d1f48dedc26 /erts/emulator/Makefile.in | |
| parent | 4cec737d18f02a3cb3e59b95b86c0a50a0649693 (diff) | |
| parent | 8d64850d816957f9decf26148eb4ced8275ea1f9 (diff) | |
| download | otp-f7b0cbbab08f2d3f733dfe2e201ce0ff614daaf3.tar.gz otp-f7b0cbbab08f2d3f733dfe2e201ce0ff614daaf3.tar.bz2 otp-f7b0cbbab08f2d3f733dfe2e201ce0ff614daaf3.zip | |
Merge branch 'lukas/erts/remove_benchmark_code/OTP-13743' into maint
* lukas/erts/remove_benchmark_code/OTP-13743:
hipe: Remove performance profiling code
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 2212aed5e0..6c4b30020a 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -744,7 +744,7 @@ EMU_OBJS = \ $(OBJDIR)/beam_ranges.o RUN_OBJS = \ - $(OBJDIR)/erl_pbifs.o $(OBJDIR)/benchmark.o \ + $(OBJDIR)/erl_pbifs.o \ $(OBJDIR)/erl_alloc.o $(OBJDIR)/erl_mtrace.o \ $(OBJDIR)/erl_alloc_util.o $(OBJDIR)/erl_goodfit_alloc.o \ $(OBJDIR)/erl_bestfit_alloc.o $(OBJDIR)/erl_afit_alloc.o \ |