[ARM] Rename strlen to strlen-stub.c

In order to maintain consistency both within machine/arm and between
machine/arm and machine/aarch64, rename the 'c' stub to -stub.c.

Tested by building newlib and comparing libc.a binaries before and
after for all permutations of:

      Architectures:
        armv4 armv4t armv5 armv5t armv5te armv6 armv6j armv6k
        armv6z armv6kz armv6t2 armv6-m armv6s-m armv7 armv7-a
        armv7ve armv7-r armv7-m armv7e-m armv8-a iwmmxt iwmmxt2

      ISAs:
        thumb arm

      Optimization Levels:
       Os O2

      Excluding:
        armv6s-m -mthumb
        armv6-m -mthumb

        armv6zk -mthumb
        armv6z -mthumb
        armv6k -mthumb
        armv6j -mthumb

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index fcc915457b28f8b09e142dcf5a30af870f867199..7c2f38aa3558e1a32892d0bf93bfe58ebc808213 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-13  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+
+       * libc/machine/arm/Makefile.am: Rename strlen.c to strlen-stub.c
+       * libc/machine/arm/Makefile.in: Regenerate.
+       * libc/machine/arm/strlen.c: Rename to...
+       * libc/machine/arm/strlen-stub.c: ... this.
+
 2015-11-13  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
        * libc/machine/arm/Makefile.am: Drop STRLEN_SRC and STRLEN_OBJ.

diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
index d920e6ee6fec80560d89490126e2a26210ad98c6..212a3dc640651c097fd9c66c7da5d18c182f9843 100644 (file)
--- a/newlib/libc/machine/arm/Makefile.am
+++ b/newlib/libc/machine/arm/Makefile.am
@@ -16,7 +16,7 @@ lib_a_SOURCES += memchr-stub.c
 lib_a_SOURCES += memchr.S
 lib_a_SOURCES += memcpy-stub.c
 lib_a_SOURCES += memcpy.S
-lib_a_SOURCES += strlen.c
+lib_a_SOURCES += strlen-stub.c
 
 lib_a_CCASFLAGS=$(AM_CCASFLAGS)
 lib_a_CFLAGS = $(AM_CFLAGS)

diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in
index 87a3591ae6ed7cbeb6722f77ee6778fcd382b1ab..b43c422a355c073e721026c735a5cd09bed75834 100644 (file)
--- a/newlib/libc/machine/arm/Makefile.in
+++ b/newlib/libc/machine/arm/Makefile.in
@@ -78,7 +78,7 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-access.$(OBJEXT) \
        lib_a-aeabi_memset.$(OBJEXT) lib_a-aeabi_memset-soft.$(OBJEXT) \
        lib_a-aeabi_memclr.$(OBJEXT) lib_a-memchr-stub.$(OBJEXT) \
        lib_a-memchr.$(OBJEXT) lib_a-memcpy-stub.$(OBJEXT) \
-       lib_a-memcpy.$(OBJEXT) lib_a-strlen.$(OBJEXT)
+       lib_a-memcpy.$(OBJEXT) lib_a-strlen-stub.$(OBJEXT)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp =
@@ -209,7 +209,7 @@ lib_a_SOURCES = setjmp.S access.c strcmp.S strcpy.c strlen-armv7.S \
        aeabi_memcpy.c aeabi_memcpy-armv7a.S aeabi_memmove.c \
        aeabi_memmove-soft.S aeabi_memset.c aeabi_memset-soft.S \
        aeabi_memclr.c memchr-stub.c memchr.S memcpy-stub.c memcpy.S \
-       strlen.c
+       strlen-stub.c
 lib_a_CCASFLAGS = $(AM_CCASFLAGS)
 lib_a_CFLAGS = $(AM_CFLAGS)
 ACLOCAL_AMFLAGS = -I ../../.. -I ../../../..

diff --git a/newlib/libc/machine/arm/strlen.c b/newlib/libc/machine/arm/strlen-stub.c
similarity index 100%
rename from newlib/libc/machine/arm/strlen.c
rename to newlib/libc/machine/arm/strlen-stub.c