diff options
| author | David Miller <davem@davemloft.net> | 2012-02-01 17:17:54 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2012-02-01 18:34:23 -0500 |
| commit | c6df4b17c8539f737a6a2d7b797eac41e8e34cdc (patch) | |
| tree | 7b891178267aa9486fed1197419aac57d3036b5f /lib/Makefile | |
| parent | 86f8bedc9e1a8ddb4f1d9ff1f0c1229cc0797d6d (diff) | |
lib: Fix multiple definitions of clz_tab
Both sparc 32-bit's software divide assembler and MPILIB provide
clz_tab[] with identical contents.
Break it out into a seperate object file and select it when
SPARC32 or MPILIB is set.
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index d71aae1b01b3..18515f0267c4 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
| @@ -121,6 +121,8 @@ obj-$(CONFIG_DQL) += dynamic_queue_limits.o | |||
| 121 | obj-$(CONFIG_MPILIB) += mpi/ | 121 | obj-$(CONFIG_MPILIB) += mpi/ |
| 122 | obj-$(CONFIG_SIGNATURE) += digsig.o | 122 | obj-$(CONFIG_SIGNATURE) += digsig.o |
| 123 | 123 | ||
| 124 | obj-$(CONFIG_CLZ_TAB) += clz_tab.o | ||
| 125 | |||
| 124 | hostprogs-y := gen_crc32table | 126 | hostprogs-y := gen_crc32table |
| 125 | clean-files := crc32table.h | 127 | clean-files := crc32table.h |
| 126 | 128 | ||