From: Palmer Dabbelt <palmer@dabbelt.com>
To: monstr@monstr.eu, ralf@linux-mips.org, liqin.linux@gmail.com,
lennox.wu@gmail.com, ysato@users.sourceforge.jp, dalias@libc.org,
davem@davemloft.net, linux-mips@linux-mips.org,
linux-sh@vger.kernel.org, sparclinux@vger.kernel.org,
geert@linux-m68k.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org
Cc: Palmer Dabbelt <palmer@dabbelt.com>,
Matt Redfearn <matt.redfearn@imgtec.com>
Subject: [PATCH 7/7] MIPS: Use generic libgcc intrinsics
Date: Tue, 6 Jun 2017 12:10:23 -0700 [thread overview]
Message-ID: <20170606191023.24581-8-palmer@dabbelt.com> (raw)
In-Reply-To: <20170606191023.24581-1-palmer@dabbelt.com>
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 <matt.redfearn@imgtec.com>
Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>
---
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 <linux/export.h>
-
-#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 <linux/export.h>
-
-#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 <linux/export.h>
-
-#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 <asm/byteorder.h>
-
-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 <linux/export.h>
-
-#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 <linux/export.h>
-
-#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);
--
2.13.0
next prev parent reply other threads:[~2017-06-06 19:10 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 22:05 Unify the various copies of libgcc into lib Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 1/7] lib: Add shared copies of some GCC library routines Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-24 8:52 ` Matt Redfearn
2017-05-24 8:52 ` Matt Redfearn
2017-06-03 2:18 ` Palmer Dabbelt
2017-06-03 2:18 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 2/7] m32r: Use lib/ucmpdi2.c Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 3/7] microblaze: Use libgcc files from lib/ Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-24 11:22 ` kbuild test robot
2017-05-24 11:22 ` kbuild test robot
2017-05-23 22:05 ` [PATCH 4/7] mips: Use lib/{ashldi3,ashrdi3,cmpdi2,lshrdi3,ucmpdi2}.c Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-24 9:01 ` Matt Redfearn
2017-05-24 9:01 ` Matt Redfearn
2017-06-03 2:18 ` Palmer Dabbelt
2017-05-24 11:39 ` kbuild test robot
2017-05-24 11:39 ` kbuild test robot
2017-05-24 11:50 ` kbuild test robot
2017-05-24 11:50 ` kbuild test robot
2017-05-23 22:05 ` [PATCH 5/7] score: " Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 6/7] sh: Use lib/ashldi3,ashrdi3,lshrdi3}.c Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-24 11:22 ` kbuild test robot
2017-05-24 11:22 ` kbuild test robot
2017-05-24 11:30 ` kbuild test robot
2017-05-24 11:30 ` kbuild test robot
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 7/7] sparc: Use lib/{cmpdi2,ucmpdi2}.c Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-23 22:05 ` Palmer Dabbelt
2017-05-24 9:21 ` Unify the various copies of libgcc into lib Geert Uytterhoeven
2017-05-24 9:21 ` Geert Uytterhoeven
2017-06-03 2:59 ` Palmer Dabbelt
2017-06-03 2:59 ` Palmer Dabbelt
2017-05-24 13:49 ` David Howells
2017-05-24 13:49 ` David Howells
2017-05-24 13:59 ` John Paul Adrian Glaubitz
2017-05-24 13:59 ` John Paul Adrian Glaubitz
2017-06-06 19:10 ` Unify the various copies of libgcc into lib v2 Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 1/7] lib: Add shared copies of some GCC library routines Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 2/7] m32r: Use lib/ucmpdi2.c Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 3/7] microblaze: Use libgcc files from lib/ Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 4/7] score: Use lib/{ashldi3,ashrdi3,cmpdi2,lshrdi3,ucmpdi2}.c Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 5/7] sh: Use lib/ashldi3,ashrdi3,lshrdi3}.c Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-07 19:27 ` kbuild test robot
2017-06-07 19:27 ` kbuild test robot
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 6/7] sparc: Use lib/{cmpdi2,ucmpdi2}.c Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 7/7] MIPS: Use generic libgcc intrinsics Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt [this message]
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-09 19:53 ` Ralf Baechle
2017-06-09 19:53 ` Ralf Baechle
2017-06-06 19:10 ` Palmer Dabbelt
2017-06-06 19:10 ` Unify the various copies of libgcc into lib v2 Palmer Dabbelt
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=20170606191023.24581-8-palmer@dabbelt.com \
--to=palmer@dabbelt.com \
--cc=dalias@libc.org \
--cc=davem@davemloft.net \
--cc=geert@linux-m68k.org \
--cc=lennox.wu@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-sh@vger.kernel.org \
--cc=liqin.linux@gmail.com \
--cc=matt.redfearn@imgtec.com \
--cc=monstr@monstr.eu \
--cc=ralf@linux-mips.org \
--cc=sparclinux@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/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