public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Michael Frysinger <vapier@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] newlib: mips: delete glibc-specific logic
Date: Wed, 10 Nov 2021 00:21:41 +0000 (GMT)	[thread overview]
Message-ID: <20211110002141.2909E3858033@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=328e1b1a3d2df7721483c2d4c4b1f0ca197ce74c

commit 328e1b1a3d2df7721483c2d4c4b1f0ca197ce74c
Author: Mike Frysinger <vapier@gentoo.org>
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 <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 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 <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 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 <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


                 reply	other threads:[~2021-11-10  0:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211110002141.2909E3858033@sourceware.org \
    --to=vapier@sourceware.org \
    --cc=newlib-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).