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>
32 lines
776 B
Makefile
32 lines
776 B
Makefile
#
|
|
# Copyright 2003 PathScale, Inc.
|
|
#
|
|
# Licensed under the GPL
|
|
#
|
|
|
|
obj-y = bug.o bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \
|
|
setjmp.o sigcontext.o signal.o syscalls.o syscall_table.o sysrq.o \
|
|
ksyms.o tls.o
|
|
|
|
obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o
|
|
obj-$(CONFIG_MODULES) += um_module.o
|
|
|
|
subarch-obj-y = lib/bitops_64.o lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o
|
|
subarch-obj-$(CONFIG_MODULES) += kernel/module_64.o
|
|
|
|
ldt-y = ../sys-i386/ldt.o
|
|
|
|
USER_OBJS := ptrace_user.o sigcontext.o
|
|
|
|
USER_OBJS += user-offsets.s
|
|
extra-y += user-offsets.s
|
|
|
|
extra-$(CONFIG_MODE_TT) += unmap.o
|
|
|
|
UNPROFILE_OBJS := stub_segv.o
|
|
CFLAGS_stub_segv.o := $(CFLAGS_NO_HARDENING)
|
|
|
|
include arch/um/scripts/Makefile.rules
|
|
|
|
$(obj)/unmap.%: _c_flags = $(call unprofile,$(CFLAGS))
|