diff options
author | Jonghyun Park <parjong@gmail.com> | 2016-06-11 22:30:10 +0900 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-06-11 06:30:10 -0700 |
commit | c265ae38157f8543f9100c5f076d4dfa953766c7 (patch) | |
tree | 34eed7a42dc1f56def7c62cee7582258626d888d | |
parent | 59e0c0e5ac45986e8345043f53198f16a44191b4 (diff) | |
download | coreclr-c265ae38157f8543f9100c5f076d4dfa953766c7.tar.gz coreclr-c265ae38157f8543f9100c5f076d4dfa953766c7.tar.bz2 coreclr-c265ae38157f8543f9100c5f076d4dfa953766c7.zip |
Updates tryrun.cmake for ARM / ARM (softfp) (#5673)
While fixing #5316 (PR #5317, PR #5323), all the features related with PROCFS
are disabled in ARM and ARM (softfp) cross build.
As a result, the collision avodance logic in GetProcessIdDisambiguationKey is disabled,
which leads to random coreclr_initialize failures
(CLR failed to initialize itself when the previous execution of CLR with the same PID
abnormally terminates)
This commit tries to re-enable the relevant features for ARM and ARM (softfp) cross-build.
Since the ARM/Linux emulator (which is the current reference in use) supports
/proc/self/stat, /proc/self/status, /proc/self/maps, this commit re-enables
three relevant features (HAVE_PROCFS_STAT, HAVE_PROCFS_STATUS, HAVE_PROCFS_MAPS).
This commit tries to fix #5583.
-rw-r--r-- | cross/arm-softfp/tryrun.cmake | 6 | ||||
-rw-r--r-- | cross/arm/tryrun.cmake | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cross/arm-softfp/tryrun.cmake b/cross/arm-softfp/tryrun.cmake index e4a57c0bee..2721d08491 100644 --- a/cross/arm-softfp/tryrun.cmake +++ b/cross/arm-softfp/tryrun.cmake @@ -115,13 +115,13 @@ SET( HAVE_PROCFS_CTL_EXITCODE CACHE STRING "Result from TRY_RUN" FORCE) SET( HAVE_PROCFS_MAPS_EXITCODE - 1 + 0 CACHE STRING "Result from TRY_RUN" FORCE) SET( HAVE_PROCFS_STAT_EXITCODE - 1 + 0 CACHE STRING "Result from TRY_RUN" FORCE) SET( HAVE_PROCFS_STATUS_EXITCODE - 1 + 0 CACHE STRING "Result from TRY_RUN" FORCE) diff --git a/cross/arm/tryrun.cmake b/cross/arm/tryrun.cmake index e4a57c0bee..2721d08491 100644 --- a/cross/arm/tryrun.cmake +++ b/cross/arm/tryrun.cmake @@ -115,13 +115,13 @@ SET( HAVE_PROCFS_CTL_EXITCODE CACHE STRING "Result from TRY_RUN" FORCE) SET( HAVE_PROCFS_MAPS_EXITCODE - 1 + 0 CACHE STRING "Result from TRY_RUN" FORCE) SET( HAVE_PROCFS_STAT_EXITCODE - 1 + 0 CACHE STRING "Result from TRY_RUN" FORCE) SET( HAVE_PROCFS_STATUS_EXITCODE - 1 + 0 CACHE STRING "Result from TRY_RUN" FORCE) |