summaryrefslogtreecommitdiffstats
path: root/libc/arch-x86
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-02-13 15:12:32 -0800
committerElliott Hughes <enh@google.com>2013-02-13 15:12:32 -0800
commit6719500dbd9330d7539d2db3dcf3e8ad1858c7aa (patch)
treec5ee88ca9fa2aadf63a88f2a0255ecdcee07e881 /libc/arch-x86
parent2fee0340a93637507de6a860914dc3e14d44ee94 (diff)
downloadbionic-6719500dbd9330d7539d2db3dcf3e8ad1858c7aa.zip
bionic-6719500dbd9330d7539d2db3dcf3e8ad1858c7aa.tar.gz
bionic-6719500dbd9330d7539d2db3dcf3e8ad1858c7aa.tar.bz2
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
Diffstat (limited to 'libc/arch-x86')
-rw-r--r--libc/arch-x86/bionic/_setjmp.S2
-rw-r--r--libc/arch-x86/bionic/futex_x86.S1
-rw-r--r--libc/arch-x86/bionic/setjmp.S6
-rw-r--r--libc/arch-x86/bionic/sigsetjmp.S2
-rw-r--r--libc/arch-x86/string/bcmp.S1
-rw-r--r--libc/arch-x86/string/bzero.S1
-rw-r--r--libc/arch-x86/string/fss.S1
-rw-r--r--libc/arch-x86/string/memchr.S1
-rw-r--r--libc/arch-x86/string/memcmp.S1
-rw-r--r--libc/arch-x86/string/memset.S1
-rw-r--r--libc/arch-x86/string/strcat.S1
-rw-r--r--libc/arch-x86/string/strcmp.S1
-rw-r--r--libc/arch-x86/string/strcpy.S1
-rw-r--r--libc/arch-x86/string/strlen.S1
-rw-r--r--libc/arch-x86/string/strncmp.S1
-rw-r--r--libc/arch-x86/string/swab.S1
16 files changed, 20 insertions, 3 deletions
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 @@ ENTRY(_setjmp)
movl %edi,20(%eax)
xorl %eax,%eax
ret
+END(_setjmp)
ENTRY(_longjmp)
movl 4(%esp),%edx
@@ -69,3 +70,4 @@ ENTRY(_longjmp)
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 @@ ENTRY(__futex_wait)
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 @@ ENTRY(setjmp)
call _C_LABEL(sigblock)
#endif
addl $4,%esp
- PIC_EPILOGUE
+ PIC_EPILOGUE
movl 4(%esp),%ecx
movl 0(%esp),%edx
@@ -65,6 +65,7 @@ ENTRY(setjmp)
movl %eax,24(%ecx)
xorl %eax,%eax
ret
+END(setjmp)
ENTRY(longjmp)
movl 4(%esp),%edx
@@ -76,7 +77,7 @@ ENTRY(longjmp)
call _C_LABEL(sigsetmask)
#endif
addl $4,%esp
- PIC_EPILOGUE
+ PIC_EPILOGUE
movl 4(%esp),%edx
movl 8(%esp),%eax
@@ -91,3 +92,4 @@ ENTRY(longjmp)
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 @@ ENTRY(sigsetjmp)
movl %edi,20(%ecx)
xorl %eax,%eax
ret
+END(sigsetjmp)
ENTRY(siglongjmp)
movl 4(%esp),%edx
@@ -90,3 +91,4 @@ ENTRY(siglongjmp)
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 @@ L1: incl %eax
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 @@ L1: movl %edx,%ecx /* zero remainder by bytes */
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 @@ ENTRY(ffs)
.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 @@ ENTRY(memchr)
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 @@ L6: movzbl -1(%edi),%eax /* Perform unsigned comparison */
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 @@ L1: rep
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 @@ L1: movb (%edx),%al /* unroll loop, but not too much */
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 @@ L3: movzbl (%eax),%eax /* unsigned comparison */
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 @@ L1: movb (%edx),%al /* unroll loop, but not too much */
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 @@ ENTRY(strlen)
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 @@ L3: movzbl (%eax),%eax /* unsigned comparision */
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 @@ L3: lodsw
L4: popl %edi
popl %esi
ret
+END(swab)