536788fe2d
Calculate TASK_SIZE at run-time by figuring out the host's VMSPLIT - this is needed on i386 if UML is to run on hosts with varying VMSPLITs without recompilation. TASK_SIZE is now defined in terms of a variable, task_size. This gets rid of an include of pgtable.h from processor.h, which can cause include loops. On i386, task_size is calculated early in boot by probing the address space in a binary search to figure out where the boundary between usable and non-usable memory is. This tries to make sure that a page that is considered to be in userspace is, or can be made, read-write. I'm concerned about a system-global VDSO page in kernel memory being hit and considered to be a userspace page. On x86_64, task_size is just the old value of CONFIG_TOP_ADDR. A bunch of config variable are gone now. CONFIG_TOP_ADDR is directly replaced by TASK_SIZE. NEST_LEVEL is gone since the relocation of the stubs makes it irrelevant. All the HOST_VMSPLIT stuff is gone. All references to these in arch/um/Makefile are also gone. I noticed and fixed a missing extern in os.h when adding os_get_task_size. Note: This has been revised to fix the 32-bit UML on 64-bit host bug that Miklos ran into. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Cc: Miklos Szeredi <miklos@szeredi.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
216 lines
7 KiB
Makefile
216 lines
7 KiB
Makefile
#
|
|
# This file is included by the global makefile so that you can add your own
|
|
# architecture-specific flags and dependencies.
|
|
#
|
|
# Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
# Licensed under the GPL
|
|
#
|
|
|
|
ARCH_DIR := arch/um
|
|
OS := $(shell uname -s)
|
|
# We require bash because the vmlinux link and loader script cpp use bash
|
|
# features.
|
|
SHELL := /bin/bash
|
|
|
|
filechk_gen_header = $<
|
|
|
|
core-y += $(ARCH_DIR)/kernel/ \
|
|
$(ARCH_DIR)/drivers/ \
|
|
$(ARCH_DIR)/os-$(OS)/
|
|
|
|
# Have to precede the include because the included Makefiles reference them.
|
|
SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \
|
|
module.h vm-flags.h elf.h host_ldt.h
|
|
SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header))
|
|
|
|
# XXX: The "os" symlink is only used by arch/um/include/os.h, which includes
|
|
# ../os/include/file.h
|
|
#
|
|
# These are cleaned up during mrproper. Please DO NOT fix it again, this is
|
|
# the Correct Thing(tm) to do!
|
|
ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/sysdep $(ARCH_DIR)/os \
|
|
$(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h
|
|
|
|
MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/skas
|
|
|
|
include $(srctree)/$(ARCH_DIR)/Makefile-skas
|
|
|
|
ARCH_INCLUDE := -I$(ARCH_DIR)/include
|
|
ifneq ($(KBUILD_SRC),)
|
|
ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include
|
|
endif
|
|
SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH)
|
|
|
|
# -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so
|
|
# named - it's a common symbol in libpcap, so we get a binary which crashes.
|
|
#
|
|
# Same things for in6addr_loopback and mktime - found in libc. For these two we
|
|
# only get link-time error, luckily.
|
|
#
|
|
# These apply to USER_CFLAGS to.
|
|
|
|
KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
|
|
$(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \
|
|
-Din6addr_loopback=kernel_in6addr_loopback \
|
|
-Din6addr_any=kernel_in6addr_any
|
|
|
|
KBUILD_AFLAGS += $(ARCH_INCLUDE)
|
|
|
|
USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
|
|
$(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
|
|
$(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64
|
|
|
|
include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
|
|
|
|
#This will adjust *FLAGS accordingly to the platform.
|
|
include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
|
|
|
|
# -Derrno=kernel_errno - This turns all kernel references to errno into
|
|
# kernel_errno to separate them from the libc errno. This allows -fno-common
|
|
# in KBUILD_CFLAGS. Otherwise, it would cause ld to complain about the two different
|
|
# errnos.
|
|
# These apply to kernelspace only.
|
|
#
|
|
# strip leading and trailing whitespace to make the USER_CFLAGS removal of these
|
|
# defines more robust
|
|
|
|
KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
|
|
-Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES))
|
|
KBUILD_CFLAGS += $(KERNEL_DEFINES)
|
|
KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,)
|
|
|
|
PHONY += linux
|
|
|
|
all: linux
|
|
|
|
linux: vmlinux
|
|
@echo ' LINK $@'
|
|
$(Q)ln -f $< $@
|
|
|
|
define archhelp
|
|
echo '* linux - Binary kernel image (./linux) - for backward'
|
|
echo ' compatibility only, this creates a hard link to the'
|
|
echo ' real kernel binary, the "vmlinux" binary you'
|
|
echo ' find in the kernel root.'
|
|
endef
|
|
|
|
ifneq ($(KBUILD_SRC),)
|
|
$(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch)
|
|
else
|
|
$(shell cd $(ARCH_DIR) && ln -sf Kconfig.$(SUBARCH) Kconfig.arch)
|
|
endif
|
|
|
|
archprepare: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/user_constants.h
|
|
prepare: $(ARCH_DIR)/include/kern_constants.h
|
|
|
|
LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
|
|
LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
|
|
|
|
CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \
|
|
$(call cc-option, -fno-stack-protector,) \
|
|
$(call cc-option, -fno-stack-protector-all,)
|
|
|
|
CONFIG_KERNEL_STACK_ORDER ?= 2
|
|
STACK_SIZE := $(shell echo $$[ 4096 * (1 << $(CONFIG_KERNEL_STACK_ORDER)) ] )
|
|
|
|
CPPFLAGS_vmlinux.lds = -U$(SUBARCH) -DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \
|
|
-DELF_FORMAT="$(ELF_FORMAT)" -DKERNEL_STACK_SIZE=$(STACK_SIZE)
|
|
|
|
# The wrappers will select whether using "malloc" or the kernel allocator.
|
|
LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
|
|
|
|
LD_FLAGS_CMDLINE = $(foreach opt,$(LDFLAGS),-Wl,$(opt))
|
|
|
|
CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE)
|
|
define cmd_vmlinux__
|
|
$(CC) $(CFLAGS_vmlinux) -o $@ \
|
|
-Wl,-T,$(vmlinux-lds) $(vmlinux-init) \
|
|
-Wl,--start-group $(vmlinux-main) -Wl,--end-group \
|
|
-lutil \
|
|
$(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o \
|
|
FORCE ,$^) ; rm -f linux
|
|
endef
|
|
|
|
# When cleaning we don't include .config, so we don't include
|
|
# TT or skas makefiles and don't clean skas_ptregs.h.
|
|
CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/uml-config.h \
|
|
$(ARCH_DIR)/include/user_constants.h \
|
|
$(ARCH_DIR)/include/kern_constants.h $(ARCH_DIR)/Kconfig.arch
|
|
|
|
MRPROPER_FILES += $(ARCH_SYMLINKS)
|
|
|
|
archclean:
|
|
@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
|
|
-o -name '*.gcov' \) -type f -print | xargs rm -f
|
|
|
|
$(SYMLINK_HEADERS):
|
|
@echo ' SYMLINK $@'
|
|
ifneq ($(KBUILD_SRC),)
|
|
$(Q)mkdir -p $(objtree)/include/asm-um
|
|
$(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
|
|
else
|
|
$(Q)cd $(srctree)/$(dir $@) ; \
|
|
ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $(notdir $@)
|
|
endif
|
|
|
|
include/asm-um/arch:
|
|
@echo ' SYMLINK $@'
|
|
ifneq ($(KBUILD_SRC),)
|
|
$(Q)mkdir -p $(objtree)/include/asm-um
|
|
$(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) include/asm-um/arch
|
|
else
|
|
$(Q)cd $(srctree)/include/asm-um && ln -fsn ../asm-$(HEADER_ARCH) arch
|
|
endif
|
|
|
|
$(objtree)/$(ARCH_DIR)/include:
|
|
@echo ' MKDIR $@'
|
|
$(Q)mkdir -p $@
|
|
|
|
$(ARCH_DIR)/include/sysdep: $(objtree)/$(ARCH_DIR)/include
|
|
@echo ' SYMLINK $@'
|
|
ifneq ($(KBUILD_SRC),)
|
|
$(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/sysdep-$(SUBARCH) $(ARCH_DIR)/include/sysdep
|
|
else
|
|
$(Q)cd $(ARCH_DIR)/include && ln -fsn sysdep-$(SUBARCH) sysdep
|
|
endif
|
|
|
|
$(ARCH_DIR)/os:
|
|
@echo ' SYMLINK $@'
|
|
ifneq ($(KBUILD_SRC),)
|
|
$(Q)ln -fsn $(srctree)/$(ARCH_DIR)/os-$(OS) $(ARCH_DIR)/os
|
|
else
|
|
$(Q)cd $(ARCH_DIR) && ln -fsn os-$(OS) os
|
|
endif
|
|
|
|
# Generated files
|
|
define filechk_umlconfig
|
|
sed 's/ CONFIG/ UML_CONFIG/'
|
|
endef
|
|
|
|
$(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h
|
|
$(call filechk,umlconfig)
|
|
|
|
$(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE
|
|
$(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(SUBARCH) $@
|
|
|
|
define filechk_gen-asm-offsets
|
|
(set -e; \
|
|
echo "/*"; \
|
|
echo " * DO NOT MODIFY."; \
|
|
echo " *"; \
|
|
echo " * This file was generated by arch/$(ARCH)/Makefile"; \
|
|
echo " *"; \
|
|
echo " */"; \
|
|
echo ""; \
|
|
sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \
|
|
echo ""; )
|
|
endef
|
|
|
|
$(ARCH_DIR)/include/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s
|
|
$(call filechk,gen-asm-offsets)
|
|
|
|
$(ARCH_DIR)/include/kern_constants.h: $(objtree)/$(ARCH_DIR)/include
|
|
@echo ' SYMLINK $@'
|
|
$(Q)ln -sf ../../../include/asm-um/asm-offsets.h $@
|
|
|
|
export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH
|