diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am index 62ed158f3..6b6705027 100644 --- a/newlib/libc/machine/arm/Makefile.am +++ b/newlib/libc/machine/arm/Makefile.am @@ -25,7 +25,7 @@ lib_a_CFLAGS = $(AM_CFLAGS) ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host -MEMCHR_DEP=acle-compat.h arm_asm.h +MEMCHR_DEP=acle-compat.h MEMCPY_DEP=memcpy-armv7a.S memcpy-armv7m.S STRCMP_DEP=strcmp-arm-tiny.S strcmp-armv4.S strcmp-armv4t.S strcmp-armv6.S \ strcmp-armv6m.S strcmp-armv7.S strcmp-armv7m.S diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in index 49082088f..a0e4cc2bd 100644 --- a/newlib/libc/machine/arm/Makefile.in +++ b/newlib/libc/machine/arm/Makefile.in @@ -215,7 +215,7 @@ lib_a_CCASFLAGS = $(AM_CCASFLAGS) lib_a_CFLAGS = $(AM_CFLAGS) ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host -MEMCHR_DEP = acle-compat.h arm_asm.h +MEMCHR_DEP = acle-compat.h MEMCPY_DEP = memcpy-armv7a.S memcpy-armv7m.S STRCMP_DEP = strcmp-arm-tiny.S strcmp-armv4.S strcmp-armv4t.S strcmp-armv6.S \ strcmp-armv6m.S strcmp-armv7.S strcmp-armv7m.S diff --git a/newlib/libc/machine/arm/aeabi_memcpy-armv7a.S b/newlib/libc/machine/arm/aeabi_memcpy-armv7a.S index 53e3330ff..95f2dcd00 100644 --- a/newlib/libc/machine/arm/aeabi_memcpy-armv7a.S +++ b/newlib/libc/machine/arm/aeabi_memcpy-armv7a.S @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "arm_asm.h" +#include "acle-compat.h" /* NOTE: This ifdef MUST match the one in aeabi_memcpy.c. */ #if defined (__ARM_ARCH_7A__) && defined (__ARM_FEATURE_UNALIGNED) && \ diff --git a/newlib/libc/machine/arm/aeabi_memmove-soft.S b/newlib/libc/machine/arm/aeabi_memmove-soft.S index 010e266d7..8c071bde0 100644 --- a/newlib/libc/machine/arm/aeabi_memmove-soft.S +++ b/newlib/libc/machine/arm/aeabi_memmove-soft.S @@ -26,8 +26,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "arm_asm.h" - .macro ASM_ALIAS new old .global \new .type \new, %function diff --git a/newlib/libc/machine/arm/aeabi_memset-soft.S b/newlib/libc/machine/arm/aeabi_memset-soft.S index d82fb5606..cacf2f406 100644 --- a/newlib/libc/machine/arm/aeabi_memset-soft.S +++ b/newlib/libc/machine/arm/aeabi_memset-soft.S @@ -26,8 +26,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "arm_asm.h" - .macro ASM_ALIAS new old .global \new .type \new, %function diff --git a/newlib/libc/machine/arm/memchr.S b/newlib/libc/machine/arm/memchr.S index 8103c8aa5..ef2d6d08b 100644 --- a/newlib/libc/machine/arm/memchr.S +++ b/newlib/libc/machine/arm/memchr.S @@ -76,7 +76,6 @@ .syntax unified #include "acle-compat.h" -#include "arm_asm.h" @ NOTE: This ifdef MUST match the one in memchr-stub.c #if __ARM_ARCH_ISA_THUMB >= 2 && defined (__ARM_FEATURE_DSP) diff --git a/newlib/libc/machine/arm/strcmp.S b/newlib/libc/machine/arm/strcmp.S index 3af9b6dbd..137f44969 100644 --- a/newlib/libc/machine/arm/strcmp.S +++ b/newlib/libc/machine/arm/strcmp.S @@ -28,7 +28,6 @@ /* Wrapper for the various implementations of strcmp. */ -#include "arm_asm.h" #include "acle-compat.h" #ifdef __ARM_BIG_ENDIAN diff --git a/newlib/libc/machine/arm/strlen-armv7.S b/newlib/libc/machine/arm/strlen-armv7.S index 9dce6f2f7..f3dda0d60 100644 --- a/newlib/libc/machine/arm/strlen-armv7.S +++ b/newlib/libc/machine/arm/strlen-armv7.S @@ -58,7 +58,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "arm_asm.h" +#include "acle-compat.h" .macro def_fn f p2align=0 .text