diff options
| author | Suchiman <robinsue@live.de> | 2019-06-11 21:17:46 +0200 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-06-11 20:26:23 -0700 |
| commit | 7fcbc3b5b0689a959d9da928e4d03f532a851212 (patch) | |
| tree | bba112027d367dec0bad9332552058956aeb1d70 /src/gc | |
| parent | 18ca45f9718897f7b8fe1036213150dd6e7b97ec (diff) | |
| download | coreclr-7fcbc3b5b0689a959d9da928e4d03f532a851212.tar.gz coreclr-7fcbc3b5b0689a959d9da928e4d03f532a851212.tar.bz2 coreclr-7fcbc3b5b0689a959d9da928e4d03f532a851212.zip | |
Fix Redhawk defines
Diffstat (limited to 'src/gc')
| -rw-r--r-- | src/gc/env/gcenv.base.h | 3 | ||||
| -rw-r--r-- | src/gc/gc.cpp | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/gc/env/gcenv.base.h b/src/gc/env/gcenv.base.h index 46ad366e62..52b64eeeef 100644 --- a/src/gc/env/gcenv.base.h +++ b/src/gc/env/gcenv.base.h @@ -11,9 +11,6 @@ #include <intrin.h> #endif // _MSC_VER -#define REDHAWK_PALIMPORT extern "C" -#define REDHAWK_PALAPI __stdcall - #if !defined(_MSC_VER) #define _alloca alloca #endif //_MSC_VER diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp index 7e60097883..431a08e64a 100644 --- a/src/gc/gc.cpp +++ b/src/gc/gc.cpp @@ -14881,9 +14881,7 @@ int gc_heap::joined_generation_to_condemn (BOOL should_evaluate_elevation, } } // for traditional GC stress - else -#endif // !FEATURE_REDHAWK - if (*blocking_collection_p) + else if (*blocking_collection_p) { // We call StressHeap() a lot for Concurrent GC Stress. However, // if we can not do a concurrent collection, no need to stress anymore. @@ -14891,6 +14889,7 @@ int gc_heap::joined_generation_to_condemn (BOOL should_evaluate_elevation, GCStressPolicy::GlobalDisable(); } else +#endif // !FEATURE_REDHAWK { n = max_generation; } @@ -30799,7 +30798,7 @@ BOOL gc_heap::decide_on_compacting (int condemned_gen_number, heap_number, settings.condemned_generation, fragmentation, (int)(fragmentation_burden * 100.0))); -#ifdef STRESS_HEAP +#if defined(STRESS_HEAP) && !defined(FEATURE_REDHAWK) // for pure GC stress runs we need compaction, for GC stress "mix" // we need to ensure a better mix of compacting and sweeping collections if (GCStress<cfg_any>::IsEnabled() && !settings.concurrent @@ -30820,7 +30819,7 @@ BOOL gc_heap::decide_on_compacting (int condemned_gen_number, } } #endif // GC_STATS -#endif //STRESS_HEAP +#endif //defined(STRESS_HEAP) && !defined(FEATURE_REDHAWK) if (GCConfig::GetForceCompact()) should_compact = TRUE; |