diff options
| author | Lukas Larsson <[email protected]> | 2017-09-11 14:45:04 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-09-11 14:45:04 +0200 |
| commit | c15bb1698267ae64aac08b3b48040c44174700e5 (patch) | |
| tree | cba3ff4bdbde104d912200014384f2599aa9f094 /make | |
| parent | 87b57377864d3161a79c65e32844d7539d1a9264 (diff) | |
| parent | a9812e6307fe335d077f96d3a6342cbd4894ed0b (diff) | |
| download | otp-c15bb1698267ae64aac08b3b48040c44174700e5.tar.gz otp-c15bb1698267ae64aac08b3b48040c44174700e5.tar.bz2 otp-c15bb1698267ae64aac08b3b48040c44174700e5.zip | |
Merge branch 'lukas/erts/pgo/OTP-14604'
* lukas/erts/pgo/OTP-14604:
Add support for building a pgo beam_emu
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp.mk.in | 9 | ||||
| -rw-r--r-- | make/output.mk.in | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/make/otp.mk.in b/make/otp.mk.in index 3ab04f8256..4232d37c2e 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -47,7 +47,9 @@ CROSS_COMPILING = @CROSS_COMPILING@ # ---------------------------------------------------- DEFAULT_TARGETS = opt debug release release_docs clean docs -TYPES=@TYPES@ +TYPES = @TYPES@ + +USE_PGO = @USE_PGO@ # Slash separated list of return values from $(origin VAR) # that are untrusted - set default in this file instead. @@ -60,8 +62,8 @@ DUBIOUS_ORIGINS = /undefined/environment/ # HiPE # ---------------------------------------------------- -HIPE_ENABLED=@HIPE_ENABLED@ -NATIVE_LIBS_ENABLED=@NATIVE_LIBS_ENABLED@ +HIPE_ENABLED = @HIPE_ENABLED@ +NATIVE_LIBS_ENABLED = @NATIVE_LIBS_ENABLED@ # ---------------------------------------------------- # Command macros @@ -83,6 +85,7 @@ LD = @LD@ RANLIB = @RANLIB@ AR = @AR@ PERL = @PERL@ +LLVM_PROFDATA = @LLVM_PROFDATA@ BITS64 = @BITS64@ diff --git a/make/output.mk.in b/make/output.mk.in index 171d2456aa..7c6533fddd 100644 --- a/make/output.mk.in +++ b/make/output.mk.in @@ -139,3 +139,7 @@ vsn_verbose = $(vsn_verbose_$(V)) yecc_verbose_0 = @echo " YECC "$@; yecc_verbose = $(yecc_verbose_$(V)) + +llvm_profdata_verbose_0 = @echo " LLVM_PROFDATA "$@; +llvm_profdata_verbose = $(llvm_profdata_verbose_$(V)) +V_LLVM_PROFDATA = $(llvm_profdata_verbose)$(LLVM_PROFDATA) |