diff options
| author | Jesse Wilson <jessewilson@google.com> | 2011-10-12 07:51:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-12 07:51:53 -0700 |
| commit | b0641d4a446fa98c72fd6252e5a5ca7e44c41f1f (patch) | |
| tree | 6d92c90b54d6ebcf4b201d8e592d1c259c081729 | |
| parent | faa7c1d29f9ed0b3eb252bb0bd43e7596eed5d9c (diff) | |
| parent | 487b613e572160e80d0700e1bcd0e405420d14ea (diff) | |
| download | bionic-b0641d4a446fa98c72fd6252e5a5ca7e44c41f1f.tar.gz | |
Merge "Use ENTRY and EXIT macros for strcmp, memcpy, atexit."
| -rw-r--r-- | libc/arch-arm/bionic/atexit.S | 11 | ||||
| -rw-r--r-- | libc/arch-arm/bionic/memcpy.S | 7 | ||||
| -rw-r--r-- | libc/arch-arm/bionic/strcmp.S | 10 |
3 files changed, 6 insertions, 22 deletions
diff --git a/libc/arch-arm/bionic/atexit.S b/libc/arch-arm/bionic/atexit.S index aa1e18d61..beea6858a 100644 --- a/libc/arch-arm/bionic/atexit.S +++ b/libc/arch-arm/bionic/atexit.S @@ -37,16 +37,10 @@ .eabi_attribute 26, 2 .eabi_attribute 30, 4 .eabi_attribute 18, 4 - .code 16 - .section .text.atexit,"ax",%progbits - .align 2 - .global atexit .hidden atexit .code 16 .thumb_func - .type atexit, %function -atexit: - .fnstart +ENTRY(atexit) .LFB0: .save {r4, lr} push {r4, lr} @@ -64,6 +58,5 @@ atexit: .L3: .word __dso_handle-(.LPIC0+4) .LFE0: - .fnend - .size atexit, .-atexit +END(atexit) #endif diff --git a/libc/arch-arm/bionic/memcpy.S b/libc/arch-arm/bionic/memcpy.S index 04ba84871..438fa001e 100644 --- a/libc/arch-arm/bionic/memcpy.S +++ b/libc/arch-arm/bionic/memcpy.S @@ -34,16 +34,11 @@ .text .fpu neon - .global memcpy - .type memcpy, %function - .align 4 - /* a prefetch distance of 4 cache-lines works best experimentally */ #define CACHE_LINE_SIZE 64 #define PREFETCH_DISTANCE (CACHE_LINE_SIZE*4) -memcpy: - .fnstart +ENTRY(memcpy) .save {r0, lr} stmfd sp!, {r0, lr} diff --git a/libc/arch-arm/bionic/strcmp.S b/libc/arch-arm/bionic/strcmp.S index 9fdbd567e..764a531e2 100644 --- a/libc/arch-arm/bionic/strcmp.S +++ b/libc/arch-arm/bionic/strcmp.S @@ -28,13 +28,10 @@ */ #include <machine/cpu-features.h> +#include <machine/asm.h> .text - .global strcmp - .type strcmp, %function - .align 4 - #ifdef __ARMEB__ #define SHFT2LSB lsl #define SHFT2LSBEQ lsleq @@ -54,8 +51,7 @@ #define magic1(REG) REG #define magic2(REG) REG, lsl #7 -strcmp: - .fnstart +ENTRY(strcmp) PLD(r0, #0) PLD(r1, #0) eor r2, r0, r1 @@ -136,7 +132,6 @@ strcmp: #endif ldr r4, [sp], #4 bx lr - .fnend .Lstrcmp_unaligned: wp1 .req r0 @@ -319,3 +314,4 @@ strcmp: ldr r4, [sp], #4 ldr r5, [sp], #4 bx lr +END(strcmp) |