diff options
| author | Marek Safar <marek.safar@gmail.com> | 2017-01-28 03:16:53 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2017-01-28 12:49:28 +0300 |
| commit | fd5bcaa48b77718531cc74d47596096fab6fcf1b (patch) | |
| tree | c6a60f6391047482c65aa9ea17431573a45bbe71 /mcs | |
| parent | 980fc8d8cd3bc9e97c9755fcc6c745e9b0a3d2b4 (diff) | |
[build] Use multiple inputs in profiled aot
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/System.Core/Makefile | 4 | ||||
| -rw-r--r-- | mcs/class/aot-compiler/Makefile | 9 | ||||
| -rw-r--r-- | mcs/class/corlib/Makefile | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile index dfdcb880cc0..ac79cff1623 100644 --- a/mcs/class/System.Core/Makefile +++ b/mcs/class/System.Core/Makefile @@ -4,6 +4,10 @@ include ../../build/rules.make LIBRARY = System.Core.dll +ifeq ($(PROFILE),build) +CSC_RUNTIME_FLAGS=--profile=aot:output=$(topdir)/class/lib/$(PROFILE)/csc.$(LIBRARY).aotprofile +endif + REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,PFX_LEGACY_3_5,FEATURE_NETCORE LIB_REFS = System LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) -d:INSIDE_SYSCORE -d:LIBC -unsafe -nowarn:436 diff --git a/mcs/class/aot-compiler/Makefile b/mcs/class/aot-compiler/Makefile index c979293b9fb..b6eb4261102 100644 --- a/mcs/class/aot-compiler/Makefile +++ b/mcs/class/aot-compiler/Makefile @@ -40,9 +40,12 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION) ifndef SKIP_AOT -profile_file=$(wildcard $(topdir)/class/lib/build/csc.aotprofile) +profile_file:=$(wildcard $(topdir)/class/lib/build/csc.*.aotprofile) ifneq ($(profile_file),) -profile_arg=,profile=$(profile_file) +comma:=, +space:= +space+= +profile_arg:=$(subst $(space)$(comma),$(comma),$(foreach pf,$(profile_file),$(comma)profile=$(strip $(pf)))) endif ifdef PLATFORM_AOT_SUFFIX @@ -55,11 +58,9 @@ $(csc_aot_image): $(csc_exe) $(mscorlib_dll) $(runtime_dep) $(mscorlib_aot_image): $(mscorlib_dll) $(runtime_dep) $(Q_AOT) MONO_PATH='$(the_libdir)' > $(PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg) --debug $(mscorlib_dll) || (cat $(PROFILE)_aot.log; exit 1) -# Disabled as it hits AOT too big limit $(csc_MC_image): $(csc_MC_dll) $(runtime_dep) $(Q_AOT) MONO_PATH='$(the_libdir)' > $(PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_MC_image) --debug $(csc_MC_dll) || (cat $(PROFILE)_aot.log; exit 1) -# Disabled as it hits AOT too big limit $(csc_MCS_image): $(csc_MCS_dll) $(runtime_dep) $(Q_AOT) MONO_PATH='$(the_libdir)' > $(PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_MCS_image) --debug $(csc_MCS_dll) || (cat $(PROFILE)_aot.log; exit 1) diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index d31076229d8..965d85ddee2 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -21,7 +21,7 @@ endif endif ifeq ($(PROFILE),build) -CSC_RUNTIME_FLAGS=--profile=aot:output=$(topdir)/class/lib/build/csc.aotprofile +CSC_RUNTIME_FLAGS=--profile=aot:output=$(topdir)/class/lib/$(PROFILE)/csc.$(LIBRARY).aotprofile endif RESOURCE_STRINGS = ../referencesource/mscorlib/mscorlib.txt |