From 32bbf8a63bb43a540cc0f1dd5037736d10b70e0b Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Wed, 2 Oct 2013 16:54:58 -0700
Subject: [PATCH] libc: don't export unnecessary symbols

Symbols associated with the internal implementation of memcpy
like routines should be private.

Change-Id: I2b1d1f59006395c29d518c153928437b08f93d16
---
 libc/arch-arm/cortex-a15/bionic/__strcat_chk.S | 2 +-
 libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S | 2 +-
 libc/arch-arm/cortex-a15/bionic/memcpy.S       | 2 +-
 libc/arch-arm/cortex-a15/bionic/memcpy_base.S  | 4 ++--
 libc/arch-arm/cortex-a9/bionic/__strcat_chk.S  | 2 +-
 libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S  | 2 +-
 libc/arch-arm/cortex-a9/bionic/memcpy.S        | 2 +-
 libc/arch-arm/cortex-a9/bionic/memcpy_base.S   | 4 ++--
 libc/arch-arm/cortex-a9/bionic/memset.S        | 2 +-
 libc/arch-arm/krait/bionic/__strcat_chk.S      | 2 +-
 libc/arch-arm/krait/bionic/__strcpy_chk.S      | 2 +-
 libc/arch-arm/krait/bionic/memcpy.S            | 2 +-
 libc/arch-arm/krait/bionic/memcpy_base.S       | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S b/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S
index 4aaa9f1f8..a5b82aa35 100644
--- a/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S
+++ b/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S
@@ -197,7 +197,7 @@ END(__strcat_chk)
 
 #include "memcpy_base.S"
 
-ENTRY(__strcat_chk_failed)
+ENTRY_PRIVATE(__strcat_chk_failed)
     .cfi_startproc
     .save   {r0, lr}
     .save   {r4, r5}
diff --git a/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S b/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S
index 05152e63d..37ad06c6e 100644
--- a/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S
+++ b/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S
@@ -163,7 +163,7 @@ END(__strcpy_chk)
 #define MEMCPY_BASE_ALIGNED __strcpy_chk_memcpy_base_aligned
 #include "memcpy_base.S"
 
-ENTRY(__strcpy_chk_failed)
+ENTRY_PRIVATE(__strcpy_chk_failed)
     .cfi_startproc
     .save   {r0, lr}
     .cfi_def_cfa_offset 8
diff --git a/libc/arch-arm/cortex-a15/bionic/memcpy.S b/libc/arch-arm/cortex-a15/bionic/memcpy.S
index a8432306e..3d23a1c8e 100644
--- a/libc/arch-arm/cortex-a15/bionic/memcpy.S
+++ b/libc/arch-arm/cortex-a15/bionic/memcpy.S
@@ -87,7 +87,7 @@ END(memcpy)
 #define MEMCPY_BASE_ALIGNED __memcpy_base_aligned
 #include "memcpy_base.S"
 
-ENTRY(__memcpy_chk_fail)
+ENTRY_PRIVATE(__memcpy_chk_fail)
         .cfi_startproc
         // Preserve lr for backtrace.
         push    {lr}
diff --git a/libc/arch-arm/cortex-a15/bionic/memcpy_base.S b/libc/arch-arm/cortex-a15/bionic/memcpy_base.S
index 015467607..4de23b391 100644
--- a/libc/arch-arm/cortex-a15/bionic/memcpy_base.S
+++ b/libc/arch-arm/cortex-a15/bionic/memcpy_base.S
@@ -53,7 +53,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-ENTRY(MEMCPY_BASE)
+ENTRY_PRIVATE(MEMCPY_BASE)
         .cfi_startproc
         .save   {r0, lr}
         .cfi_def_cfa_offset 8
@@ -172,7 +172,7 @@ ENTRY(MEMCPY_BASE)
         .cfi_endproc
 END(MEMCPY_BASE)
 
-ENTRY(MEMCPY_BASE_ALIGNED)
+ENTRY_PRIVATE(MEMCPY_BASE_ALIGNED)
         .cfi_startproc
         .save   {r0, lr}
         .cfi_def_cfa_offset 8
diff --git a/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S b/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S
index 78cf19a2e..ffc440e5b 100644
--- a/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S
+++ b/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S
@@ -200,7 +200,7 @@ END(__strcat_chk)
 #define MEMCPY_BASE_ALIGNED __strcat_chk_memcpy_base_aligned
 #include "memcpy_base.S"
 
-ENTRY(__strcat_chk_fail)
+ENTRY_PRIVATE(__strcat_chk_fail)
     .cfi_startproc
 
     .save   {r0, lr}
diff --git a/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S b/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S
index d0acf1e4f..b19766771 100644
--- a/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S
+++ b/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S
@@ -167,7 +167,7 @@ END(__strcpy_chk)
 #define MEMCPY_BASE_ALIGNED __strcpy_chk_memcpy_base_aligned
 #include "memcpy_base.S"
 
-ENTRY(__strcpy_chk_fail)
+ENTRY_PRIVATE(__strcpy_chk_fail)
     .cfi_startproc
 
     .save   {r0, lr}
