[PATCH] newlib: mips: delete glibc-specific logic
Mike Frysinger <[email protected]>
| Newsgroups | gmane.comp.lib.newlib |
|---|---|
| Message-ID | <[email protected]> |
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. --- 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 21bd3b4f439b..cbf06e367a28 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 <sysdep.h> -# include <regdef.h> -# include <sys/asm.h> -# 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 565fc7e308e5..3f1c8be0ead1 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 <sysdep.h> -# include <regdef.h> -# include <sys/asm.h> -# 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 b1d757ee3ee0..efc41614899d 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 <sysdep.h> -# include <regdef.h> -# include <sys/asm.h> #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 -- 2.33.0