diff options
| author | Lukas Larsson <[email protected]> | 2017-10-30 15:23:47 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-10-30 15:23:47 +0100 |
| commit | 8bdd9727cbf73b576e6b4303d5e86e3ebbc9e4fa (patch) | |
| tree | 88c85b4e8f5824d7765a6baa3a989944dec16413 /erts/emulator | |
| parent | 5c05e738eadcd0b6239b287adb536847da65bba1 (diff) | |
| parent | 8c8467e3ad26932aaacfb01efb2118d986e5200f (diff) | |
| download | otp-8bdd9727cbf73b576e6b4303d5e86e3ebbc9e4fa.tar.gz otp-8bdd9727cbf73b576e6b4303d5e86e3ebbc9e4fa.tar.bz2 otp-8bdd9727cbf73b576e6b4303d5e86e3ebbc9e4fa.zip | |
Merge branch 'lukas/erts/pgo/OTP-14604'
* lukas/erts/pgo/OTP-14604:
erts: Only do PGO if gcc supports -fprofile-correction
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/Makefile.in | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 3117b24bcc..fdaf253fe5 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -74,9 +74,8 @@ endif endif ifeq ($(PROFILE_COMPILER), gcc) -PROFILE_CORRECTION=@PROFILE_CORRECTION@ PROFILE_GENERATE=-fprofile-generate -PROFILE_USE=-fprofile-use $(PROFILE_CORRECTION) +PROFILE_USE=-fprofile-use -fprofile-correction PROFILE_USE_DEPS=$(OBJDIR)/%_pu.gcda endif ifeq ($(PROFILE_COMPILER), clang) @@ -816,14 +815,7 @@ $(ERL_TOP)/lib/%.beam: INIT_OBJS = $(OBJDIR)/erl_main.o $(PRELOAD_OBJ) -# -fprofile-correction is needed in order to use PGO on erl_process -# as multiple threads execute in that file. -ifeq ($(PROFILE_CORRECTION),) -PROFILE_OBJS = $(OBJDIR)/beam_emu.o -RUN_OBJS = $(OBJDIR)/erl_process.o -else PROFILE_OBJS = $(OBJDIR)/beam_emu.o $(OBJDIR)/erl_process.o -endif EMU_OBJS = \ $(OBJDIR)/beam_opcodes.o \ |