diff --git a/libc/arch-arm/cortex-a9/bionic/memcpy.S b/libc/arch-arm/cortex-a9/bionic/memcpy.S
index 5c4c42821..64b00d800 100644
--- a/libc/arch-arm/cortex-a9/bionic/memcpy.S
+++ b/libc/arch-arm/cortex-a9/bionic/memcpy.S
@@ -67,7 +67,7 @@ END(memcpy)
 #define MEMCPY_BASE_ALIGNED __memcpy_base_aligned
 #include "memcpy_base.S"
 
-ENTRY(__memcpy_chk_fail)
+ENTRY_PRIVATE(__memcpy_chk_fail)
         .cfi_startproc
         // Preserve lr for backtrace.
         push    {lr}
diff --git a/libc/arch-arm/cortex-a9/bionic/memcpy_base.S b/libc/arch-arm/cortex-a9/bionic/memcpy_base.S
index e8ff4f5b2..55fd3bd56 100644
--- a/libc/arch-arm/cortex-a9/bionic/memcpy_base.S
+++ b/libc/arch-arm/cortex-a9/bionic/memcpy_base.S
@@ -32,7 +32,7 @@
  * cache line.
  */
 
-ENTRY(MEMCPY_BASE)
+ENTRY_PRIVATE(MEMCPY_BASE)
         .cfi_startproc
         .save       {r0, lr}
         .cfi_def_cfa_offset 8
@@ -141,7 +141,7 @@ ENTRY(MEMCPY_BASE)
         .cfi_endproc
 END(MEMCPY_BASE)
 
-ENTRY(MEMCPY_BASE_ALIGNED)
+ENTRY_PRIVATE(MEMCPY_BASE_ALIGNED)
         .cfi_startproc
 
         .save       {r0, lr}
diff --git a/libc/arch-arm/cortex-a9/bionic/memset.S b/libc/arch-arm/cortex-a9/bionic/memset.S
index 87d2c088e..f6be66a03 100644
--- a/libc/arch-arm/cortex-a9/bionic/memset.S
+++ b/libc/arch-arm/cortex-a9/bionic/memset.S
@@ -119,7 +119,7 @@ ENTRY(memset)
         .cfi_endproc
 END(memset)
 
-ENTRY(__memset_large_copy)
+ENTRY_PRIVATE(__memset_large_copy)
         .cfi_startproc
 
         /* compute the offset to align the destination
diff --git a/libc/arch-arm/krait/bionic/__strcat_chk.S b/libc/arch-arm/krait/bionic/__strcat_chk.S
index 956b4615a..bb4bb8675 100644
--- a/libc/arch-arm/krait/bionic/__strcat_chk.S
+++ b/libc/arch-arm/krait/bionic/__strcat_chk.S
@@ -196,7 +196,7 @@ END(__strcat_chk)
 #define MEMCPY_BASE_ALIGNED __strcat_chk_memcpy_base_aligned
 #include "memcpy_base.S"
 
-ENTRY(__strcat_chk_failed)
+ENTRY_PRIVATE(__strcat_chk_failed)
     .cfi_startproc
     .save   {r0, lr}
     .save   {r4, r5}
diff --git a/libc/arch-arm/krait/bionic/__strcpy_chk.S b/libc/arch-arm/krait/bionic/__strcpy_chk.S
index 402cac678..1116cf6d1 100644
--- a/libc/arch-arm/krait/bionic/__strcpy_chk.S
+++ b/libc/arch-arm/krait/bionic/__strcpy_chk.S
@@ -163,7 +163,7 @@ END(__strcpy_chk)
 #define MEMCPY_BASE_ALIGNED __strcpy_chk_memcpy_base_aligned
 #include "memcpy_base.S"
 
-ENTRY(__strcpy_chk_failed)
+ENTRY_PRIVATE(__strcpy_chk_failed)
     .cfi_startproc
     .save   {r0, lr}
     .cfi_def_cfa_offset 8
diff --git a/libc/arch-arm/krait/bionic/memcpy.S b/libc/arch-arm/krait/bionic/memcpy.S
index ea040bcee..f7277fcdb 100644
--- a/libc/arch-arm/krait/bionic/memcpy.S
+++ b/libc/arch-arm/krait/bionic/memcpy.S
@@ -67,7 +67,7 @@ END(memcpy)
 #define MEMCPY_BASE_ALIGNED __memcpy_base_aligned
 #include "memcpy_base.S"
 
-ENTRY(__memcpy_chk_fail)
+ENTRY_PRIVATE(__memcpy_chk_fail)
         .cfi_startproc
         // Preserve lr for backtrace.
         push    {lr}
diff --git a/libc/arch-arm/krait/bionic/memcpy_base.S b/libc/arch-arm/krait/bionic/memcpy_base.S
index d87a5423b..cc1ab60bb 100644
--- a/libc/arch-arm/krait/bionic/memcpy_base.S
+++ b/libc/arch-arm/krait/bionic/memcpy_base.S
@@ -35,7 +35,7 @@
 
 // Assumes neon instructions and a cache line size of 32 bytes.
 
-ENTRY(MEMCPY_BASE)
+ENTRY_PRIVATE(MEMCPY_BASE)
         .cfi_startproc
         .save {r0, lr}
         .cfi_def_cfa_offset 8