File tree Expand file tree Collapse file tree 3 files changed +3
-6
lines changed Expand file tree Collapse file tree 3 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ endif()
6565
6666if (NOT CLR_CMAKE_HOST_WIN32)
6767
68- if (CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT CLR_CMAKE_HOST_ARCH_S390X AND NOT CLR_CMAKE_HOST_OSX AND NOT CLR_CMAKE_HOST_FREEBSD )
68+ if (CMAKE_C_COMPILER_ID MATCHES "Clang" AND CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_ARCH_S390X )
6969 add_linker_flag(-fuse-ld=lld)
7070 set (LD_LLVM 1)
7171 else ()
Original file line number Diff line number Diff line change @@ -986,13 +986,10 @@ g_rgWriteBarrierDescriptors:
986986 LEAF_ENTRY JIT_WriteBarrier_Callable
987987
988988 // Branch to the write barrier
989- ldr r2 , 2f // or R3? See targetarm.h
989+ ldr r2 , =JIT_WriteBarrier_Loc - (1f + 4 ) // or R3? See targetarm.h
9909901 :
991991 add r2 , pc
992- ldr r2 , [ r2 ]
993992 ldr pc , [ r2 ]
994- 2 :
995- .long JIT_WriteBarrier_Loc(GOT_PREL) - (( 1b + 4 ) - 2b)
996993 LEAF_END JIT_WriteBarrier_Callable
997994
998995#ifdef FEATURE_READYTORUN
Original file line number Diff line number Diff line change 9494 // r4 = pFrame
9595
9696 // set first slot to the value of InlinedCallFrame::`vftable' (checked by runtime code)
97- ldr r1 , =_ZTV16InlinedCallFrame + 8 - 2f
97+ ldr r1 , =_ZTV16InlinedCallFrame + 8 - (2f + 4 )
98982 :
9999 add r1 , pc
100100 str r1 , [ r4 ]
You can’t perform that action at this time.
0 commit comments