Skip to content

Commit 802a887

Browse files
sravnborgandreas-gaisler
authored andcommitted
sparc32: Use generic cmpdi2/ucmpdi2 variants
Use the generic variants - the implementation is the same. As a nice side-effect fix the following warnings: cmpdi2.c: warning: no previous prototype for '__cmpdi2' [-Wmissing-prototypes] ucmpdi2.c: warning: no previous prototype for '__ucmpdi2' [-Wmissing-prototypes] Signed-off-by: Sam Ravnborg <[email protected]> Fixes: 0fcb708 ("Makefile.extrawarn: turn on missing-prototypes globally") Reviewed-by: Randy Dunlap <[email protected]> Tested-by: Randy Dunlap <[email protected]> # build-tested Reviewed-by: Maciej W. Rozycki <[email protected]> Tested-by: Maciej W. Rozycki <[email protected]> # build-tested Cc: "David S. Miller" <[email protected]> Cc: Andreas Larsson <[email protected]> Reviewed-by: Andreas Larsson <[email protected]> Tested-by: Andreas Larsson <[email protected]> Signed-off-by: Andreas Larsson <[email protected]> Link: https://lore.kernel.org/r/20240224-sam-fix-sparc32-all-builds-v2-1-1f186603c5c4@ravnborg.org
1 parent 626db6e commit 802a887

File tree

4 files changed

+4
-50
lines changed

4 files changed

+4
-50
lines changed

arch/sparc/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ config SPARC32
5757
select CLZ_TAB
5858
select DMA_DIRECT_REMAP
5959
select GENERIC_ATOMIC64
60+
select GENERIC_LIB_CMPDI2
61+
select GENERIC_LIB_UCMPDI2
6062
select HAVE_UID16
6163
select LOCK_MM_AND_FIND_VMA
6264
select OLD_SIGACTION

arch/sparc/lib/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ lib-$(CONFIG_SPARC32) += divdi3.o udivdi3.o
1414
lib-$(CONFIG_SPARC32) += copy_user.o locks.o
1515
lib-$(CONFIG_SPARC64) += atomic_64.o
1616
lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o
17-
lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o
17+
lib-$(CONFIG_SPARC32) += muldi3.o bitext.o
1818
lib-$(CONFIG_SPARC64) += multi3.o
1919
lib-$(CONFIG_SPARC64) += fls.o
2020
lib-$(CONFIG_SPARC64) += fls64.o
@@ -51,5 +51,5 @@ lib-$(CONFIG_SPARC64) += copy_in_user.o memmove.o
5151
lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o
5252

5353
obj-$(CONFIG_SPARC64) += iomap.o
54-
obj-$(CONFIG_SPARC32) += atomic32.o ucmpdi2.o
54+
obj-$(CONFIG_SPARC32) += atomic32.o
5555
obj-$(CONFIG_SPARC64) += PeeCeeI.o

arch/sparc/lib/cmpdi2.c

Lines changed: 0 additions & 28 deletions
This file was deleted.

arch/sparc/lib/ucmpdi2.c

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)