diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-12-03 03:07:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-04 09:17:18 -0800 |
| commit | 18269c0fd4db9bec2668f895f21d742486ccb90f (patch) | |
| tree | 2aecdac629ea35c77ec246e838dd9cfdeea02121 | |
| parent | 5de18cde3b748aafc6d187d7655ba42f2260501d (diff) | |
| download | linux-3.10-18269c0fd4db9bec2668f895f21d742486ccb90f.tar.gz linux-3.10-18269c0fd4db9bec2668f895f21d742486ccb90f.tar.bz2 linux-3.10-18269c0fd4db9bec2668f895f21d742486ccb90f.zip | |
sparc: prepare lib/ for unification
Identical named files renamed to <name>_32.S
Refactored Makefile to prepare for unification.
Linking order was altered slightly - but this is a lib.a file so
it should not matter.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/lib/Makefile | 25 | ||||
| -rw-r--r-- | arch/sparc/lib/atomic_32.S (renamed from arch/sparc/lib/atomic.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/lib/checksum_32.S (renamed from arch/sparc/lib/checksum.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/lib/memcmp_32.S (renamed from arch/sparc/lib/memcmp.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/lib/memscan_32.S (renamed from arch/sparc/lib/memscan.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/lib/rwsem_32.S (renamed from arch/sparc/lib/rwsem.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/lib/strlen_32.S (renamed from arch/sparc/lib/strlen.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/lib/strlen_user_32.S (renamed from arch/sparc/lib/strlen_user.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/lib/strncmp_32.S (renamed from arch/sparc/lib/strncmp.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/lib/strncpy_from_user_32.S (renamed from arch/sparc/lib/strncpy_from_user.S) | 0 |
10 files changed, 17 insertions, 8 deletions
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index 6e303e10c3b..f2650545c77 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile @@ -1,13 +1,22 @@ # Makefile for Sparc library files.. # -EXTRA_AFLAGS := -ansi -DST_DIV0=0x02 +asflags-y := -ansi -DST_DIV0=0x02 +ccflags-y := -Werror -lib-y := mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o memcpy.o memset.o \ - strlen.o checksum.o blockops.o memscan.o memcmp.o strncmp.o \ - strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \ - copy_user.o locks.o atomic.o \ - lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o \ - cmpdi2.o +lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o +lib-$(CONFIG_SPARC32) += memcpy.o memset.o +lib-y += strlen_$(BITS).o +lib-y += checksum_$(BITS).o +lib-$(CONFIG_SPARC32) += blockops.o +lib-y += memscan_$(BITS).o memcmp_$(BITS).o strncmp_$(BITS).o +lib-y += strncpy_from_user_$(BITS).o strlen_user_$(BITS).o +lib-$(CONFIG_SPARC32) += divdi3.o udivdi3.o +lib-$(CONFIG_SPARC32) += copy_user.o locks.o +lib-y += atomic_$(BITS).o +lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o +lib-y += rwsem_$(BITS).o +lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o -obj-y += iomap.o atomic32.o +obj-y += iomap.o +obj-$(CONFIG_SPARC32) += atomic32.o diff --git a/arch/sparc/lib/atomic.S b/arch/sparc/lib/atomic_32.S index 178cbb8ae1b..178cbb8ae1b 100644 --- a/arch/sparc/lib/atomic.S +++ b/arch/sparc/lib/atomic_32.S diff --git a/arch/sparc/lib/checksum.S b/arch/sparc/lib/checksum_32.S index 77f228533d4..77f228533d4 100644 --- a/arch/sparc/lib/checksum.S +++ b/arch/sparc/lib/checksum_32.S diff --git a/arch/sparc/lib/memcmp.S b/arch/sparc/lib/memcmp_32.S index cb4bdb0cc2a..cb4bdb0cc2a 100644 --- a/arch/sparc/lib/memcmp.S +++ b/arch/sparc/lib/memcmp_32.S diff --git a/arch/sparc/lib/memscan.S b/arch/sparc/lib/memscan_32.S index 4ff1657dfc2..4ff1657dfc2 100644 --- a/arch/sparc/lib/memscan.S +++ b/arch/sparc/lib/memscan_32.S diff --git a/arch/sparc/lib/rwsem.S b/arch/sparc/lib/rwsem_32.S index 9675268e7fd..9675268e7fd 100644 --- a/arch/sparc/lib/rwsem.S +++ b/arch/sparc/lib/rwsem_32.S diff --git a/arch/sparc/lib/strlen.S b/arch/sparc/lib/strlen_32.S index ed9a763368c..ed9a763368c 100644 --- a/arch/sparc/lib/strlen.S +++ b/arch/sparc/lib/strlen_32.S diff --git a/arch/sparc/lib/strlen_user.S b/arch/sparc/lib/strlen_user_32.S index 8c8a371df3c..8c8a371df3c 100644 --- a/arch/sparc/lib/strlen_user.S +++ b/arch/sparc/lib/strlen_user_32.S diff --git a/arch/sparc/lib/strncmp.S b/arch/sparc/lib/strncmp_32.S index 494ec664537..494ec664537 100644 --- a/arch/sparc/lib/strncmp.S +++ b/arch/sparc/lib/strncmp_32.S diff --git a/arch/sparc/lib/strncpy_from_user.S b/arch/sparc/lib/strncpy_from_user_32.S index d77198976a6..d77198976a6 100644 --- a/arch/sparc/lib/strncpy_from_user.S +++ b/arch/sparc/lib/strncpy_from_user_32.S |