20d0021394
This patch makes the command: make ARCH=um SUBARCH=i386 work on x86_64 hosts (with support for building 32-bit binaries). This is especially needed since 64-bit UMLs don't support 32-bit emulation for guest binaries, currently. This has been tested in all possible cases and works. Only exception is that I've built but not tested a 64-bit binary, because I hadn't a 64-bit filesystem available. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
252 lines
7.7 KiB
Makefile
252 lines
7.7 KiB
Makefile
#
|
|
# Copyright (C) 2002 Jeff Dike (jdike@karaya.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
|
|
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
|
|
|
|
GEN_HEADERS += $(ARCH_DIR)/include/task.h $(ARCH_DIR)/include/kern_constants.h
|
|
|
|
um-modes-$(CONFIG_MODE_TT) += tt
|
|
um-modes-$(CONFIG_MODE_SKAS) += skas
|
|
|
|
MODE_INCLUDE += $(foreach mode,$(um-modes-y),\
|
|
-I$(srctree)/$(ARCH_DIR)/kernel/$(mode)/include)
|
|
|
|
MAKEFILES-INCL += $(foreach mode,$(um-modes-y),\
|
|
$(srctree)/$(ARCH_DIR)/Makefile-$(mode))
|
|
|
|
ifneq ($(MAKEFILES-INCL),)
|
|
include $(MAKEFILES-INCL)
|
|
endif
|
|
|
|
ARCH_INCLUDE := -I$(ARCH_DIR)/include
|
|
ifneq ($(KBUILD_SRC),)
|
|
ARCH_INCLUDE += -I$(ARCH_DIR)/include2
|
|
ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include
|
|
MRPROPER_DIRS += $(ARCH_DIR)/include2
|
|
endif
|
|
SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH)
|
|
|
|
# -Dvmap=kernel_vmap affects everything, and prevents anything from
|
|
# referencing the libpcap.o symbol so named.
|
|
|
|
CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
|
|
$(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap
|
|
|
|
USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
|
|
USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \
|
|
$(MODE_INCLUDE)
|
|
|
|
# -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 CFLAGS. Otherwise, it would cause ld to complain about the two different
|
|
# errnos.
|
|
|
|
CFLAGS += -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask
|
|
CFLAGS += $(call cc-option,-fno-unit-at-a-time,)
|
|
|
|
include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
|
|
|
|
#This will adjust *FLAGS accordingly to the platform.
|
|
include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
|
|
|
|
# These are needed for clean and mrproper, since in that case .config is not
|
|
# included; the values here are meaningless
|
|
|
|
CONFIG_NEST_LEVEL ?= 0
|
|
CONFIG_KERNEL_HALF_GIGS ?= 0
|
|
|
|
SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
|
|
|
|
ifeq ($(CONFIG_MODE_SKAS), y)
|
|
$(SYS_HEADERS) : $(ARCH_DIR)/include/skas_ptregs.h
|
|
endif
|
|
|
|
.PHONY: linux
|
|
|
|
all: linux
|
|
|
|
linux: vmlinux
|
|
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 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)
|
|
CLEAN_FILES += $(ARCH_DIR)/Kconfig_arch
|
|
else
|
|
$(shell cd $(ARCH_DIR) && ln -sf Kconfig_$(SUBARCH) Kconfig_arch)
|
|
endif
|
|
|
|
prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS)
|
|
|
|
LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
|
|
LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
|
|
|
|
CPP_MODE-$(CONFIG_MODE_TT) := -DMODE_TT
|
|
CONFIG_KERNEL_STACK_ORDER ?= 2
|
|
STACK_SIZE := $(shell echo $$[ 4096 * (1 << $(CONFIG_KERNEL_STACK_ORDER)) ] )
|
|
|
|
ifndef START
|
|
START = $(shell echo $$[ $(TOP_ADDR) - $(SIZE) ] )
|
|
endif
|
|
|
|
CPPFLAGS_vmlinux.lds = -U$(SUBARCH) \
|
|
-DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \
|
|
-DELF_FORMAT="$(ELF_FORMAT)" $(CPP_MODE-y) \
|
|
-DKERNEL_STACK_SIZE=$(STACK_SIZE) \
|
|
-DUNMAP_PATH=arch/um/sys-$(SUBARCH)/unmap_fin.o
|
|
|
|
#The wrappers will select whether using "malloc" or the kernel allocator.
|
|
LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
|
|
|
|
CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS)
|
|
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) \
|
|
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 \
|
|
$(GEN_HEADERS) $(ARCH_DIR)/include/skas_ptregs.h \
|
|
$(ARCH_DIR)/include/user_constants.h
|
|
|
|
MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \
|
|
$(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os \
|
|
$(ARCH_DIR)/Kconfig_arch
|
|
|
|
archclean:
|
|
$(Q)$(MAKE) $(clean)=$(ARCH_DIR)/util
|
|
@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),)
|
|
ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
|
|
else
|
|
$(Q)cd $(TOPDIR)/$(dir $@) ; \
|
|
ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $(notdir $@)
|
|
endif
|
|
|
|
include/asm-um/arch:
|
|
@echo ' SYMLINK $@'
|
|
ifneq ($(KBUILD_SRC),)
|
|
$(Q)mkdir -p include/asm-um
|
|
$(Q)ln -fsn $(srctree)/include/asm-$(SUBARCH) include/asm-um/arch
|
|
else
|
|
$(Q)cd $(TOPDIR)/include/asm-um && ln -sf ../asm-$(SUBARCH) arch
|
|
endif
|
|
|
|
$(ARCH_DIR)/include/sysdep:
|
|
@echo ' SYMLINK $@'
|
|
ifneq ($(KBUILD_SRC),)
|
|
$(Q)mkdir -p $(ARCH_DIR)/include
|
|
$(Q)mkdir -p $(ARCH_DIR)/include2
|
|
$(Q)ln -fsn sysdep-$(SUBARCH) $(ARCH_DIR)/include/sysdep
|
|
$(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/sysdep-$(SUBARCH) $(ARCH_DIR)/include2/sysdep
|
|
else
|
|
$(Q)cd $(ARCH_DIR)/include && ln -sf 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 -sf 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)/user-offsets.s: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.c
|
|
$(CC) $(USER_CFLAGS) -S -o $@ $<
|
|
|
|
$(ARCH_DIR)/user-offsets.h: $(ARCH_DIR)/user-offsets.s
|
|
$(call filechk,gen-asm-offsets)
|
|
|
|
CLEAN_FILES += $(ARCH_DIR)/user-offsets.s $(ARCH_DIR)/user-offsets.h
|
|
|
|
$(ARCH_DIR)/kernel-offsets.s: $(ARCH_DIR)/sys-$(SUBARCH)/kernel-offsets.c \
|
|
$(ARCH_SYMLINKS) \
|
|
$(SYS_DIR)/sc.h \
|
|
include/asm include/linux/version.h \
|
|
include/config/MARKER \
|
|
$(ARCH_DIR)/include/user_constants.h
|
|
$(CC) $(CFLAGS) $(NOSTDINC_FLAGS) $(CPPFLAGS) -S -o $@ $<
|
|
|
|
$(ARCH_DIR)/kernel-offsets.h: $(ARCH_DIR)/kernel-offsets.s
|
|
$(call filechk,gen-asm-offsets)
|
|
|
|
CLEAN_FILES += $(ARCH_DIR)/kernel-offsets.s $(ARCH_DIR)/kernel-offsets.h
|
|
|
|
$(ARCH_DIR)/include/task.h: $(ARCH_DIR)/util/mk_task
|
|
$(call filechk,gen_header)
|
|
|
|
$(ARCH_DIR)/include/user_constants.h: $(ARCH_DIR)/os-$(OS)/util/mk_user_constants
|
|
$(call filechk,gen_header)
|
|
|
|
$(ARCH_DIR)/include/kern_constants.h: $(ARCH_DIR)/util/mk_constants
|
|
$(call filechk,gen_header)
|
|
|
|
$(ARCH_DIR)/include/skas_ptregs.h: $(ARCH_DIR)/kernel/skas/util/mk_ptregs
|
|
$(call filechk,gen_header)
|
|
|
|
$(ARCH_DIR)/os-$(OS)/util/mk_user_constants: $(ARCH_DIR)/os-$(OS)/util FORCE ;
|
|
|
|
$(ARCH_DIR)/util/mk_task $(ARCH_DIR)/util/mk_constants: $(ARCH_DIR)/include/user_constants.h $(ARCH_DIR)/util \
|
|
FORCE ;
|
|
|
|
$(ARCH_DIR)/kernel/skas/util/mk_ptregs: $(ARCH_DIR)/kernel/skas/util FORCE ;
|
|
|
|
$(ARCH_DIR)/util: scripts_basic $(SYS_DIR)/sc.h $(ARCH_DIR)/kernel-offsets.h FORCE
|
|
$(Q)$(MAKE) $(build)=$@
|
|
|
|
$(ARCH_DIR)/kernel/skas/util: scripts_basic $(ARCH_DIR)/user-offsets.h FORCE
|
|
$(Q)$(MAKE) $(build)=$@
|
|
|
|
$(ARCH_DIR)/os-$(OS)/util: scripts_basic FORCE
|
|
$(Q)$(MAKE) $(build)=$@
|
|
|
|
export SUBARCH USER_CFLAGS OS
|