diff options
| author | Richard Earnshaw <rearnsha@arm.com> | 2013-06-03 14:02:10 +0000 |
|---|---|---|
| committer | Richard Earnshaw <rearnsha@arm.com> | 2013-06-03 14:02:10 +0000 |
| commit | ca1dd3a9b5ac53f50c12ea146cd9aa4485ad9aa4 (patch) | |
| tree | bf1a5113793ddc77194ee2bb8379e8026d82bf45 /newlib/libc/machine/arm/memcpy-stub.c | |
| parent | 86c126b6e32549e11924a254d465a1114b984887 (diff) | |
| download | cygnal-ca1dd3a9b5ac53f50c12ea146cd9aa4485ad9aa4.tar.gz cygnal-ca1dd3a9b5ac53f50c12ea146cd9aa4485ad9aa4.tar.bz2 cygnal-ca1dd3a9b5ac53f50c12ea146cd9aa4485ad9aa4.zip | |
2013-06-03 Joey Ye <joey.ye@arm.com>
* libc/machine/arm/Makefile.am (MEMCPY_DEP): New define.
($(lpfx)memcpy.o, $(lpfx)memcpy.obj): Depend on MEMCPY_DEP.
* libc/machine/arm/Makefile.in: Regenerated.
* newlib/libc/machine/arm/memcpy-stub.c: Exclude armv7-m/armv7e-m.
* newlib/libc/machine/arm/memcpy-armv7m.S: New.
* newlib/libc/machine/arm/memcpy.S: Replace with wrapper code. Old
code moved to ...
* newlib/libc/machine/arm/memcpy-armv7a.S: ... here. Remove
redundant architecture check.
Diffstat (limited to 'newlib/libc/machine/arm/memcpy-stub.c')
| -rw-r--r-- | newlib/libc/machine/arm/memcpy-stub.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/newlib/libc/machine/arm/memcpy-stub.c b/newlib/libc/machine/arm/memcpy-stub.c index 513631a9f..449d31a50 100644 --- a/newlib/libc/machine/arm/memcpy-stub.c +++ b/newlib/libc/machine/arm/memcpy-stub.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 ARM Ltd + * Copyright (c) 2013 ARM Ltd * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,10 +26,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* The sole purpose of this file is to include the plain memcpy provided in newlib. - An optimized version of memcpy is provided in the assembly file memcpy.S in this directory. */ +/* The sole purpose of this file is to include the plain memcpy provided + in newlib. An optimized version of memcpy is provided in the assembly + file memcpy.S in this directory. */ #if (defined (__OPTIMIZE_SIZE__) || defined (PREFER_SIZE_OVER_SPEED) || \ - (!(defined (__ARM_ARCH_7A__) && defined (__ARM_FEATURE_UNALIGNED)))) + (!((defined (__ARM_ARCH_7A__) && defined (__ARM_FEATURE_UNALIGNED)) \ + || defined (__ARM_ARCH_7EM__) || defined (__ARM_ARCH_7M__)))) #include "../../string/memcpy.c" |