From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 21E8A3858C60 for ; Tue, 9 Nov 2021 03:21:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 21E8A3858C60 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id AE50F342CB4; Tue, 9 Nov 2021 03:21:27 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] newlib: mips: delete glibc-specific logic Date: Mon, 8 Nov 2021 22:21:26 -0500 Message-Id: <20211109032126.3250-1-vapier@gentoo.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2021 03:21:31 -0000 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 -# 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 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 -# 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 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 -# 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 -- 2.33.0