Add a bunch more missing ENDs to assembler routines.
This isn't everything; I've missed out those x86 files that are
Change-Id: Idb7bb1a68796d6c0b70ea2b5c3300e49da6c62d2
diff --git a/libc/arch-arm/bionic/memcmp.S b/libc/arch-arm/bionic/memcmp.S
index d6d3ca1..7fb4283 100644
--- a/libc/arch-arm/bionic/memcmp.S
+++ b/libc/arch-arm/bionic/memcmp.S
@@ -115,7 +115,7 @@
* pointer somewhere else
*/
mov r4, r0
-
+
/* align first pointer to word boundary
* offset = -src & 3
*/
@@ -151,7 +151,7 @@
ldr ip, [r1]
subs r2, r2, #(32 + 4)
bmi 1f
-
+
0: pld [r4, #(CACHE_LINE_SIZE * 2)]
pld [r1, #(CACHE_LINE_SIZE * 2)]
ldr r0, [r4], #4
@@ -178,14 +178,14 @@
ldreq r0, [r4], #4
ldreq ip, [r1, #4]!
eoreqs r0, r0, lr
- bne 2f
+ bne 2f
subs r2, r2, #32
bhs 0b
/* do we have at least 4 bytes left? */
1: adds r2, r2, #(32 - 4 + 4)
bmi 4f
-
+
/* finish off 4 bytes at a time */
3: ldr r0, [r4], #4
ldr ip, [r1], #4
@@ -233,17 +233,14 @@
subs r2, r2, #1
bne 11b
bx lr
-END(memcmp)
-
-
5: /*************** non-congruent case ***************/
- and r0, r1, #3
+ and r0, r1, #3
cmp r0, #2
bne 4f
/* here, offset is 2 (16-bits aligned, special cased) */
-
+
/* make sure we have at least 16 bytes to process */
subs r2, r2, #16
addmi r2, r2, #16
@@ -341,3 +338,4 @@
mov r2, #4
ldmfd sp!, {r5, r6, r7}
b 8b
+END(memcmp)
diff --git a/libc/arch-arm/bionic/memset.S b/libc/arch-arm/bionic/memset.S
index 54f74de..102d541 100644
--- a/libc/arch-arm/bionic/memset.S
+++ b/libc/arch-arm/bionic/memset.S
@@ -42,6 +42,7 @@
ENTRY(bzero)
mov r2, r1
mov r1, #0
+ // Fall through to memset...
END(bzero)
ENTRY(memset)
diff --git a/libc/arch-x86/bionic/_setjmp.S b/libc/arch-x86/bionic/_setjmp.S
index ac62635..9221138 100644
--- a/libc/arch-x86/bionic/_setjmp.S
+++ b/libc/arch-x86/bionic/_setjmp.S
@@ -54,6 +54,7 @@
movl %edi,20(%eax)
xorl %eax,%eax
ret
+END(_setjmp)
ENTRY(_longjmp)
movl 4(%esp),%edx
@@ -69,3 +70,4 @@
incl %eax
1: movl %ecx,0(%esp)
ret
+END(_longjmp)
diff --git a/libc/arch-x86/bionic/futex_x86.S b/libc/arch-x86/bionic/futex_x86.S
index 096f72c..36a28e8 100644
--- a/libc/arch-x86/bionic/futex_x86.S
+++ b/libc/arch-x86/bionic/futex_x86.S
@@ -19,7 +19,6 @@
ret
END(__futex_wait)
-
// int __futex_wake(volatile void *ftx, int count)
ENTRY(__futex_wake)
pushl %ebx
diff --git a/libc/arch-x86/bionic/setjmp.S b/libc/arch-x86/bionic/setjmp.S
index bcb5f9d..c0df647 100644
--- a/libc/arch-x86/bionic/setjmp.S
+++ b/libc/arch-x86/bionic/setjmp.S
@@ -52,7 +52,7 @@
call _C_LABEL(sigblock)
#endif
addl $4,%esp
- PIC_EPILOGUE
+ PIC_EPILOGUE
movl 4(%esp),%ecx
movl 0(%esp),%edx
@@ -65,6 +65,7 @@
movl %eax,24(%ecx)
xorl %eax,%eax
ret
+END(setjmp)
ENTRY(longjmp)
movl 4(%esp),%edx
@@ -76,7 +77,7 @@
call _C_LABEL(sigsetmask)
#endif
addl $4,%esp
- PIC_EPILOGUE
+ PIC_EPILOGUE
movl 4(%esp),%edx
movl 8(%esp),%eax
@@ -91,3 +92,4 @@
incl %eax
1: movl %ecx,0(%esp)
ret
+END(longjmp)
diff --git a/libc/arch-x86/bionic/sigsetjmp.S b/libc/arch-x86/bionic/sigsetjmp.S
index c990a05..70cc6db 100644
--- a/libc/arch-x86/bionic/sigsetjmp.S
+++ b/libc/arch-x86/bionic/sigsetjmp.S
@@ -61,6 +61,7 @@
movl %edi,20(%ecx)
xorl %eax,%eax
ret
+END(sigsetjmp)
ENTRY(siglongjmp)
movl 4(%esp),%edx
@@ -90,3 +91,4 @@
incl %eax
2: movl %ecx,0(%esp)
ret
+END(siglongjmp)
diff --git a/libc/arch-x86/string/bcmp.S b/libc/arch-x86/string/bcmp.S
index a5b46ae..4a88f66 100644
--- a/libc/arch-x86/string/bcmp.S
+++ b/libc/arch-x86/string/bcmp.S
@@ -30,3 +30,4 @@
L2: popl %esi
popl %edi
ret
+END(bcmp)
diff --git a/libc/arch-x86/string/bzero.S b/libc/arch-x86/string/bzero.S
index 2ec9c7d..c73a351 100644
--- a/libc/arch-x86/string/bzero.S
+++ b/libc/arch-x86/string/bzero.S
@@ -41,3 +41,4 @@
popl %edi
ret
+END(bzero)
diff --git a/libc/arch-x86/string/fss.S b/libc/arch-x86/string/fss.S
index 96affab..d819306 100644
--- a/libc/arch-x86/string/fss.S
+++ b/libc/arch-x86/string/fss.S
@@ -15,3 +15,4 @@
.align 2
L1: xorl %eax,%eax /* clear result */
ret
+END(ffs)
diff --git a/libc/arch-x86/string/memchr.S b/libc/arch-x86/string/memchr.S
index d6bcbe6..367c7b4 100644
--- a/libc/arch-x86/string/memchr.S
+++ b/libc/arch-x86/string/memchr.S
@@ -24,3 +24,4 @@
L1: xorl %eax,%eax
popl %edi
ret
+END(memchr)
diff --git a/libc/arch-x86/string/memcmp.S b/libc/arch-x86/string/memcmp.S
index 1be189a..3b50530 100644
--- a/libc/arch-x86/string/memcmp.S
+++ b/libc/arch-x86/string/memcmp.S
@@ -41,3 +41,4 @@
popl %esi
popl %edi
ret
+END(memcmp)
diff --git a/libc/arch-x86/string/memset.S b/libc/arch-x86/string/memset.S
index 1059ccc..62e6a17 100644
--- a/libc/arch-x86/string/memset.S
+++ b/libc/arch-x86/string/memset.S
@@ -53,3 +53,4 @@
popl %ebx
popl %edi
ret
+END(memset)
diff --git a/libc/arch-x86/string/strcat.S b/libc/arch-x86/string/strcat.S
index 60fdd55..c75f38a 100644
--- a/libc/arch-x86/string/strcat.S
+++ b/libc/arch-x86/string/strcat.S
@@ -71,3 +71,4 @@
L2: popl %eax /* pop destination address */
popl %edi /* restore edi */
ret
+END(strcat)
diff --git a/libc/arch-x86/string/strcmp.S b/libc/arch-x86/string/strcmp.S
index 22ba546..5d3f4fc 100644
--- a/libc/arch-x86/string/strcmp.S
+++ b/libc/arch-x86/string/strcmp.S
@@ -79,3 +79,4 @@
movzbl (%edx),%edx
subl %edx,%eax
ret
+END(strcmp)
diff --git a/libc/arch-x86/string/strcpy.S b/libc/arch-x86/string/strcpy.S
index 341eb6c..7d9b87e 100644
--- a/libc/arch-x86/string/strcpy.S
+++ b/libc/arch-x86/string/strcpy.S
@@ -61,3 +61,4 @@
jnz L1
L2: popl %eax /* pop dst address */
ret
+END(strcpy)
diff --git a/libc/arch-x86/string/strlen.S b/libc/arch-x86/string/strlen.S
index 4f04ffc..527e36a 100644
--- a/libc/arch-x86/string/strlen.S
+++ b/libc/arch-x86/string/strlen.S
@@ -18,3 +18,4 @@
leal -1(%ecx),%eax /* and subtracting one */
popl %edi
ret
+END(strlen)
diff --git a/libc/arch-x86/string/strncmp.S b/libc/arch-x86/string/strncmp.S
index 5aa88d7..6649473 100644
--- a/libc/arch-x86/string/strncmp.S
+++ b/libc/arch-x86/string/strncmp.S
@@ -111,3 +111,4 @@
L4: xorl %eax,%eax
popl %ebx
ret
+END(strncmp)
diff --git a/libc/arch-x86/string/swab.S b/libc/arch-x86/string/swab.S
index 3055860..2f6cfb2 100644
--- a/libc/arch-x86/string/swab.S
+++ b/libc/arch-x86/string/swab.S
@@ -65,3 +65,4 @@
L4: popl %edi
popl %esi
ret
+END(swab)
