diff options
author | Aditya Mandaleeka <adityam@microsoft.com> | 2016-05-25 14:45:38 -0700 |
---|---|---|
committer | Aditya Mandaleeka <adityam@microsoft.com> | 2016-05-25 14:45:38 -0700 |
commit | 18fb747a7bc519d874c85d36eccfe1aaf4f18ab6 (patch) | |
tree | f7b17bf1eabffc07db2182430b83e666185684b0 /src/coreclr | |
parent | e15606ec53f2686d198a2edec9b6a8b9907c7ec8 (diff) | |
download | coreclr-18fb747a7bc519d874c85d36eccfe1aaf4f18ab6.tar.gz coreclr-18fb747a7bc519d874c85d36eccfe1aaf4f18ab6.tar.bz2 coreclr-18fb747a7bc519d874c85d36eccfe1aaf4f18ab6.zip |
Remove CORECLR_CONCURRENT_GC from Unix coreruncommon.
Diffstat (limited to 'src/coreclr')
-rw-r--r-- | src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp index b9e62fffeb..eedf5241ee 100644 --- a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp +++ b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp @@ -28,10 +28,6 @@ // disabled. Server GC is off by default. static const char* serverGcVar = "CORECLR_SERVER_GC"; -// Name of the environment variable controlling concurrent GC, -// used in the same way as serverGcVar. Concurrent GC is on by default. -static const char* concurrentGcVar = "CORECLR_CONCURRENT_GC"; - #if defined(__linux__) #define symlinkEntrypointExecutable "/proc/self/exe" #elif !defined(__APPLE__) @@ -320,25 +316,16 @@ int ExecuteManagedAssembly( } else { - // check if we are enabling server GC or concurrent GC. - // Server GC is off by default, while concurrent GC is on by default. - // Actual checking of these string values is done in coreclr_initialize. + // Check whether we are enabling server GC (off by default) const char* useServerGc = std::getenv(serverGcVar); if (useServerGc == nullptr) { useServerGc = "0"; } - - const char* useConcurrentGc = std::getenv(concurrentGcVar); - if (useConcurrentGc == nullptr) - { - useConcurrentGc = "1"; - } // CoreCLR expects strings "true" and "false" instead of "1" and "0". useServerGc = std::strcmp(useServerGc, "1") == 0 ? "true" : "false"; - useConcurrentGc = std::strcmp(useConcurrentGc, "1") == 0 ? "true" : "false"; - + // Allowed property names: // APPBASE // - The base path of the application from which the exe and other assemblies will be loaded @@ -362,7 +349,6 @@ int ExecuteManagedAssembly( "NATIVE_DLL_SEARCH_DIRECTORIES", "AppDomainCompatSwitch", "System.GC.Server", - "System.GC.Concurrent" }; const char *propertyValues[] = { // TRUSTED_PLATFORM_ASSEMBLIES @@ -377,8 +363,6 @@ int ExecuteManagedAssembly( "UseLatestBehaviorWhenTFMNotSpecified", // System.GC.Server useServerGc, - // System.GC.Concurrent - useConcurrentGc }; void* hostHandle; |