Remove optimized code for bzero, which was removed from POSIX in 2008.
I'll come back for the last bcopy remnant...
Bug: http://b/26407170
Change-Id: Iabfeb95fc8a4b4b3992e3cc209ec5221040e7c26
diff --git a/libc/arch-arm/cortex-a15/bionic/memset.S b/libc/arch-arm/cortex-a15/bionic/memset.S
index 732a039..6458f97 100644
--- a/libc/arch-arm/cortex-a15/bionic/memset.S
+++ b/libc/arch-arm/cortex-a15/bionic/memset.S
@@ -40,7 +40,7 @@
ENTRY(__memset_chk)
cmp r2, r3
- bls .L_done
+ bls memset
// Preserve lr for backtrace.
push {lr}
@@ -50,13 +50,6 @@
bl __memset_chk_fail
END(__memset_chk)
-ENTRY(bzero)
- mov r2, r1
- mov r1, #0
-.L_done:
- // Fall through to memset...
-END(bzero)
-
ENTRY(memset)
stmfd sp!, {r0}
.cfi_def_cfa_offset 4
diff --git a/libc/arch-arm/cortex-a7/bionic/memset.S b/libc/arch-arm/cortex-a7/bionic/memset.S
index 0b96d62..357416c 100644
--- a/libc/arch-arm/cortex-a7/bionic/memset.S
+++ b/libc/arch-arm/cortex-a7/bionic/memset.S
@@ -40,7 +40,7 @@
ENTRY(__memset_chk)
cmp r2, r3
- bls .L_done
+ bls memset
// Preserve lr for backtrace.
push {lr}
@@ -50,13 +50,6 @@
bl __memset_chk_fail
END(__memset_chk)
-ENTRY(bzero)
- mov r2, r1
- mov r1, #0
-.L_done:
- // Fall through to memset...
-END(bzero)
-
ENTRY(memset)
mov r3, r0
// At this point only d0, d1 are going to be used below.
diff --git a/libc/arch-arm/cortex-a9/bionic/memset.S b/libc/arch-arm/cortex-a9/bionic/memset.S
index a2c8110..d00231b 100644
--- a/libc/arch-arm/cortex-a9/bionic/memset.S
+++ b/libc/arch-arm/cortex-a9/bionic/memset.S
@@ -38,7 +38,7 @@
ENTRY(__memset_chk)
cmp r2, r3
- bls .L_done
+ bls memset
// Preserve lr for backtrace.
push {lr}
@@ -48,14 +48,6 @@
bl __memset_chk_fail
END(__memset_chk)
-ENTRY(bzero)
- mov r2, r1
- mov r1, #0
-
-.L_done:
- // Fall through to memset...
-END(bzero)
-
/* memset() returns its first argument. */
ENTRY(memset)
// The neon memset only wins for less than 132.
diff --git a/libc/arch-arm/denver/bionic/memset.S b/libc/arch-arm/denver/bionic/memset.S
index 8d79e5b..1b0152a 100644
--- a/libc/arch-arm/denver/bionic/memset.S
+++ b/libc/arch-arm/denver/bionic/memset.S
@@ -42,7 +42,7 @@
ENTRY(__memset_chk)
cmp r2, r3
- bls .L_done
+ bls memset
// Preserve lr for backtrace.
push {lr}
@@ -52,13 +52,6 @@
bl __memset_chk_fail
END(__memset_chk)
-ENTRY(bzero)
- mov r2, r1
- mov r1, #0
-.L_done:
- // Fall through to memset...
-END(bzero)
-
ENTRY(memset)
pldw [r0]
mov r3, r0
diff --git a/libc/arch-arm/generic/bionic/memset.S b/libc/arch-arm/generic/bionic/memset.S
index 6e70397..1fd0de1 100644
--- a/libc/arch-arm/generic/bionic/memset.S
+++ b/libc/arch-arm/generic/bionic/memset.S
@@ -38,19 +38,11 @@
ENTRY(__memset_chk)
cmp r2, r3
- bls done
+ bls memset
bl __memset_chk_fail
END(__memset_chk)
-ENTRY(bzero)
- mov r2, r1
- mov r1, #0
-
-done:
- // Fall through to memset...
-END(bzero)
-
ENTRY(memset)
/* compute the offset to align the destination
* offset = (4-(src&3))&3 = -src & 3
diff --git a/libc/arch-arm/krait/bionic/memset.S b/libc/arch-arm/krait/bionic/memset.S
index 0264dd3..81ba74b 100644
--- a/libc/arch-arm/krait/bionic/memset.S
+++ b/libc/arch-arm/krait/bionic/memset.S
@@ -40,7 +40,7 @@
ENTRY(__memset_chk)
cmp r2, r3
- bls .L_done
+ bls memset
// Preserve lr for backtrace.
push {lr}
@@ -50,14 +50,6 @@
bl __memset_chk_fail
END(__memset_chk)
-ENTRY(bzero)
- mov r2, r1
- mov r1, #0
-
-.L_done:
- // Fall through to memset...
-END(bzero)
-
/* memset() returns its first argument. */
ENTRY(memset)
mov r3, r0