diff options
author | Antony Pavlov <antonynpavlov@gmail.com> | 2018-06-28 10:39:43 +0300 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-29 09:29:42 +0200 |
commit | 36c4247aabccf3ed18db52086fc9d894ee4fc5eb (patch) | |
tree | c29530d491e118375ff859983e95558ca4b16702 | |
parent | 5302dff3b60d6ef288bfd9526b69381ffc3ed990 (diff) | |
download | barebox-36c4247aabccf3ed18db52086fc9d894ee4fc5eb.tar.gz barebox-36c4247aabccf3ed18db52086fc9d894ee4fc5eb.tar.xz |
MIPS: Use generic GCC library routines from lib/
This is a port of Linux kernel commit
| commit 740129b36faf049e6845819144542a0455e1e285
| Author: Antony Pavlov <antonynpavlov@gmail.com>
| Date: Wed Apr 11 08:50:19 2018 +0100
|
| MIPS: Use generic GCC library routines from lib/
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/mips/Kconfig | 3 | ||||
-rw-r--r-- | arch/mips/lib/Makefile | 5 | ||||
-rw-r--r-- | arch/mips/lib/ashldi3.c | 28 | ||||
-rw-r--r-- | arch/mips/lib/ashrdi3.c | 30 | ||||
-rw-r--r-- | arch/mips/lib/libgcc.h | 29 | ||||
-rw-r--r-- | arch/mips/lib/lshrdi3.c | 28 |
6 files changed, 3 insertions, 120 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 359f67883c..5dd95b42a7 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -3,6 +3,9 @@ # config MIPS bool + select GENERIC_LIB_ASHLDI3 + select GENERIC_LIB_ASHRDI3 + select GENERIC_LIB_LSHRDI3 select HAS_KALLSYMS select HAVE_CONFIGURABLE_MEMORY_LAYOUT select HAVE_CONFIGURABLE_TEXT_BASE diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index d25d0969fc..1a049c7914 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -1,8 +1,5 @@ extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += barebox.lds obj-$(CONFIG_CSRC_R4K_LIB) += csrc-r4k.o -obj-y += lshrdi3.o -obj-y += ashldi3.o -obj-y += ashrdi3.o obj-y += cpu-probe.o obj-y += traps.o obj-y += genex.o @@ -17,5 +14,3 @@ obj-$(CONFIG_CPU_MIPS64) += c-r4k.o obj-$(CONFIG_CMD_MIPS_CPUINFO) += cpuinfo.o obj-$(CONFIG_CMD_BOOTM) += bootm.o - -pbl-y += ashldi3.o diff --git a/arch/mips/lib/ashldi3.c b/arch/mips/lib/ashldi3.c deleted file mode 100644 index cbdbcbb6a9..0000000000 --- a/arch/mips/lib/ashldi3.c +++ /dev/null @@ -1,28 +0,0 @@ -#include <module.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/mips/lib/ashrdi3.c b/arch/mips/lib/ashrdi3.c deleted file mode 100644 index 928d6d97ce..0000000000 --- a/arch/mips/lib/ashrdi3.c +++ /dev/null @@ -1,30 +0,0 @@ -#include <module.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/mips/lib/libgcc.h b/arch/mips/lib/libgcc.h deleted file mode 100644 index 593e598022..0000000000 --- a/arch/mips/lib/libgcc.h +++ /dev/null @@ -1,29 +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; - -long long __lshrdi3(long long u, word_type b); -long long __ashldi3(long long u, word_type b); -long long __ashrdi3(long long u, word_type b); - -#endif /* __ASM_LIBGCC_H */ diff --git a/arch/mips/lib/lshrdi3.c b/arch/mips/lib/lshrdi3.c deleted file mode 100644 index 74a4846e97..0000000000 --- a/arch/mips/lib/lshrdi3.c +++ /dev/null @@ -1,28 +0,0 @@ -#include <module.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); |