From: Masahiro Yamada Date: Tue, 10 Feb 2015 12:37:00 +0000 (+0900) Subject: sh: rename some private libraries X-Git-Tag: v2015.04-rc3~13^2~2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=72cedad2b89aac188e56ac8bc6a4146786791693;p=u-boot sh: rename some private libraries Rename two files to the corresponding file names in Linux. This helps us find missing libraries in the next commit. Signed-off-by: Masahiro Yamada Signed-off-by: Nobuhiro Iwamatsu --- diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile index 1304f4ee93..a50f24e97f 100644 --- a/arch/sh/lib/Makefile +++ b/arch/sh/lib/Makefile @@ -15,5 +15,5 @@ obj-y += time.o endif obj-$(CONFIG_CMD_SH_ZIMAGEBOOT) += zimageboot.o -lib-$(CONFIG_USE_PRIVATE_LIBGCC) += ashiftrt.o ashiftlt.o lshiftrt.o \ - ashldi3.o ashrsi3.o lshrdi3.o movmem.o +lib-$(CONFIG_USE_PRIVATE_LIBGCC) += movmem.o ashldi3.o lshrdi3.o \ + ashlsi3.o ashrsi3.o ashiftrt.o lshrsi3.o diff --git a/arch/sh/lib/ashiftlt.S b/arch/sh/lib/ashiftlt.S deleted file mode 100644 index f971568e35..0000000000 --- a/arch/sh/lib/ashiftlt.S +++ /dev/null @@ -1,171 +0,0 @@ -/* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006 - Free Software Foundation, Inc. - - * SPDX-License-Identifier: GPL-2.0+ - */ - -!! libgcc routines for the Renesas / SuperH SH CPUs. -!! Contributed by Steve Chamberlain. -!! sac@cygnus.com - -!! ashiftrt_r4_x, ___ashrsi3, ___ashlsi3, ___lshrsi3 routines -!! recoded in assembly by Toshiyasu Morita -!! tm@netcom.com - -/* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and - ELF local label prefixes by J"orn Rennecke - amylaar@cygnus.com */ - -! -! GLOBAL(ashlsi3) -! -! Entry: -! -! r4: Value to shift -! r5: Shifts -! -! Exit: -! -! r0: Result -! -! Destroys: -! -! (none) -! - .global __ashlsi3 - .align 2 -__ashlsi3: - mov #31,r0 - and r0,r5 - mova __ashlsi3_table,r0 - mov.b @(r0,r5),r5 -#ifdef __sh1__ - add r5,r0 - jmp @r0 -#else - braf r5 -#endif - mov r4,r0 - - .align 2 -__ashlsi3_table: - .byte __ashlsi3_0-__ashlsi3_table - .byte __ashlsi3_1-__ashlsi3_table - .byte __ashlsi3_2-__ashlsi3_table - .byte __ashlsi3_3-__ashlsi3_table - .byte __ashlsi3_4-__ashlsi3_table - .byte __ashlsi3_5-__ashlsi3_table - .byte __ashlsi3_6-__ashlsi3_table - .byte __ashlsi3_7-__ashlsi3_table - .byte __ashlsi3_8-__ashlsi3_table - .byte __ashlsi3_9-__ashlsi3_table - .byte __ashlsi3_10-__ashlsi3_table - .byte __ashlsi3_11-__ashlsi3_table - .byte __ashlsi3_12-__ashlsi3_table - .byte __ashlsi3_13-__ashlsi3_table - .byte __ashlsi3_14-__ashlsi3_table - .byte __ashlsi3_15-__ashlsi3_table - .byte __ashlsi3_16-__ashlsi3_table - .byte __ashlsi3_17-__ashlsi3_table - .byte __ashlsi3_18-__ashlsi3_table - .byte __ashlsi3_19-__ashlsi3_table - .byte __ashlsi3_20-__ashlsi3_table - .byte __ashlsi3_21-__ashlsi3_table - .byte __ashlsi3_22-__ashlsi3_table - .byte __ashlsi3_23-__ashlsi3_table - .byte __ashlsi3_24-__ashlsi3_table - .byte __ashlsi3_25-__ashlsi3_table - .byte __ashlsi3_26-__ashlsi3_table - .byte __ashlsi3_27-__ashlsi3_table - .byte __ashlsi3_28-__ashlsi3_table - .byte __ashlsi3_29-__ashlsi3_table - .byte __ashlsi3_30-__ashlsi3_table - .byte __ashlsi3_31-__ashlsi3_table - -__ashlsi3_6: - shll2 r0 -__ashlsi3_4: - shll2 r0 -__ashlsi3_2: - rts - shll2 r0 - -__ashlsi3_7: - shll2 r0 -__ashlsi3_5: - shll2 r0 -__ashlsi3_3: - shll2 r0 -__ashlsi3_1: - rts - shll r0 - -__ashlsi3_14: - shll2 r0 -__ashlsi3_12: - shll2 r0 -__ashlsi3_10: - shll2 r0 -__ashlsi3_8: - rts - shll8 r0 - -__ashlsi3_15: - shll2 r0 -__ashlsi3_13: - shll2 r0 -__ashlsi3_11: - shll2 r0 -__ashlsi3_9: - shll8 r0 - rts - shll r0 - -__ashlsi3_22: - shll2 r0 -__ashlsi3_20: - shll2 r0 -__ashlsi3_18: - shll2 r0 -__ashlsi3_16: - rts - shll16 r0 - -__ashlsi3_23: - shll2 r0 -__ashlsi3_21: - shll2 r0 -__ashlsi3_19: - shll2 r0 -__ashlsi3_17: - shll16 r0 - rts - shll r0 - -__ashlsi3_30: - shll2 r0 -__ashlsi3_28: - shll2 r0 -__ashlsi3_26: - shll2 r0 -__ashlsi3_24: - shll16 r0 - rts - shll8 r0 - -__ashlsi3_31: - shll2 r0 -__ashlsi3_29: - shll2 r0 -__ashlsi3_27: - shll2 r0 -__ashlsi3_25: - shll16 r0 - shll8 r0 - rts - shll r0 - -__ashlsi3_0: - rts - nop diff --git a/arch/sh/lib/ashlsi3.S b/arch/sh/lib/ashlsi3.S new file mode 100644 index 0000000000..f971568e35 --- /dev/null +++ b/arch/sh/lib/ashlsi3.S @@ -0,0 +1,171 @@ +/* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2005, 2006 + Free Software Foundation, Inc. + + * SPDX-License-Identifier: GPL-2.0+ + */ + +!! libgcc routines for the Renesas / SuperH SH CPUs. +!! Contributed by Steve Chamberlain. +!! sac@cygnus.com + +!! ashiftrt_r4_x, ___ashrsi3, ___ashlsi3, ___lshrsi3 routines +!! recoded in assembly by Toshiyasu Morita +!! tm@netcom.com + +/* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and + ELF local label prefixes by J"orn Rennecke + amylaar@cygnus.com */ + +! +! GLOBAL(ashlsi3) +! +! Entry: +! +! r4: Value to shift +! r5: Shifts +! +! Exit: +! +! r0: Result +! +! Destroys: +! +! (none) +! + .global __ashlsi3 + .align 2 +__ashlsi3: + mov #31,r0 + and r0,r5 + mova __ashlsi3_table,r0 + mov.b @(r0,r5),r5 +#ifdef __sh1__ + add r5,r0 + jmp @r0 +#else + braf r5 +#endif + mov r4,r0 + + .align 2 +__ashlsi3_table: + .byte __ashlsi3_0-__ashlsi3_table + .byte __ashlsi3_1-__ashlsi3_table + .byte __ashlsi3_2-__ashlsi3_table + .byte __ashlsi3_3-__ashlsi3_table + .byte __ashlsi3_4-__ashlsi3_table + .byte __ashlsi3_5-__ashlsi3_table + .byte __ashlsi3_6-__ashlsi3_table + .byte __ashlsi3_7-__ashlsi3_table + .byte __ashlsi3_8-__ashlsi3_table + .byte __ashlsi3_9-__ashlsi3_table + .byte __ashlsi3_10-__ashlsi3_table + .byte __ashlsi3_11-__ashlsi3_table + .byte __ashlsi3_12-__ashlsi3_table + .byte __ashlsi3_13-__ashlsi3_table + .byte __ashlsi3_14-__ashlsi3_table + .byte __ashlsi3_15-__ashlsi3_table + .byte __ashlsi3_16-__ashlsi3_table + .byte __ashlsi3_17-__ashlsi3_table + .byte __ashlsi3_18-__ashlsi3_table + .byte __ashlsi3_19-__ashlsi3_table + .byte __ashlsi3_20-__ashlsi3_table + .byte __ashlsi3_21-__ashlsi3_table + .byte __ashlsi3_22-__ashlsi3_table + .byte __ashlsi3_23-__ashlsi3_table + .byte __ashlsi3_24-__ashlsi3_table + .byte __ashlsi3_25-__ashlsi3_table + .byte __ashlsi3_26-__ashlsi3_table + .byte __ashlsi3_27-__ashlsi3_table + .byte __ashlsi3_28-__ashlsi3_table + .byte __ashlsi3_29-__ashlsi3_table + .byte __ashlsi3_30-__ashlsi3_table + .byte __ashlsi3_31-__ashlsi3_table + +__ashlsi3_6: + shll2 r0 +__ashlsi3_4: + shll2 r0 +__ashlsi3_2: + rts + shll2 r0 + +__ashlsi3_7: + shll2 r0 +__ashlsi3_5: + shll2 r0 +__ashlsi3_3: + shll2 r0 +__ashlsi3_1: + rts + shll r0 + +__ashlsi3_14: + shll2 r0 +__ashlsi3_12: + shll2 r0 +__ashlsi3_10: + shll2 r0 +__ashlsi3_8: + rts + shll8 r0 + +__ashlsi3_15: + shll2 r0 +__ashlsi3_13: + shll2 r0 +__ashlsi3_11: + shll2 r0 +__ashlsi3_9: + shll8 r0 + rts + shll r0 + +__ashlsi3_22: + shll2 r0 +__ashlsi3_20: + shll2 r0 +__ashlsi3_18: + shll2 r0 +__ashlsi3_16: + rts + shll16 r0 + +__ashlsi3_23: + shll2 r0 +__ashlsi3_21: + shll2 r0 +__ashlsi3_19: + shll2 r0 +__ashlsi3_17: + shll16 r0 + rts + shll r0 + +__ashlsi3_30: + shll2 r0 +__ashlsi3_28: + shll2 r0 +__ashlsi3_26: + shll2 r0 +__ashlsi3_24: + shll16 r0 + rts + shll8 r0 + +__ashlsi3_31: + shll2 r0 +__ashlsi3_29: + shll2 r0 +__ashlsi3_27: + shll2 r0 +__ashlsi3_25: + shll16 r0 + shll8 r0 + rts + shll r0 + +__ashlsi3_0: + rts + nop diff --git a/arch/sh/lib/lshiftrt.S b/arch/sh/lib/lshiftrt.S deleted file mode 100644 index 787044d2e6..0000000000 --- a/arch/sh/lib/lshiftrt.S +++ /dev/null @@ -1,171 +0,0 @@ -/* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006 - Free Software Foundation, Inc. - - * SPDX-License-Identifier: GPL-2.0+ - */ - -!! libgcc routines for the Renesas / SuperH SH CPUs. -!! Contributed by Steve Chamberlain. -!! sac@cygnus.com - -!! ashiftrt_r4_x, ___ashrsi3, ___ashlsi3, ___lshrsi3 routines -!! recoded in assembly by Toshiyasu Morita -!! tm@netcom.com - -/* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and - ELF local label prefixes by J"orn Rennecke - amylaar@cygnus.com */ - -! -! __lshrsi3) -! -! Entry: -! -! r4: Value to shift -! r5: Shifts -! -! Exit: -! -! r0: Result -! -! Destroys: -! -! (none) -! - .global __lshrsi3 - .align 2 -__lshrsi3: - mov #31,r0 - and r0,r5 - mova __lshrsi3_table,r0 - mov.b @(r0,r5),r5 -#ifdef __sh1__ - add r5,r0 - jmp @r0 -#else - braf r5 -#endif - mov r4,r0 - - .align 2 -__lshrsi3_table: - .byte __lshrsi3_0-__lshrsi3_table - .byte __lshrsi3_1-__lshrsi3_table - .byte __lshrsi3_2-__lshrsi3_table - .byte __lshrsi3_3-__lshrsi3_table - .byte __lshrsi3_4-__lshrsi3_table - .byte __lshrsi3_5-__lshrsi3_table - .byte __lshrsi3_6-__lshrsi3_table - .byte __lshrsi3_7-__lshrsi3_table - .byte __lshrsi3_8-__lshrsi3_table - .byte __lshrsi3_9-__lshrsi3_table - .byte __lshrsi3_10-__lshrsi3_table - .byte __lshrsi3_11-__lshrsi3_table - .byte __lshrsi3_12-__lshrsi3_table - .byte __lshrsi3_13-__lshrsi3_table - .byte __lshrsi3_14-__lshrsi3_table - .byte __lshrsi3_15-__lshrsi3_table - .byte __lshrsi3_16-__lshrsi3_table - .byte __lshrsi3_17-__lshrsi3_table - .byte __lshrsi3_18-__lshrsi3_table - .byte __lshrsi3_19-__lshrsi3_table - .byte __lshrsi3_20-__lshrsi3_table - .byte __lshrsi3_21-__lshrsi3_table - .byte __lshrsi3_22-__lshrsi3_table - .byte __lshrsi3_23-__lshrsi3_table - .byte __lshrsi3_24-__lshrsi3_table - .byte __lshrsi3_25-__lshrsi3_table - .byte __lshrsi3_26-__lshrsi3_table - .byte __lshrsi3_27-__lshrsi3_table - .byte __lshrsi3_28-__lshrsi3_table - .byte __lshrsi3_29-__lshrsi3_table - .byte __lshrsi3_30-__lshrsi3_table - .byte __lshrsi3_31-__lshrsi3_table - -__lshrsi3_6: - shlr2 r0 -__lshrsi3_4: - shlr2 r0 -__lshrsi3_2: - rts - shlr2 r0 - -__lshrsi3_7: - shlr2 r0 -__lshrsi3_5: - shlr2 r0 -__lshrsi3_3: - shlr2 r0 -__lshrsi3_1: - rts - shlr r0 - -__lshrsi3_14: - shlr2 r0 -__lshrsi3_12: - shlr2 r0 -__lshrsi3_10: - shlr2 r0 -__lshrsi3_8: - rts - shlr8 r0 - -__lshrsi3_15: - shlr2 r0 -__lshrsi3_13: - shlr2 r0 -__lshrsi3_11: - shlr2 r0 -__lshrsi3_9: - shlr8 r0 - rts - shlr r0 - -__lshrsi3_22: - shlr2 r0 -__lshrsi3_20: - shlr2 r0 -__lshrsi3_18: - shlr2 r0 -__lshrsi3_16: - rts - shlr16 r0 - -__lshrsi3_23: - shlr2 r0 -__lshrsi3_21: - shlr2 r0 -__lshrsi3_19: - shlr2 r0 -__lshrsi3_17: - shlr16 r0 - rts - shlr r0 - -__lshrsi3_30: - shlr2 r0 -__lshrsi3_28: - shlr2 r0 -__lshrsi3_26: - shlr2 r0 -__lshrsi3_24: - shlr16 r0 - rts - shlr8 r0 - -__lshrsi3_31: - shlr2 r0 -__lshrsi3_29: - shlr2 r0 -__lshrsi3_27: - shlr2 r0 -__lshrsi3_25: - shlr16 r0 - shlr8 r0 - rts - shlr r0 - -__lshrsi3_0: - rts - nop diff --git a/arch/sh/lib/lshrsi3.S b/arch/sh/lib/lshrsi3.S new file mode 100644 index 0000000000..787044d2e6 --- /dev/null +++ b/arch/sh/lib/lshrsi3.S @@ -0,0 +1,171 @@ +/* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2005, 2006 + Free Software Foundation, Inc. + + * SPDX-License-Identifier: GPL-2.0+ + */ + +!! libgcc routines for the Renesas / SuperH SH CPUs. +!! Contributed by Steve Chamberlain. +!! sac@cygnus.com + +!! ashiftrt_r4_x, ___ashrsi3, ___ashlsi3, ___lshrsi3 routines +!! recoded in assembly by Toshiyasu Morita +!! tm@netcom.com + +/* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and + ELF local label prefixes by J"orn Rennecke + amylaar@cygnus.com */ + +! +! __lshrsi3) +! +! Entry: +! +! r4: Value to shift +! r5: Shifts +! +! Exit: +! +! r0: Result +! +! Destroys: +! +! (none) +! + .global __lshrsi3 + .align 2 +__lshrsi3: + mov #31,r0 + and r0,r5 + mova __lshrsi3_table,r0 + mov.b @(r0,r5),r5 +#ifdef __sh1__ + add r5,r0 + jmp @r0 +#else + braf r5 +#endif + mov r4,r0 + + .align 2 +__lshrsi3_table: + .byte __lshrsi3_0-__lshrsi3_table + .byte __lshrsi3_1-__lshrsi3_table + .byte __lshrsi3_2-__lshrsi3_table + .byte __lshrsi3_3-__lshrsi3_table + .byte __lshrsi3_4-__lshrsi3_table + .byte __lshrsi3_5-__lshrsi3_table + .byte __lshrsi3_6-__lshrsi3_table + .byte __lshrsi3_7-__lshrsi3_table + .byte __lshrsi3_8-__lshrsi3_table + .byte __lshrsi3_9-__lshrsi3_table + .byte __lshrsi3_10-__lshrsi3_table + .byte __lshrsi3_11-__lshrsi3_table + .byte __lshrsi3_12-__lshrsi3_table + .byte __lshrsi3_13-__lshrsi3_table + .byte __lshrsi3_14-__lshrsi3_table + .byte __lshrsi3_15-__lshrsi3_table + .byte __lshrsi3_16-__lshrsi3_table + .byte __lshrsi3_17-__lshrsi3_table + .byte __lshrsi3_18-__lshrsi3_table + .byte __lshrsi3_19-__lshrsi3_table + .byte __lshrsi3_20-__lshrsi3_table + .byte __lshrsi3_21-__lshrsi3_table + .byte __lshrsi3_22-__lshrsi3_table + .byte __lshrsi3_23-__lshrsi3_table + .byte __lshrsi3_24-__lshrsi3_table + .byte __lshrsi3_25-__lshrsi3_table + .byte __lshrsi3_26-__lshrsi3_table + .byte __lshrsi3_27-__lshrsi3_table + .byte __lshrsi3_28-__lshrsi3_table + .byte __lshrsi3_29-__lshrsi3_table + .byte __lshrsi3_30-__lshrsi3_table + .byte __lshrsi3_31-__lshrsi3_table + +__lshrsi3_6: + shlr2 r0 +__lshrsi3_4: + shlr2 r0 +__lshrsi3_2: + rts + shlr2 r0 + +__lshrsi3_7: + shlr2 r0 +__lshrsi3_5: + shlr2 r0 +__lshrsi3_3: + shlr2 r0 +__lshrsi3_1: + rts + shlr r0 + +__lshrsi3_14: + shlr2 r0 +__lshrsi3_12: + shlr2 r0 +__lshrsi3_10: + shlr2 r0 +__lshrsi3_8: + rts + shlr8 r0 + +__lshrsi3_15: + shlr2 r0 +__lshrsi3_13: + shlr2 r0 +__lshrsi3_11: + shlr2 r0 +__lshrsi3_9: + shlr8 r0 + rts + shlr r0 + +__lshrsi3_22: + shlr2 r0 +__lshrsi3_20: + shlr2 r0 +__lshrsi3_18: + shlr2 r0 +__lshrsi3_16: + rts + shlr16 r0 + +__lshrsi3_23: + shlr2 r0 +__lshrsi3_21: + shlr2 r0 +__lshrsi3_19: + shlr2 r0 +__lshrsi3_17: + shlr16 r0 + rts + shlr r0 + +__lshrsi3_30: + shlr2 r0 +__lshrsi3_28: + shlr2 r0 +__lshrsi3_26: + shlr2 r0 +__lshrsi3_24: + shlr16 r0 + rts + shlr8 r0 + +__lshrsi3_31: + shlr2 r0 +__lshrsi3_29: + shlr2 r0 +__lshrsi3_27: + shlr2 r0 +__lshrsi3_25: + shlr16 r0 + shlr8 r0 + rts + shlr r0 + +__lshrsi3_0: + rts + nop