From: Palmer Dabbelt <palmer@dabbelt.com>
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 <palmer@dabbelt.com>
Subject: [PATCH 3/7] microblaze: Use libgcc files from lib/
Date: Tue, 6 Jun 2017 12:10:19 -0700 [thread overview]
Message-ID: <20170606191023.24581-4-palmer@dabbelt.com> (raw)
In-Reply-To: <20170606191023.24581-1-palmer@dabbelt.com>
These files are functionally identical to the shared copies that I
recently added.
Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
arch/microblaze/Kconfig | 6 +++++
arch/microblaze/lib/Makefile | 3 +--
arch/microblaze/lib/ashldi3.c | 28 ---------------------
arch/microblaze/lib/ashrdi3.c | 30 -----------------------
arch/microblaze/lib/cmpdi2.c | 26 --------------------
arch/microblaze/lib/libgcc.h | 32 ------------------------
arch/microblaze/lib/lshrdi3.c | 28 ---------------------
arch/microblaze/lib/muldi3.c | 57 -------------------------------------------
arch/microblaze/lib/ucmpdi2.c | 20 ---------------
9 files changed, 7 insertions(+), 223 deletions(-)
delete mode 100644 arch/microblaze/lib/ashldi3.c
delete mode 100644 arch/microblaze/lib/ashrdi3.c
delete mode 100644 arch/microblaze/lib/cmpdi2.c
delete mode 100644 arch/microblaze/lib/libgcc.h
delete mode 100644 arch/microblaze/lib/lshrdi3.c
delete mode 100644 arch/microblaze/lib/muldi3.c
delete mode 100644 arch/microblaze/lib/ucmpdi2.c
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 85885a501dce..833487c17996 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -34,6 +34,12 @@ config MICROBLAZE
select TRACING_SUPPORT
select VIRT_TO_BUS
select CPU_NO_EFFICIENT_FFS
+ select GENERIC_ASHLDI3
+ select GENERIC_ASHRDI3
+ select GENERIC_CMPDI2
+ select GENERIC_LSHRDI3
+ select GENERIC_MULDI3
+ select GENERIC_UCMPDI3
config SWAP
def_bool n
diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile
index 70c7ae6a3fb5..c9a4d537e2fd 100644
--- a/arch/microblaze/lib/Makefile
+++ b/arch/microblaze/lib/Makefile
@@ -19,5 +19,4 @@ endif
lib-y += uaccess_old.o
# libgcc-style stuff needed in the kernel
-obj-y += ashldi3.o ashrdi3.o cmpdi2.o divsi3.o lshrdi3.o modsi3.o
-obj-y += muldi3.o mulsi3.o ucmpdi2.o udivsi3.o umodsi3.o
+obj-y += divsi3.o modsi3.o mulsi3.o udivsi3.o umodsi3.o
diff --git a/arch/microblaze/lib/ashldi3.c b/arch/microblaze/lib/ashldi3.c
deleted file mode 100644
index 1af904cd972d..000000000000
--- a/arch/microblaze/lib/ashldi3.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <linux/export.h>
-
-#include "libgcc.h"
-
-long long __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/microblaze/lib/ashrdi3.c b/arch/microblaze/lib/ashrdi3.c
deleted file mode 100644
index 32c334c05d04..000000000000
--- a/arch/microblaze/lib/ashrdi3.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <linux/export.h>
-
-#include "libgcc.h"
-
-long long __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/microblaze/lib/cmpdi2.c b/arch/microblaze/lib/cmpdi2.c
deleted file mode 100644
index 67abc9ac1bd4..000000000000
--- a/arch/microblaze/lib/cmpdi2.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <linux/export.h>
-
-#include "libgcc.h"
-
-word_type __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/microblaze/lib/libgcc.h b/arch/microblaze/lib/libgcc.h
deleted file mode 100644
index ab077ef7e14b..000000000000
--- a/arch/microblaze/lib/libgcc.h
+++ /dev/null
@@ -1,32 +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;
-
-extern long long __ashldi3(long long u, word_type b);
-extern long long __ashrdi3(long long u, word_type b);
-extern word_type __cmpdi2(long long a, long long b);
-extern long long __lshrdi3(long long u, word_type b);
-extern long long __muldi3(long long u, long long v);
-extern word_type __ucmpdi2(unsigned long long a, unsigned long long b);
-
-#endif /* __ASM_LIBGCC_H */
diff --git a/arch/microblaze/lib/lshrdi3.c b/arch/microblaze/lib/lshrdi3.c
deleted file mode 100644
index adcb253f11c8..000000000000
--- a/arch/microblaze/lib/lshrdi3.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <linux/export.h>
-
-#include "libgcc.h"
-
-long long __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/microblaze/lib/muldi3.c b/arch/microblaze/lib/muldi3.c
deleted file mode 100644
index a3f9a03acdcd..000000000000
--- a/arch/microblaze/lib/muldi3.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <linux/export.h>
-
-#include "libgcc.h"
-
-#define W_TYPE_SIZE 32
-
-#define __ll_B ((unsigned long) 1 << (W_TYPE_SIZE / 2))
-#define __ll_lowpart(t) ((unsigned long) (t) & (__ll_B - 1))
-#define __ll_highpart(t) ((unsigned long) (t) >> (W_TYPE_SIZE / 2))
-
-/* If we still don't have umul_ppmm, define it using plain C. */
-#if !defined(umul_ppmm)
-#define umul_ppmm(w1, w0, u, v) \
- do { \
- unsigned long __x0, __x1, __x2, __x3; \
- unsigned short __ul, __vl, __uh, __vh; \
- \
- __ul = __ll_lowpart(u); \
- __uh = __ll_highpart(u); \
- __vl = __ll_lowpart(v); \
- __vh = __ll_highpart(v); \
- \
- __x0 = (unsigned long) __ul * __vl; \
- __x1 = (unsigned long) __ul * __vh; \
- __x2 = (unsigned long) __uh * __vl; \
- __x3 = (unsigned long) __uh * __vh; \
- \
- __x1 += __ll_highpart(__x0); /* this can't give carry */\
- __x1 += __x2; /* but this indeed can */ \
- if (__x1 < __x2) /* did we get it? */ \
- __x3 += __ll_B; /* yes, add it in the proper pos */ \
- \
- (w1) = __x3 + __ll_highpart(__x1); \
- (w0) = __ll_lowpart(__x1) * __ll_B + __ll_lowpart(__x0);\
- } while (0)
-#endif
-
-#if !defined(__umulsidi3)
-#define __umulsidi3(u, v) ({ \
- DWunion __w; \
- umul_ppmm(__w.s.high, __w.s.low, u, v); \
- __w.ll; \
- })
-#endif
-
-long long __muldi3(long long u, long long v)
-{
- const DWunion uu = {.ll = u};
- const DWunion vv = {.ll = v};
- DWunion w = {.ll = __umulsidi3(uu.s.low, vv.s.low)};
-
- w.s.high += ((unsigned long) uu.s.low * (unsigned long) vv.s.high
- + (unsigned long) uu.s.high * (unsigned long) vv.s.low);
-
- return w.ll;
-}
-EXPORT_SYMBOL(__muldi3);
diff --git a/arch/microblaze/lib/ucmpdi2.c b/arch/microblaze/lib/ucmpdi2.c
deleted file mode 100644
index d05f1585121c..000000000000
--- a/arch/microblaze/lib/ucmpdi2.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <linux/export.h>
-
-#include "libgcc.h"
-
-word_type __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:19 UTC|newest]
Thread overview: 31+ 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 ` [PATCH 1/7] lib: Add shared copies of some GCC library routines Palmer Dabbelt
2017-05-24 8:52 ` Matt Redfearn
2017-06-03 2:18 ` Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 2/7] m32r: Use lib/ucmpdi2.c Palmer Dabbelt
2017-05-23 22:05 ` [PATCH 3/7] microblaze: Use libgcc files from lib/ Palmer Dabbelt
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-24 9:01 ` Matt Redfearn
2017-06-03 2:18 ` Palmer Dabbelt
2017-05-24 11:39 ` 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 ` [PATCH 6/7] sh: Use lib/ashldi3,ashrdi3,lshrdi3}.c Palmer Dabbelt
2017-05-24 11:22 ` kbuild test robot
2017-05-24 11:30 ` kbuild test robot
2017-05-23 22:05 ` [PATCH 7/7] sparc: Use lib/{cmpdi2,ucmpdi2}.c Palmer Dabbelt
2017-05-24 9:21 ` Unify the various copies of libgcc into lib Geert Uytterhoeven
2017-06-03 2:59 ` Palmer Dabbelt
2017-05-24 13:49 ` David Howells
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 ` [PATCH 2/7] m32r: Use lib/ucmpdi2.c Palmer Dabbelt
2017-06-06 19:10 ` Palmer Dabbelt [this message]
2017-06-06 19:10 ` [PATCH 4/7] score: Use lib/{ashldi3,ashrdi3,cmpdi2,lshrdi3,ucmpdi2}.c Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 5/7] sh: Use lib/ashldi3,ashrdi3,lshrdi3}.c Palmer Dabbelt
2017-06-07 19:27 ` kbuild test robot
2017-06-06 19:10 ` [PATCH 6/7] sparc: Use lib/{cmpdi2,ucmpdi2}.c Palmer Dabbelt
2017-06-06 19:10 ` [PATCH 7/7] MIPS: Use generic libgcc intrinsics Palmer Dabbelt
2017-06-09 19:53 ` Ralf Baechle
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-4-palmer@dabbelt.com \
--to=palmer@dabbelt.com \
--cc=monstr@monstr.eu \
/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 NNTP newsgroup(s).