From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oo1-f44.google.com (mail-oo1-f44.google.com [209.85.161.44]) by sourceware.org (Postfix) with ESMTPS id 370243858298 for ; Fri, 27 Oct 2023 19:00:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 370243858298 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rtems.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 370243858298 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.161.44 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698433255; cv=none; b=P1vfXKvMZ1eFnk0t8lqKwu48ahTS9RbPPYgSs68QSjX4SpN3/EC0pfSi4bbj53DIm1Whj258HeqhION02k3IY7CxtzjZww6JwtDj7y6y7+ku1ANnFPdls7XFqiVo3525jWf8vS/rw/2mCRH7XvlSJIhwJj/cS+XCCwTmKvA5qrk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698433255; c=relaxed/simple; bh=jXR0OiuEGXTmMKbw8I/ZGsjOidiyu1Y1yx/5pyLvsfQ=; h=MIME-Version:From:Date:Message-ID:Subject:To; b=kyljVgyEXwCFD0y2sA5OxYNtgACvYMQJxbumoYErMgss94zDrPte47k/CaUw+h5UkieZbS1PLjg1m5xmcQRhuRJdgJUa3XBbIIFJG1ec5YKQgnqj3agPfWu3mMVj9jLSJOqYBkYe1Z8sCG2ppuarNIndy/mgmPEBhGiHZeBVDpA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oo1-f44.google.com with SMTP id 006d021491bc7-586beb5e6a7so840415eaf.1 for ; Fri, 27 Oct 2023 12:00:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698433250; x=1699038050; h=cc:to:subject:message-id:date:from:reply-to:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZWUkfAk18kR829k9J4IaPklxbdzO7siMG1ku8BudXaQ=; b=dZFsPEGVfWZ8TWlOHAEbZscwd1bPVwiZkzJo/9BqtPcN9KqI8iKai1q9QfpeUVQbaJ gZOQ8Q/k+6khgdD++Km2mXQdb2CuJw56PPcK/LzjtsadDP/y0vs/FkfLncR75zjMQl7I pXMYmi+a1BnrC8V8EF3vBC1HvNEBh0MGOVaEG+wKeQR7lZjpj+OeVgFtvdT/Vjsa4kVN KGBXruicifGI0hhLZ/r2lsZBJffvtX4bOlMggDl8r319NxexmTjMnSBAc1xnjDwXoFVr g0Ys1Cg66+itxJEkDH6hY4a7AMg/NpYx+CFTogZ8/dGtw/8y5nsaA5KBZ3t/Hohj1SZa X8Mg== X-Gm-Message-State: AOJu0YxF78I4uFA3Mj29dVtwEO2seKofWywlyBUl6SfPc6wAwJIzVEGF JmMA0JJE3tx8H8YFcHyuzLWsNdwyZnc= X-Google-Smtp-Source: AGHT+IETmXLKOE8aNXVW5a/ocG8pTIymHXpd00PLchgzz0CxvAiilx8QZCXGPffOBa1fDRUAotb0uQ== X-Received: by 2002:a4a:c893:0:b0:581:eef8:131f with SMTP id t19-20020a4ac893000000b00581eef8131fmr3628986ooq.1.1698433250030; Fri, 27 Oct 2023 12:00:50 -0700 (PDT) Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com. [209.85.210.46]) by smtp.gmail.com with ESMTPSA id t66-20020a4a5445000000b00581dd3eb895sm484101ooa.37.2023.10.27.12.00.49 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Oct 2023 12:00:49 -0700 (PDT) Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-6ce2add34c9so1492724a34.1 for ; Fri, 27 Oct 2023 12:00:49 -0700 (PDT) X-Received: by 2002:a05:6830:2702:b0:6b9:b1b1:135 with SMTP id j2-20020a056830270200b006b9b1b10135mr3714019otu.13.1698433248828; Fri, 27 Oct 2023 12:00:48 -0700 (PDT) MIME-Version: 1.0 References: <20231027181833.28871-1-sebastian.huber@embedded-brains.de> In-Reply-To: <20231027181833.28871-1-sebastian.huber@embedded-brains.de> Reply-To: joel@rtems.org From: Joel Sherrill Date: Fri, 27 Oct 2023 14:00:36 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2] aarch64: Remove duplicated optimized memmove() To: Sebastian Huber Cc: newlib@sourceware.org Content-Type: multipart/alternative; boundary="00000000000078a7410608b74ef3" X-Spam-Status: No, score=-3037.4 required=5.0 tests=BAYES_00,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --00000000000078a7410608b74ef3 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Based on a build and nm, memmove and memcpy are coming from the machine optimized version and memmove.o is empty. The patch looks like it fixes the problem. The autotools stuff will need regeneration after it is pushed. I couldn't do that when I tried. If someone can push it and regenerate, that would be very much appreciated. Thanks. --joel On Fri, Oct 27, 2023 at 1:18=E2=80=AFPM Sebastian Huber < sebastian.huber@embedded-brains.de> wrote: > The optimized aarch64/memcpy.S already provides a memmove() implementatio= n. > --- > > v2: Rename memmove-stub.c in memmove.c to make the build system happy. > > newlib/Makefile.in | 42 ++--- > newlib/libc/machine/aarch64/Makefile.inc | 3 +- > newlib/libc/machine/aarch64/memmove.S | 155 ------------------ > .../aarch64/{memmove-stub.c =3D> memmove.c} | 2 +- > 4 files changed, 13 insertions(+), 189 deletions(-) > delete mode 100644 newlib/libc/machine/aarch64/memmove.S > rename newlib/libc/machine/aarch64/{memmove-stub.c =3D> memmove.c} (98%) > > diff --git a/newlib/Makefile.in b/newlib/Makefile.in > index 4cb3534cc4..4f0b3bf644 100644 > --- a/newlib/Makefile.in > +++ b/newlib/Makefile.in > @@ -594,8 +594,7 @@ check_PROGRAMS =3D > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ libc/machine/aarch64/memcmp.S \ > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ > libc/machine/aarch64/memcpy-stub.c \ > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ libc/machine/aarch64/memcpy.S \ > -@HAVE_LIBC_MACHINE_AARCH64_TRUE@ > libc/machine/aarch64/memmove-stub.c \ > -@HAVE_LIBC_MACHINE_AARCH64_TRUE@ libc/machine/aarch64/memmove.S \ > +@HAVE_LIBC_MACHINE_AARCH64_TRUE@ libc/machine/aarch64/memmove.c \ > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ > libc/machine/aarch64/memrchr-stub.c \ > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ libc/machine/aarch64/memrchr.S \ > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ > libc/machine/aarch64/memset-stub.c \ > @@ -1847,7 +1846,6 @@ am__objects_51 =3D libc/ssp/libc_a-chk_fail.$(OBJEX= T) \ > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ > libc/machine/aarch64/libc_a-memcmp.$(OBJEXT) \ > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ > libc/machine/aarch64/libc_a-memcpy-stub.$(OBJEXT) \ > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ > libc/machine/aarch64/libc_a-memcpy.$(OBJEXT) \ > -@HAVE_LIBC_MACHINE_AARCH64_TRUE@ > libc/machine/aarch64/libc_a-memmove-stub.$(OBJEXT) \ > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ > libc/machine/aarch64/libc_a-memmove.$(OBJEXT) \ > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ > libc/machine/aarch64/libc_a-memrchr-stub.$(OBJEXT) \ > @HAVE_LIBC_MACHINE_AARCH64_TRUE@ > libc/machine/aarch64/libc_a-memrchr.$(OBJEXT) \ > @@ -8022,9 +8020,6 @@ libc/machine/aarch64/libc_a-memcpy-stub.$(OBJEXT): = \ > libc/machine/aarch64/libc_a-memcpy.$(OBJEXT): \ > libc/machine/aarch64/$(am__dirstamp) \ > libc/machine/aarch64/$(DEPDIR)/$(am__dirstamp) > -libc/machine/aarch64/libc_a-memmove-stub.$(OBJEXT): \ > - libc/machine/aarch64/$(am__dirstamp) \ > - libc/machine/aarch64/$(DEPDIR)/$(am__dirstamp) > libc/machine/aarch64/libc_a-memmove.$(OBJEXT): \ > libc/machine/aarch64/$(am__dirstamp) \ > libc/machine/aarch64/$(DEPDIR)/$(am__dirstamp) > @@ -12738,7 +12733,6 @@ distclean-compile: > @AMDEP_TRUE@@am__include@ @am__quote@libc > /machine/aarch64/$(DEPDIR)/libc_a-memcmp.Po@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@libc > /machine/aarch64/$(DEPDIR)/libc_a-memcpy-stub.Po@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@libc > /machine/aarch64/$(DEPDIR)/libc_a-memcpy.Po@am__quote@ > -@AMDEP_TRUE@@am__include@ @am__quote@libc > /machine/aarch64/$(DEPDIR)/libc_a-memmove-stub.Po@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@libc > /machine/aarch64/$(DEPDIR)/libc_a-memmove.Po@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@libc > /machine/aarch64/$(DEPDIR)/libc_a-memrchr-stub.Po@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@libc > /machine/aarch64/$(DEPDIR)/libc_a-memrchr.Po@am__quote@ > @@ -16709,20 +16703,6 @@ libc/machine/aarch64/libc_a-memcpy.obj: > libc/machine/aarch64/memcpy.S > @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=3D$(DEPDIR) $(CCASDEPMODE) > $(depcomp) @AMDEPBACKSLASH@ > @am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CCAS) $(DEFS) > $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) > $(libc_a_CCASFLAGS) $(CCASFLAGS) -c -o > libc/machine/aarch64/libc_a-memcpy.obj `if test -f > 'libc/machine/aarch64/memcpy.S'; then $(CYGPATH_W) > 'libc/machine/aarch64/memcpy.S'; else $(CYGPATH_W) > '$(srcdir)/libc/machine/aarch64/memcpy.S'; fi` > > -libc/machine/aarch64/libc_a-memmove.o: libc/machine/aarch64/memmove.S > -@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) > $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAG= S) > -MT libc/machine/aarch64/libc_a-memmove.o -MD -MP -MF > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Tpo -c -o > libc/machine/aarch64/libc_a-memmove.o `test -f > 'libc/machine/aarch64/memmove.S' || echo > '$(srcdir)/'`libc/machine/aarch64/memmove.S > -@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Tpo > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Po > -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ > $(AM_V_CPPAS)source=3D'libc/machine/aarch64/memmove.S' > object=3D'libc/machine/aarch64/libc_a-memmove.o' libtool=3Dno @AMDEPBACKS= LASH@ > -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=3D$(DEPDIR) $(CCASDEPMODE) > $(depcomp) @AMDEPBACKSLASH@ > -@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CCAS) $(DEFS) > $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) > $(libc_a_CCASFLAGS) $(CCASFLAGS) -c -o > libc/machine/aarch64/libc_a-memmove.o `test -f > 'libc/machine/aarch64/memmove.S' || echo > '$(srcdir)/'`libc/machine/aarch64/memmove.S > - > -libc/machine/aarch64/libc_a-memmove.obj: libc/machine/aarch64/memmove.S > -@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) > $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAG= S) > -MT libc/machine/aarch64/libc_a-memmove.obj -MD -MP -MF > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Tpo -c -o > libc/machine/aarch64/libc_a-memmove.obj `if test -f > 'libc/machine/aarch64/memmove.S'; then $(CYGPATH_W) > 'libc/machine/aarch64/memmove.S'; else $(CYGPATH_W) > '$(srcdir)/libc/machine/aarch64/memmove.S'; fi` > -@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Tpo > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Po > -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ > $(AM_V_CPPAS)source=3D'libc/machine/aarch64/memmove.S' > object=3D'libc/machine/aarch64/libc_a-memmove.obj' libtool=3Dno @AMDEPBAC= KSLASH@ > -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=3D$(DEPDIR) $(CCASDEPMODE) > $(depcomp) @AMDEPBACKSLASH@ > -@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CCAS) $(DEFS) > $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) > $(libc_a_CCASFLAGS) $(CCASFLAGS) -c -o > libc/machine/aarch64/libc_a-memmove.obj `if test -f > 'libc/machine/aarch64/memmove.S'; then $(CYGPATH_W) > 'libc/machine/aarch64/memmove.S'; else $(CYGPATH_W) > '$(srcdir)/libc/machine/aarch64/memmove.S'; fi` > - > libc/machine/aarch64/libc_a-memrchr.o: libc/machine/aarch64/memrchr.S > @am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) > $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CCASFLAGS) $(CCASFLAG= S) > -MT libc/machine/aarch64/libc_a-memrchr.o -MD -MP -MF > libc/machine/aarch64/$(DEPDIR)/libc_a-memrchr.Tpo -c -o > libc/machine/aarch64/libc_a-memrchr.o `test -f > 'libc/machine/aarch64/memrchr.S' || echo > '$(srcdir)/'`libc/machine/aarch64/memrchr.S > @am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) > libc/machine/aarch64/$(DEPDIR)/libc_a-memrchr.Tpo > libc/machine/aarch64/$(DEPDIR)/libc_a-memrchr.Po > @@ -32993,19 +32973,19 @@ libc/machine/aarch64/libc_a-memcpy-stub.obj: > libc/machine/aarch64/memcpy-stub.c > @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=3D$(DEPDIR) $(CCDEPMODE) > $(depcomp) @AMDEPBACKSLASH@ > @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) > $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) > $(libc_a_CFLAGS) $(CFLAGS) -c -o > libc/machine/aarch64/libc_a-memcpy-stub.obj `if test -f > 'libc/machine/aarch64/memcpy-stub.c'; then $(CYGPATH_W) > 'libc/machine/aarch64/memcpy-stub.c'; else $(CYGPATH_W) > '$(srcdir)/libc/machine/aarch64/memcpy-stub.c'; fi` > > -libc/machine/aarch64/libc_a-memmove-stub.o: > libc/machine/aarch64/memmove-stub.c > -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) > $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT > libc/machine/aarch64/libc_a-memmove-stub.o -MD -MP -MF > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove-stub.Tpo -c -o > libc/machine/aarch64/libc_a-memmove-stub.o `test -f > 'libc/machine/aarch64/memmove-stub.c' || echo > '$(srcdir)/'`libc/machine/aarch64/memmove-stub.c > -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove-stub.Tpo > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove-stub.Po > -@AMDEP_TRUE@@am__fastdepCC_FALSE@ > $(AM_V_CC)source=3D'libc/machine/aarch64/memmove-stub.c' > object=3D'libc/machine/aarch64/libc_a-memmove-stub.o' libtool=3Dno > @AMDEPBACKSLASH@ > +libc/machine/aarch64/libc_a-memmove.o: libc/machine/aarch64/memmove.c > +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) > $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT > libc/machine/aarch64/libc_a-memmove.o -MD -MP -MF > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Tpo -c -o > libc/machine/aarch64/libc_a-memmove.o `test -f > 'libc/machine/aarch64/memmove.c' || echo > '$(srcdir)/'`libc/machine/aarch64/memmove.c > +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Tpo > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Po > +@AMDEP_TRUE@@am__fastdepCC_FALSE@ > $(AM_V_CC)source=3D'libc/machine/aarch64/memmove.c' > object=3D'libc/machine/aarch64/libc_a-memmove.o' libtool=3Dno @AMDEPBACKS= LASH@ > @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=3D$(DEPDIR) $(CCDEPMODE) > $(depcomp) @AMDEPBACKSLASH@ > -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) > $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) > $(libc_a_CFLAGS) $(CFLAGS) -c -o libc/machine/aarch64/libc_a-memmove-stub= .o > `test -f 'libc/machine/aarch64/memmove-stub.c' || echo > '$(srcdir)/'`libc/machine/aarch64/memmove-stub.c > +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) > $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) > $(libc_a_CFLAGS) $(CFLAGS) -c -o libc/machine/aarch64/libc_a-memmove.o > `test -f 'libc/machine/aarch64/memmove.c' || echo > '$(srcdir)/'`libc/machine/aarch64/memmove.c > > -libc/machine/aarch64/libc_a-memmove-stub.obj: > libc/machine/aarch64/memmove-stub.c > -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) > $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT > libc/machine/aarch64/libc_a-memmove-stub.obj -MD -MP -MF > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove-stub.Tpo -c -o > libc/machine/aarch64/libc_a-memmove-stub.obj `if test -f > 'libc/machine/aarch64/memmove-stub.c'; then $(CYGPATH_W) > 'libc/machine/aarch64/memmove-stub.c'; else $(CYGPATH_W) > '$(srcdir)/libc/machine/aarch64/memmove-stub.c'; fi` > -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove-stub.Tpo > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove-stub.Po > -@AMDEP_TRUE@@am__fastdepCC_FALSE@ > $(AM_V_CC)source=3D'libc/machine/aarch64/memmove-stub.c' > object=3D'libc/machine/aarch64/libc_a-memmove-stub.obj' libtool=3Dno > @AMDEPBACKSLASH@ > +libc/machine/aarch64/libc_a-memmove.obj: libc/machine/aarch64/memmove.c > +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) > $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT > libc/machine/aarch64/libc_a-memmove.obj -MD -MP -MF > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Tpo -c -o > libc/machine/aarch64/libc_a-memmove.obj `if test -f > 'libc/machine/aarch64/memmove.c'; then $(CYGPATH_W) > 'libc/machine/aarch64/memmove.c'; else $(CYGPATH_W) > '$(srcdir)/libc/machine/aarch64/memmove.c'; fi` > +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Tpo > libc/machine/aarch64/$(DEPDIR)/libc_a-memmove.Po > +@AMDEP_TRUE@@am__fastdepCC_FALSE@ > $(AM_V_CC)source=3D'libc/machine/aarch64/memmove.c' > object=3D'libc/machine/aarch64/libc_a-memmove.obj' libtool=3Dno @AMDEPBAC= KSLASH@ > @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=3D$(DEPDIR) $(CCDEPMODE) > $(depcomp) @AMDEPBACKSLASH@ > -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) > $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) > $(libc_a_CFLAGS) $(CFLAGS) -c -o > libc/machine/aarch64/libc_a-memmove-stub.obj `if test -f > 'libc/machine/aarch64/memmove-stub.c'; then $(CYGPATH_W) > 'libc/machine/aarch64/memmove-stub.c'; else $(CYGPATH_W) > '$(srcdir)/libc/machine/aarch64/memmove-stub.c'; fi` > +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) > $(DEFAULT_INCLUDES) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) > $(libc_a_CFLAGS) $(CFLAGS) -c -o libc/machine/aarch64/libc_a-memmove.obj > `if test -f 'libc/machine/aarch64/memmove.c'; then $(CYGPATH_W) > 'libc/machine/aarch64/memmove.c'; else $(CYGPATH_W) > '$(srcdir)/libc/machine/aarch64/memmove.c'; fi` > > libc/machine/aarch64/libc_a-memrchr-stub.o: > libc/machine/aarch64/memrchr-stub.c > @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) > $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT > libc/machine/aarch64/libc_a-memrchr-stub.o -MD -MP -MF > libc/machine/aarch64/$(DEPDIR)/libc_a-memrchr-stub.Tpo -c -o > libc/machine/aarch64/libc_a-memrchr-stub.o `test -f > 'libc/machine/aarch64/memrchr-stub.c' || echo > '$(srcdir)/'`libc/machine/aarch64/memrchr-stub.c > diff --git a/newlib/libc/machine/aarch64/Makefile.inc > b/newlib/libc/machine/aarch64/Makefile.inc > index c749b0d575..1068d88ce8 100644 > --- a/newlib/libc/machine/aarch64/Makefile.inc > +++ b/newlib/libc/machine/aarch64/Makefile.inc > @@ -5,8 +5,7 @@ libc_a_SOURCES +=3D \ > %D%/memcmp.S \ > %D%/memcpy-stub.c \ > %D%/memcpy.S \ > - %D%/memmove-stub.c \ > - %D%/memmove.S \ > + %D%/memmove.c \ > %D%/memrchr-stub.c \ > %D%/memrchr.S \ > %D%/memset-stub.c \ > diff --git a/newlib/libc/machine/aarch64/memmove.S > b/newlib/libc/machine/aarch64/memmove.S > deleted file mode 100644 > index 597a8c8e9e..0000000000 > --- a/newlib/libc/machine/aarch64/memmove.S > +++ /dev/null > @@ -1,155 +0,0 @@ > -/* Copyright (c) 2013, Linaro Limited > - All rights reserved. > - > - Redistribution and use in source and binary forms, with or without > - modification, are permitted provided that the following conditions are > met: > - * Redistributions of source code must retain the above copyright > - notice, this list of conditions and the following disclaimer. > - * Redistributions in binary form must reproduce the above copyrig= ht > - notice, this list of conditions and the following disclaimer in > the > - documentation and/or other materials provided with the > distribution. > - * Neither the name of the Linaro nor the > - names of its contributors may be used to endorse or promote > products > - derived from this software without specific prior written > permission. > - > - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > - HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. = */ > - > -/* > - * Copyright (c) 2015 ARM Ltd > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 2. Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distributio= n. > - * 3. The name of the company may not be used to endorse or promote > - * products derived from this software without specific prior written > - * permission. > - * > - * THIS SOFTWARE IS PROVIDED BY ARM LTD ``AS IS'' AND ANY EXPRESS OR > IMPLIED > - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF > - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. > - * IN NO EVENT SHALL ARM LTD BE LIABLE FOR ANY DIRECT, INDIRECT, > INCIDENTAL, > - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > LIMITED > - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > - */ > - > -/* Assumptions: > - * > - * ARMv8-a, AArch64, unaligned accesses > - */ > - > -#if (defined (__OPTIMIZE_SIZE__) || defined (PREFER_SIZE_OVER_SPEED)) > -/* See memmove-stub.c */ > -#else > - > - .macro def_fn f p2align=3D0 > - .text > - .p2align \p2align > - .global \f > - .type \f, %function > -\f: > - .endm > - > -/* Parameters and result. */ > -#define dstin x0 > -#define src x1 > -#define count x2 > -#define srcend x3 > -#define dstend x4 > -#define tmp1 x5 > -#define A_l x6 > -#define A_h x7 > -#define B_l x8 > -#define B_h x9 > -#define C_l x10 > -#define C_h x11 > -#define D_l x12 > -#define D_h x13 > -#define E_l count > -#define E_h tmp1 > - > -/* All memmoves up to 96 bytes are done by memcpy as it supports overlap= s. > - Larger backwards copies are also handled by memcpy. The only remaining > - case is forward large copies. The destination is aligned, and an > - unrolled loop processes 64 bytes per iteration. > -*/ > - > -def_fn memmove, 6 > - sub tmp1, dstin, src > - cmp count, 96 > - ccmp tmp1, count, 2, hi > - b.hs memcpy > - > - cbz tmp1, 3f > - add dstend, dstin, count > - add srcend, src, count > - > - /* Align dstend to 16 byte alignment so that we don't cross cache > line > - boundaries on both loads and stores. There are at least 96 > bytes > - to copy, so copy 16 bytes unaligned and then align. The loop > - copies 64 bytes per iteration and prefetches one iteration > ahead. */ > - > - and tmp1, dstend, 15 > - ldp D_l, D_h, [srcend, -16] > - sub srcend, srcend, tmp1 > - sub count, count, tmp1 > - ldp A_l, A_h, [srcend, -16] > - stp D_l, D_h, [dstend, -16] > - ldp B_l, B_h, [srcend, -32] > - ldp C_l, C_h, [srcend, -48] > - ldp D_l, D_h, [srcend, -64]! > - sub dstend, dstend, tmp1 > - subs count, count, 128 > - b.ls 2f > - nop > -1: > - stp A_l, A_h, [dstend, -16] > - ldp A_l, A_h, [srcend, -16] > - stp B_l, B_h, [dstend, -32] > - ldp B_l, B_h, [srcend, -32] > - stp C_l, C_h, [dstend, -48] > - ldp C_l, C_h, [srcend, -48] > - stp D_l, D_h, [dstend, -64]! > - ldp D_l, D_h, [srcend, -64]! > - subs count, count, 64 > - b.hi 1b > - > - /* Write the last full set of 64 bytes. The remainder is at most > 64 > - bytes, so it is safe to always copy 64 bytes from the start > even if > - there is just 1 byte left. */ > -2: > - ldp E_l, E_h, [src, 48] > - stp A_l, A_h, [dstend, -16] > - ldp A_l, A_h, [src, 32] > - stp B_l, B_h, [dstend, -32] > - ldp B_l, B_h, [src, 16] > - stp C_l, C_h, [dstend, -48] > - ldp C_l, C_h, [src] > - stp D_l, D_h, [dstend, -64] > - stp E_l, E_h, [dstin, 48] > - stp A_l, A_h, [dstin, 32] > - stp B_l, B_h, [dstin, 16] > - stp C_l, C_h, [dstin] > -3: ret > - > - .size memmove, . - memmove > -#endif > diff --git a/newlib/libc/machine/aarch64/memmove-stub.c > b/newlib/libc/machine/aarch64/memmove.c > similarity index 98% > rename from newlib/libc/machine/aarch64/memmove-stub.c > rename to newlib/libc/machine/aarch64/memmove.c > index 8fa4ab9387..bc8255fb8b 100644 > --- a/newlib/libc/machine/aarch64/memmove-stub.c > +++ b/newlib/libc/machine/aarch64/memmove.c > @@ -27,5 +27,5 @@ > #if (defined (__OPTIMIZE_SIZE__) || defined (PREFER_SIZE_OVER_SPEED)) > # include "../../string/memmove.c" > #else > -/* See memmove.S */ > +/* See memcpy.S */ > #endif > -- > 2.35.3 > > --00000000000078a7410608b74ef3--