projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[aot] Rewrite the AOT profiler. (#4176)
[mono.git]
/
mcs
/
class
/
corlib
/
Makefile
diff --git
a/mcs/class/corlib/Makefile
b/mcs/class/corlib/Makefile
index c05eb88982187a2070f9c67e3eec257a9d60caf9..e466678a17f65294bab12f26c131e732dc731aba 100644
(file)
--- a/
mcs/class/corlib/Makefile
+++ b/
mcs/class/corlib/Makefile
@@
-11,16
+11,21
@@
LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%)
#LIBRARY_USE_INTERMEDIATE_FILE = yes
ifeq (2, $(FRAMEWORK_VERSION_MAJOR))
#LIBRARY_USE_INTERMEDIATE_FILE = yes
ifeq (2, $(FRAMEWORK_VERSION_MAJOR))
-LIB_MCS_FLAGS += -
-runtime:v4
+LIB_MCS_FLAGS += -
runtimemetadataversion:v4.0.30319
else
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
else
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
-LIB_MCS_FLAGS += -
-runtime:v4
+LIB_MCS_FLAGS += -
runtimemetadataversion:v4.0.30319
else
$(error Unknown framework version)
endif
endif
else
$(error Unknown framework version)
endif
endif
+ifeq ($(PROFILE),build)
+CSC_RUNTIME_FLAGS=--profile=aot:output=$(topdir)/class/lib/build/csc.aotprofile
+endif
+
RESOURCE_STRINGS = ../referencesource/mscorlib/mscorlib.txt
RESOURCE_STRINGS = ../referencesource/mscorlib/mscorlib.txt
+RESX_RESOURCE_STRING = ../../../external/corefx/src/System.ValueTuple/src/Resources/Strings.resx
LIBRARY_COMPILE = $(BOOT_COMPILE)
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
LIBRARY_COMPILE = $(BOOT_COMPILE)
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
@@
-41,7
+46,7
@@
ifndef MOBILE_PROFILE
REFERENCE_SOURCES_FLAGS += -d:FEATURE_MACL
endif
REFERENCE_SOURCES_FLAGS += -d:FEATURE_MACL
endif
-ifndef
MOBILE_STATIC
+ifndef
AOT_FRIENDLY_PROFILE
REFERENCE_SOURCES_FLAGS += -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY
endif
REFERENCE_SOURCES_FLAGS += -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY
endif
@@
-66,9
+71,11
@@
DEFAULT_REFERENCES =
TEST_LIB_REFS = System.Core System
TEST_LIB_REFS = System.Core System
-ifndef MOBILE_STATIC
+ifndef AOT_FRIENDLY_PROFILE
+ifneq ($(PROFILE),testing_aot_hybrid)
TEST_LIB_REFS += Mono.Posix
endif
TEST_LIB_REFS += Mono.Posix
endif
+endif
# System.IO/DirectoryInfoTest.cs needs Mono.Posix
TEST_MCS_FLAGS += -debug -nowarn:168,219,618,672 -unsafe \
# System.IO/DirectoryInfoTest.cs needs Mono.Posix
TEST_MCS_FLAGS += -debug -nowarn:168,219,618,672 -unsafe \