lib: Rename compiler intrinsic selects to GENERIC_LIB_*

When these are included into arch Kconfig files, maintaining
alphabetical ordering of the selects means these get split up. To allow
for keeping things tidier and alphabetical, rename the selects to
GENERIC_LIB_*

Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
Acked-by: Palmer Dabbelt <palmer@sifive.com>
Cc: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-riscv@lists.infradead.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/19049/
Signed-off-by: James Hogan <jhogan@kernel.org>

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 23d8acca5c9038a184df62d24ccb2112cb92a7c0..5287c1441d66a588ff7820c1fb7cc422635acbf5 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -105,9 +105,9 @@ config ARCH_RV32I
        bool "RV32I"
        select CPU_SUPPORTS_32BIT_KERNEL
        select 32BIT
-       select GENERIC_ASHLDI3
-       select GENERIC_ASHRDI3
-       select GENERIC_LSHRDI3
+       select GENERIC_LIB_ASHLDI3
+       select GENERIC_LIB_ASHRDI3
+       select GENERIC_LIB_LSHRDI3
 
 config ARCH_RV64I
        bool "RV64I"

diff --git a/lib/Kconfig b/lib/Kconfig
index 5fe577673b985d91c68d8a907cebc4641290e9af..09565d779324502a7e9d25fa8428d291ee68ad70 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -604,20 +604,20 @@ config STRING_SELFTEST
 
 endmenu
 
-config GENERIC_ASHLDI3
+config GENERIC_LIB_ASHLDI3
        bool
 
-config GENERIC_ASHRDI3
+config GENERIC_LIB_ASHRDI3
        bool
 
-config GENERIC_LSHRDI3
+config GENERIC_LIB_LSHRDI3
        bool
 
-config GENERIC_MULDI3
+config GENERIC_LIB_MULDI3
        bool
 
-config GENERIC_CMPDI2
+config GENERIC_LIB_CMPDI2
        bool
 
-config GENERIC_UCMPDI2
+config GENERIC_LIB_UCMPDI2
        bool

diff --git a/lib/Makefile b/lib/Makefile
index ce20696d5a92e7dcb0c22701fc83754ec77fe77d..384713ff70d31ae454985db194b5ac9990ea1442 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -259,9 +259,9 @@ obj-$(CONFIG_SBITMAP) += sbitmap.o
 obj-$(CONFIG_PARMAN) += parman.o
 
 # GCC library routines
-obj-$(CONFIG_GENERIC_ASHLDI3) += ashldi3.o
-obj-$(CONFIG_GENERIC_ASHRDI3) += ashrdi3.o
-obj-$(CONFIG_GENERIC_LSHRDI3) += lshrdi3.o
-obj-$(CONFIG_GENERIC_MULDI3) += muldi3.o
-obj-$(CONFIG_GENERIC_CMPDI2) += cmpdi2.o
-obj-$(CONFIG_GENERIC_UCMPDI2) += ucmpdi2.o
+obj-$(CONFIG_GENERIC_LIB_ASHLDI3) += ashldi3.o
+obj-$(CONFIG_GENERIC_LIB_ASHRDI3) += ashrdi3.o
+obj-$(CONFIG_GENERIC_LIB_LSHRDI3) += lshrdi3.o
+obj-$(CONFIG_GENERIC_LIB_MULDI3) += muldi3.o
+obj-$(CONFIG_GENERIC_LIB_CMPDI2) += cmpdi2.o
+obj-$(CONFIG_GENERIC_LIB_UCMPDI2) += ucmpdi2.o