diff --git a/projects/clr/rocclr/.gitattributes b/projects/clr/rocclr/.gitattributes
index 0baac9e224..c8e2a74f88 100644
--- a/projects/clr/rocclr/.gitattributes
+++ b/projects/clr/rocclr/.gitattributes
@@ -9,7 +9,7 @@
 *.h text eol=lf
 *.hpp text eol=lf
 *.txt text eol=lf
-*.asm test eol=lf
+*.asm text eol=lf
 
 # Define files to support auto-remove trailing white space
 # Need to run the command below, before add modified file(s) to the staging area
diff --git a/projects/clr/rocclr/os/setjmp.asm b/projects/clr/rocclr/os/setjmp.asm
index 4fcb60eab2..48bc724064 100644
--- a/projects/clr/rocclr/os/setjmp.asm
+++ b/projects/clr/rocclr/os/setjmp.asm
@@ -66,29 +66,29 @@ _Os_setCurrentStackPtr proc
 _Os_setCurrentStackPtr endp
 
 _StackContext_setjmp proc
-    mov r8,[rsp]
-    mov [rcx],rbx
-    lea r9,8[rsp]
-    mov 8[rcx],r9
-    mov 10h[rcx],rbp
-    mov 18h[rcx],rsi
-    mov 20h[rcx],rdi
-    mov 28h[rcx],r12
-    mov 30h[rcx],r13
-    mov 38h[rcx],r14
-    mov 40h[rcx],r15
-    mov 48h[rcx],r8
-    stmxcsr 50h[rcx]
-    fnstcw 54h[rcx]
-    movdqa 60h[rcx],xmm6
-    movdqa 70h[rcx],xmm7
-    movdqa 80h[rcx],xmm8
-    movdqa 90h[rcx],xmm9
-    movdqa 0A0h[rcx],xmm10
-    movdqa 0B0h[rcx],xmm11
-    movdqa 0C0h[rcx],xmm12
-    movdqa 0D0h[rcx],xmm13
-    movdqa 0E0h[rcx],xmm14
+    mov r8,[rsp]
+    mov [rcx],rbx
+    lea r9,8[rsp]
+    mov 8[rcx],r9
+    mov 10h[rcx],rbp
+    mov 18h[rcx],rsi
+    mov 20h[rcx],rdi
+    mov 28h[rcx],r12
+    mov 30h[rcx],r13
+    mov 38h[rcx],r14
+    mov 40h[rcx],r15
+    mov 48h[rcx],r8
+    stmxcsr 50h[rcx]
+    fnstcw 54h[rcx]
+    movdqa 60h[rcx],xmm6
+    movdqa 70h[rcx],xmm7
+    movdqa 80h[rcx],xmm8
+    movdqa 90h[rcx],xmm9
+    movdqa 0A0h[rcx],xmm10
+    movdqa 0B0h[rcx],xmm11
+    movdqa 0C0h[rcx],xmm12
+    movdqa 0D0h[rcx],xmm13
+    movdqa 0E0h[rcx],xmm14
     movdqa 0F0h[rcx],xmm15
     xor rax,rax
     ret
@@ -96,30 +96,30 @@ _StackContext_setjmp endp
 
 _StackContext_longjmp proc
     mov rax,rdx
-    mov rbx,[rcx]
-    mov rsp,8[rcx]
-    mov rbp,10h[rcx]
-    mov rsi,18h[rcx]
-    mov rdi,20h[rcx]
-    mov r12,28h[rcx]
-    mov r13,30h[rcx]
-    mov r14,38h[rcx]
-    mov r15,40h[rcx]
-    mov rdx,48h[rcx]
-    ldmxcsr 50h[rcx]
-    fnclex
-    fldcw 54h[rcx]
-    movdqa xmm6,60h[rcx]
-    movdqa xmm7,70h[rcx]
-    movdqa xmm8,80h[rcx]
-    movdqa xmm9,90h[rcx]
-    movdqa xmm10,0A0h[rcx]
-    movdqa xmm11,0B0h[rcx]
-    movdqa xmm12,0C0h[rcx]
-    movdqa xmm13,0D0h[rcx]
-    movdqa xmm14,0E0h[rcx]
+    mov rbx,[rcx]
+    mov rsp,8[rcx]
+    mov rbp,10h[rcx]
+    mov rsi,18h[rcx]
+    mov rdi,20h[rcx]
+    mov r12,28h[rcx]
+    mov r13,30h[rcx]
+    mov r14,38h[rcx]
+    mov r15,40h[rcx]
+    mov rdx,48h[rcx]
+    ldmxcsr 50h[rcx]
+    fnclex
+    fldcw 54h[rcx]
+    movdqa xmm6,60h[rcx]
+    movdqa xmm7,70h[rcx]
+    movdqa xmm8,80h[rcx]
+    movdqa xmm9,90h[rcx]
+    movdqa xmm10,0A0h[rcx]
+    movdqa xmm11,0B0h[rcx]
+    movdqa xmm12,0C0h[rcx]
+    movdqa xmm13,0D0h[rcx]
+    movdqa xmm14,0E0h[rcx]
     movdqa xmm15,0F0h[rcx]
-    jmp rdx
+    jmp rdx
 _StackContext_longjmp endp
 
 endif ; _WIN64