x86: unify arch/x86/lib/Makefile(s)
PATCH 1/1 x86: unify arch/x86/lib/Makefile(s)
Trivial unification of Makefiles for the
x86 specific library part.
Linking order is slightly modified but should be harmless.
Tested doing a defconfig build before and after and saw no build changes.
It adds almost as many lines as it deletes - bacause I broke a few lines up fo readability in the Makefile.
---
Last in the series for now.mm/ and pci/ looks at first sight simple but here the linking order may play games that I do not know too well. So they are a later exercise.
Sam
arch/x86/lib/Makefile | 26 ++++++++++++++++++++++++-- arch/x86/lib/Makefile_32 | 11 ----------- arch/x86/lib/Makefile_64 | 13 ------------- 3 files changed, 24 insertions(+), 26 deletions(-) delete mode 100644 arch/x86/lib/Makefile_32 delete mode 100644 arch/x86/lib/Makefile_64
arch/x86/lib/Makefile +24 -2
@@ -1,5 +1,27 @@ +# +# Makefile for x86 specific library files. +# + +obj-$(CONFIG_SMP) := msr-on-cpu.o + +lib-y := delay_$(BITS).o +lib-y += usercopy_$(BITS).o getuser_$(BITS).o putuser_$(BITS).o +lib-y += memcpy_$(BITS).o + ifeq ($(CONFIG_X86_32),y) -include ${srctree}/arch/x86/lib/Makefile_32 + lib-y += checksum_32.o + lib-y += strstr_32.o + lib-y += bitops_32.o semaphore_32.o string_32.o + + lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o else -include ${srctree}/arch/x86/lib/Makefile_64 + obj-y += io_64.o iomap_copy_64.o + + CFLAGS_csum-partial_64.o := -funroll-loops + + lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o + lib-y += thunk_64.o clear_page_64.o copy_page_64.o + lib-y += bitstr_64.o bitops_64.o + lib-y += memmove_64.o memset_64.o + lib-y += copy_user_64.o rwlock_64.o copy_user_nocache_64.o endif
arch/x86/lib/Makefile_32 deleted +0 -11
@@ -1,11 +0,0 @@ -# -# Makefile for i386-specific library files.. -# - - -lib-y = checksum_32.o delay_32.o usercopy_32.o getuser_32.o putuser_32.o memcpy_32.o strstr_32.o \ - bitops_32.o semaphore_32.o string_32.o - -lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o - -obj-$(CONFIG_SMP) += msr-on-cpu.o
arch/x86/lib/Makefile_64 deleted +0 -13
@@ -1,13 +0,0 @@ -# -# Makefile for x86_64-specific library files. -# - -CFLAGS_csum-partial_64.o := -funroll-loops - -obj-y := io_64.o iomap_copy_64.o -obj-$(CONFIG_SMP) += msr-on-cpu.o - -lib-y := csum-partial_64.o csum-copy_64.o csum-wrappers_64.o delay_64.o \ - usercopy_64.o getuser_64.o putuser_64.o \ - thunk_64.o clear_page_64.o copy_page_64.o bitstr_64.o bitops_64.o -lib-y += memcpy_64.o memmove_64.o memset_64.o copy_user_64.o rwlock_64.o copy_user_nocache_64.o
Signature · 1 line
1.5.3.7.1112.g9758e
Ingo Molnar
AppliedQuoted 2 lines · Sam Ravnborg
Trivial unification of Makefiles for the
x86 specific library part.
thanks, applied to x86.git.
Quoted 1 line
Linking order is slightly modified but should be harmless.
the link order in this code is indeed expected to be harmless. (unlike the Makefile_64 link order changes, which contain lots of init sections with implicit call ordering - which can easily lead to subtle bugs.)
Ingo