2b8232ce51
a) include/asm-um/arch can't just point to include/asm-$(SUBARCH) now
b) arch/{i386,x86_64}/crypto are merged now
c) subarch-obj needed changes
d) cpufeature_64.h should pull "cpufeature_32.h", not <asm/cpufeature_32.h>
since it can be included from asm-um/cpufeature.h
e) in case of uml-i386 we need CONFIG_X86_32 for make and gcc, but not
for Kconfig
f) sysctl.c shouldn't do vdso_enabled for uml-i386 (actually, that one
should be registered from corresponding arch/*/kernel/*, with ifdef
going away; that's a separate patch, though).
With that and with Stephen's patch ("[PATCH net-2.6] uml: hard_header fix")
we have uml allmodconfig building both on i386 and amd64.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
33 lines
1.2 KiB
Makefile
33 lines
1.2 KiB
Makefile
# ===========================================================================
|
|
# arch/um: Generic definitions
|
|
# ===========================================================================
|
|
|
|
USER_SINGLE_OBJS := \
|
|
$(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs))
|
|
USER_OBJS += $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS))
|
|
USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
|
|
|
|
$(USER_OBJS:.o=.%): \
|
|
c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(basetarget).o)
|
|
$(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \
|
|
-Dunix -D__unix__ -D__$(SUBARCH)__ $(CF)
|
|
|
|
# These are like USER_OBJS but filter USER_CFLAGS through unprofile instead of
|
|
# using it directly.
|
|
UNPROFILE_OBJS := $(foreach file,$(UNPROFILE_OBJS),$(obj)/$(file))
|
|
|
|
$(UNPROFILE_OBJS:.o=.%): \
|
|
c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(basetarget).o)
|
|
$(UNPROFILE_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \
|
|
-Dunix -D__unix__ -D__$(SUBARCH)__ $(CF)
|
|
|
|
# The stubs and unmap.o can't try to call mcount or update basic block data
|
|
define unprofile
|
|
$(patsubst -pg,,$(patsubst -fprofile-arcs -ftest-coverage,,$(1)))
|
|
endef
|
|
|
|
ifdef subarch-obj-y
|
|
obj-y += subarch.o
|
|
subarch-y = $(addprefix ../../$(HEADER_ARCH)/,$(subarch-obj-y))
|
|
endif
|