Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 1f95234

Browse files
author
Rahul Kumar
authored
Merge pull request #6257 from rahku/crossgen
ARM64:Similar to arm, in order to preserve volatile semantics MemoryB…
2 parents 0a8cae7 + 921e962 commit 1f95234

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/inc/volatile.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@
9090
// notice.
9191
//
9292
#define VOLATILE_MEMORY_BARRIER() asm volatile ("" : : : "memory")
93-
#endif // !_ARM_
94-
#elif defined(_ARM_) && _ISO_VOLATILE
95-
// ARM has a very weak memory model and very few tools to control that model. We're forced to perform a full
93+
#endif // _ARM_ || _ARM64_
94+
#elif (defined(_ARM_) || defined(_ARM64_)) && _ISO_VOLATILE
95+
// ARM & ARM64 have a very weak memory model and very few tools to control that model. We're forced to perform a full
9696
// memory barrier to preserve the volatile semantics. Technically this is only necessary on MP systems but we
9797
// currently don't have a cheap way to determine the number of CPUs from this header file. Revisit this if it
9898
// turns out to be a performance issue for the uni-proc case.
@@ -104,7 +104,7 @@
104104
// targeted by VC++ with /iso_volatile-.
105105
//
106106
#define VOLATILE_MEMORY_BARRIER()
107-
#endif
107+
#endif // __GNUC__
108108

109109
//
110110
// VolatileLoad loads a T from a pointer to T. It is guaranteed that this load will not be optimized

tests/arm64/Tests.lst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\ExternalException\Ext
683683
WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\ExternalException
684684
Expected=0
685685
MaxAllowedDurationSeconds=600
686-
Categories=NEW;EXPECTED_PASS;GCSTRESS_FAIL;ISSUE_6143
686+
Categories=NEW;EXPECTED_PASS
687687
HostStyle=0
688688
[HandlerException.cmd_98]
689689
RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\HandlerException\HandlerException.cmd
@@ -61107,7 +61107,7 @@ RelativePath=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b143840\b143840\b143840.cm
6110761107
WorkingDir=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b143840\b143840
6110861108
Expected=0
6110961109
MaxAllowedDurationSeconds=600
61110-
Categories=Pri0;EXPECTED_PASS;GC_GEN0;GCSTRESS_FAIL;ISSUE_6143
61110+
Categories=Pri0;EXPECTED_PASS
6111161111
HostStyle=0
6111261112
[b102879.cmd_8847]
6111361113
RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102879\b102879\b102879.cmd

0 commit comments

Comments
 (0)