From patchwork Tue Jun 6 19:10:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 9769799 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 928316035D for ; Tue, 6 Jun 2017 19:19:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80A74251F4 for ; Tue, 6 Jun 2017 19:19:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75447284DB; Tue, 6 Jun 2017 19:19:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACC47284DA for ; Tue, 6 Jun 2017 19:19:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751514AbdFFTTS (ORCPT ); Tue, 6 Jun 2017 15:19:18 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36322 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751866AbdFFTKi (ORCPT ); Tue, 6 Jun 2017 15:10:38 -0400 Received: by mail-pf0-f193.google.com with SMTP id y7so6591057pfd.3 for ; Tue, 06 Jun 2017 12:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20150623.gappssmtp.com; s=20150623; h=from:to:to:to:to:to:to:to:to:to:to:to:to:to:cc:cc:subject:date :message-id:in-reply-to:references; bh=TZlcJV//R+QG2+yMxLUPC8TdYkAcqJMkbdBNoVFBfZ4=; b=I85vhzvwHgdJxxDdLh+FYYNccWBeK4tIITItgZq2S8tNrGzwLj+qg8K0foD7XEnVr1 vvqLD9xUesZHXdM+5sCXmvFhLIKg05C9o1ee7SMy/B9aPpoLs8GTB6V7fzjhRxh4HWN7 DKd0LAoa37eUK80rqt/9OmVy1egMNVNRZuMw/57o1uiRuG0DZwNFnfu0SxbZU34esxCF vxkM+zHPULD5ojWKPlZKX8ccsSm/xRM6jesB1glPDYKHwrO+wqfJFtoW94pnSJ+3blfO wL/wlRfjIjoB+LNqvxGNgNZuqiSvM3krGy3pDhocpfvwkTAp5lNYlvrsblkOqit4XS3Q Sq+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:to:to:to:to:to:to:to:to:to:to:to:to:cc :cc:subject:date:message-id:in-reply-to:references; bh=TZlcJV//R+QG2+yMxLUPC8TdYkAcqJMkbdBNoVFBfZ4=; b=MVq7YJdyt5McxJ2LPS6vmiNWRwcbvxJG9lxdDGTq+2ASocn8yB+PIjSJku5cA+Vabq Qt+M8Tc6oZjYqUNuRMTasBbG6I8LCd32QUtbrlzSV25F73B3Vi7fUZocRvIjNTZE6WHF 2qpt+J6g2HyARKyNmfLOSEsvQ3kxe2qN0olEUjfl1fkR8SZcFiazpxtggXVC5gnp3dT0 9L++nGjnIApi8gSJ4x5chc6HlHc7Oa8+CGs+2JwYDHy3IdXoIkL2adht/14rQYNh/GMN 9ud1L7DrRN5ASPR+EMNizErXA4dlzkJhKZ4U8L64jJ+e/Q9AKgM9qGYKLNciOVgGfo6m UmVA== X-Gm-Message-State: AODbwcCWkhDpw+ZQ/tlk1KmDzNGiJWWNBNHSQQv/clBLufHB8RhZjuCH 84zarhErO+2ykMJN X-Received: by 10.84.224.76 with SMTP id a12mr22859902plt.25.1496776237787; Tue, 06 Jun 2017 12:10:37 -0700 (PDT) Received: from localhost ([216.38.154.21]) by smtp.gmail.com with ESMTPSA id t2sm14488085pfi.76.2017.06.06.12.10.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 12:10:37 -0700 (PDT) From: Palmer Dabbelt To: monstr@monstr.eu To: ralf@linux-mips.org To: liqin.linux@gmail.com To: lennox.wu@gmail.com To: ysato@users.sourceforge.jp To: dalias@libc.org To: davem@davemloft.net To: linux-mips@linux-mips.org To: linux-sh@vger.kernel.org To: sparclinux@vger.kernel.org To: geert@linux-m68k.org To: linux-kernel@vger.kernel.org To: linux-arch@vger.kernel.org Cc: Palmer Dabbelt Cc: Matt Redfearn Subject: [PATCH 7/7] MIPS: Use generic libgcc intrinsics Date: Tue, 6 Jun 2017 12:10:23 -0700 Message-Id: <20170606191023.24581-8-palmer@dabbelt.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170606191023.24581-1-palmer@dabbelt.com> References: <20170523220546.16758-1-palmer@dabbelt.com> <20170606191023.24581-1-palmer@dabbelt.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These routines in arch/mips/lib/ are functionally identical to those recently added to lib/ so remove them and select the generic ones. Signed-off-by: Matt Redfearn Signed-off-by: Palmer Dabbelt Acked-by: Ralf Baechle --- arch/mips/Kconfig | 5 +++++ arch/mips/boot/compressed/Makefile | 4 +++- arch/mips/lib/Makefile | 2 +- arch/mips/lib/ashldi3.c | 29 ----------------------------- arch/mips/lib/ashrdi3.c | 31 ------------------------------- arch/mips/lib/cmpdi2.c | 27 --------------------------- arch/mips/lib/libgcc.h | 25 ------------------------- arch/mips/lib/lshrdi3.c | 29 ----------------------------- arch/mips/lib/ucmpdi2.c | 21 --------------------- 9 files changed, 9 insertions(+), 164 deletions(-) delete mode 100644 arch/mips/lib/ashldi3.c delete mode 100644 arch/mips/lib/ashrdi3.c delete mode 100644 arch/mips/lib/cmpdi2.c delete mode 100644 arch/mips/lib/libgcc.h delete mode 100644 arch/mips/lib/lshrdi3.c delete mode 100644 arch/mips/lib/ucmpdi2.c diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 2828ecde133d..25713699ef1d 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -70,6 +70,11 @@ config MIPS select HAVE_EXIT_THREAD select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_COPY_THREAD_TLS + select GENERIC_ASHLDI3 + select GENERIC_ASHRDI3 + select GENERIC_CMPDI2 + select GENERIC_LSHRDI3 + select GENERIC_UCMPDI2 menu "Machine selection" diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile index c675eece389a..83cc738fb7af 100644 --- a/arch/mips/boot/compressed/Makefile +++ b/arch/mips/boot/compressed/Makefile @@ -48,7 +48,9 @@ vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o $(obj)/bswapsi.o extra-y += ashldi3.c bswapsi.c $(obj)/ashldi3.o $(obj)/bswapsi.o: KBUILD_CFLAGS += -I$(srctree)/arch/mips/lib -$(obj)/ashldi3.c $(obj)/bswapsi.c: $(obj)/%.c: $(srctree)/arch/mips/lib/%.c +$(obj)/ashldi3.c $(obj)/%.c: $(srctree)/lib/%.c + $(call cmd,shipped) +$(obj)/bswapsi.c: $(obj)/%.c: $(srctree)/arch/mips/lib/%.c $(call cmd,shipped) targets := $(notdir $(vmlinuzobjs-y)) diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 0344e575f522..814e739d6f86 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -15,4 +15,4 @@ obj-$(CONFIG_CPU_R3000) += r3k_dump_tlb.o obj-$(CONFIG_CPU_TX39XX) += r3k_dump_tlb.o # libgcc-style stuff needed in the kernel -obj-y += ashldi3.o ashrdi3.o bswapsi.o bswapdi.o cmpdi2.o lshrdi3.o ucmpdi2.o +obj-y += bswapsi.o bswapdi.o diff --git a/arch/mips/lib/ashldi3.c b/arch/mips/lib/ashldi3.c deleted file mode 100644 index c3e22053d13e..000000000000 --- a/arch/mips/lib/ashldi3.c +++ /dev/null @@ -1,29 +0,0 @@ -#include - -#include "libgcc.h" - -long long notrace __ashldi3(long long u, word_type b) -{ - DWunion uu, w; - word_type bm; - - if (b == 0) - return u; - - uu.ll = u; - bm = 32 - b; - - if (bm <= 0) { - w.s.low = 0; - w.s.high = (unsigned int) uu.s.low << -bm; - } else { - const unsigned int carries = (unsigned int) uu.s.low >> bm; - - w.s.low = (unsigned int) uu.s.low << b; - w.s.high = ((unsigned int) uu.s.high << b) | carries; - } - - return w.ll; -} - -EXPORT_SYMBOL(__ashldi3); diff --git a/arch/mips/lib/ashrdi3.c b/arch/mips/lib/ashrdi3.c deleted file mode 100644 index 17456024873d..000000000000 --- a/arch/mips/lib/ashrdi3.c +++ /dev/null @@ -1,31 +0,0 @@ -#include - -#include "libgcc.h" - -long long notrace __ashrdi3(long long u, word_type b) -{ - DWunion uu, w; - word_type bm; - - if (b == 0) - return u; - - uu.ll = u; - bm = 32 - b; - - if (bm <= 0) { - /* w.s.high = 1..1 or 0..0 */ - w.s.high = - uu.s.high >> 31; - w.s.low = uu.s.high >> -bm; - } else { - const unsigned int carries = (unsigned int) uu.s.high << bm; - - w.s.high = uu.s.high >> b; - w.s.low = ((unsigned int) uu.s.low >> b) | carries; - } - - return w.ll; -} - -EXPORT_SYMBOL(__ashrdi3); diff --git a/arch/mips/lib/cmpdi2.c b/arch/mips/lib/cmpdi2.c deleted file mode 100644 index 9d849d8743c9..000000000000 --- a/arch/mips/lib/cmpdi2.c +++ /dev/null @@ -1,27 +0,0 @@ -#include - -#include "libgcc.h" - -word_type notrace __cmpdi2(long long a, long long b) -{ - const DWunion au = { - .ll = a - }; - const DWunion bu = { - .ll = b - }; - - if (au.s.high < bu.s.high) - return 0; - else if (au.s.high > bu.s.high) - return 2; - - if ((unsigned int) au.s.low < (unsigned int) bu.s.low) - return 0; - else if ((unsigned int) au.s.low > (unsigned int) bu.s.low) - return 2; - - return 1; -} - -EXPORT_SYMBOL(__cmpdi2); diff --git a/arch/mips/lib/libgcc.h b/arch/mips/lib/libgcc.h deleted file mode 100644 index 05909d58e2fe..000000000000 --- a/arch/mips/lib/libgcc.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef __ASM_LIBGCC_H -#define __ASM_LIBGCC_H - -#include - -typedef int word_type __attribute__ ((mode (__word__))); - -#ifdef __BIG_ENDIAN -struct DWstruct { - int high, low; -}; -#elif defined(__LITTLE_ENDIAN) -struct DWstruct { - int low, high; -}; -#else -#error I feel sick. -#endif - -typedef union { - struct DWstruct s; - long long ll; -} DWunion; - -#endif /* __ASM_LIBGCC_H */ diff --git a/arch/mips/lib/lshrdi3.c b/arch/mips/lib/lshrdi3.c deleted file mode 100644 index 221167c1be55..000000000000 --- a/arch/mips/lib/lshrdi3.c +++ /dev/null @@ -1,29 +0,0 @@ -#include - -#include "libgcc.h" - -long long notrace __lshrdi3(long long u, word_type b) -{ - DWunion uu, w; - word_type bm; - - if (b == 0) - return u; - - uu.ll = u; - bm = 32 - b; - - if (bm <= 0) { - w.s.high = 0; - w.s.low = (unsigned int) uu.s.high >> -bm; - } else { - const unsigned int carries = (unsigned int) uu.s.high << bm; - - w.s.high = (unsigned int) uu.s.high >> b; - w.s.low = ((unsigned int) uu.s.low >> b) | carries; - } - - return w.ll; -} - -EXPORT_SYMBOL(__lshrdi3); diff --git a/arch/mips/lib/ucmpdi2.c b/arch/mips/lib/ucmpdi2.c deleted file mode 100644 index 08067fa538f2..000000000000 --- a/arch/mips/lib/ucmpdi2.c +++ /dev/null @@ -1,21 +0,0 @@ -#include - -#include "libgcc.h" - -word_type notrace __ucmpdi2(unsigned long long a, unsigned long long b) -{ - const DWunion au = {.ll = a}; - const DWunion bu = {.ll = b}; - - if ((unsigned int) au.s.high < (unsigned int) bu.s.high) - return 0; - else if ((unsigned int) au.s.high > (unsigned int) bu.s.high) - return 2; - if ((unsigned int) au.s.low < (unsigned int) bu.s.low) - return 0; - else if ((unsigned int) au.s.low > (unsigned int) bu.s.low) - return 2; - return 1; -} - -EXPORT_SYMBOL(__ucmpdi2);