From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 2909E3858033; Wed, 10 Nov 2021 00:21:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2909E3858033 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: mips: delete glibc-specific logic X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 365199090c05eb6076d0cfe9104a53177f6fa251 X-Git-Newrev: 328e1b1a3d2df7721483c2d4c4b1f0ca197ce74c Message-Id: <20211110002141.2909E3858033@sourceware.org> Date: Wed, 10 Nov 2021 00:21:41 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2021 00:21:41 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=328e1b1a3d2df7721483c2d4c4b1f0ca197ce74c commit 328e1b1a3d2df7721483c2d4c4b1f0ca197ce74c Author: Mike Frysinger Date: Mon Nov 8 22:18:43 2021 -0500 newlib: mips: delete glibc-specific logic This code looks like it's written to be copied & pasted between diff C libraries and relies on _LIBC only being used with glibc. This will break when newlib changes from _COMPILING_NEWLIB to _LIBC, so delete the glibc-specific logic ahead of time. Diff: --- newlib/libc/machine/mips/memcpy.S | 11 ----------- newlib/libc/machine/mips/memset.S | 10 ---------- newlib/libc/machine/mips/strcmp.S | 9 --------- 3 files changed, 30 deletions(-) diff --git a/newlib/libc/machine/mips/memcpy.S b/newlib/libc/machine/mips/memcpy.S index 21bd3b4f4..cbf06e367 100644 --- a/newlib/libc/machine/mips/memcpy.S +++ b/newlib/libc/machine/mips/memcpy.S @@ -33,12 +33,6 @@ # define USE_MEMMOVE_FOR_OVERLAP # define PREFETCH_LOAD_HINT PREFETCH_HINT_LOAD_STREAMED # define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE -#elif _LIBC -# include -# include -# include -# define PREFETCH_LOAD_HINT PREFETCH_HINT_LOAD_STREAMED -# define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE #elif _COMPILING_NEWLIB # include "machine/asm.h" # include "machine/regdef.h" @@ -877,8 +871,3 @@ L(r6_unaligned7): .set at .set reorder END(MEMCPY_NAME) -#ifndef ANDROID_CHANGES -# ifdef _LIBC -libc_hidden_builtin_def (MEMCPY_NAME) -# endif -#endif diff --git a/newlib/libc/machine/mips/memset.S b/newlib/libc/machine/mips/memset.S index 565fc7e30..3f1c8be0e 100644 --- a/newlib/libc/machine/mips/memset.S +++ b/newlib/libc/machine/mips/memset.S @@ -31,11 +31,6 @@ # include "machine/asm.h" # include "machine/regdef.h" # define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE -#elif _LIBC -# include -# include -# include -# define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE #elif _COMPILING_NEWLIB # include "machine/asm.h" # include "machine/regdef.h" @@ -430,8 +425,3 @@ L(leave): .set at .set reorder END(MEMSET_NAME) -#ifndef ANDROID_CHANGES -# ifdef _LIBC -libc_hidden_builtin_def (MEMSET_NAME) -# endif -#endif diff --git a/newlib/libc/machine/mips/strcmp.S b/newlib/libc/machine/mips/strcmp.S index b1d757ee3..efc416148 100644 --- a/newlib/libc/machine/mips/strcmp.S +++ b/newlib/libc/machine/mips/strcmp.S @@ -30,10 +30,6 @@ #ifdef ANDROID_CHANGES # include "machine/asm.h" # include "machine/regdef.h" -#elif _LIBC -# include -# include -# include #elif _COMPILING_NEWLIB # include "machine/asm.h" # include "machine/regdef.h" @@ -254,8 +250,3 @@ L(bexit89): .set reorder END(STRCMP_NAME) -#ifndef ANDROID_CHANGES -# ifdef _LIBC -libc_hidden_builtin_def (STRCMP_NAME) -# endif -#endif