jailhouse: inmates: bench: Add -R option -- repeats count.

[jailhouse.git] / hypervisor / Makefile

diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index 55f60859e2006a0432367bbbfbdb808a490a61de..0532e4e354eca764f4c47c47d502954c0d051d8d 100644 (file)
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -11,6 +11,10 @@
 # This work is licensed under the terms of the GNU GPL, version 2.  See
 # the COPYING file in the top-level directory.
 #
+# asm-defines.h generation code derived from linux/Kbuild:
+#
+# Copyright (c) Linux kernel developers, 2014
+#
 
 LINUXINCLUDE := -I$(src)/arch/$(SRCARCH)/include -I$(src)/include
 KBUILD_CFLAGS := -g -Os -Wall -Wstrict-prototypes -Wtype-limits \
@@ -19,36 +23,97 @@ KBUILD_CFLAGS := -g -Os -Wall -Wstrict-prototypes -Wtype-limits \
                 -fno-stack-protector -fno-builtin-ffsl
 
 ifeq ($(SRCARCH),x86)
-KBUILD_CFLAGS += -mcmodel=kernel
+KBUILD_CFLAGS += -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
+KBUILD_CFLAGS += $(call cc-option,-mno-avx,)
 KBUILD_CPPFLAGS += -m64
 BUILD_VARIANTS := amd intel
 endif
 
+ifeq ($(SRCARCH),arm)
+KBUILD_CFLAGS += -marm
+endif
+
 ifneq ($(wildcard $(obj)/include/jailhouse/config.h),)
 KBUILD_CFLAGS += -include $(obj)/include/jailhouse/config.h
 endif
 
+CORE_OBJECTS = setup.o printk.o paging.o control.o lib.o mmio.o
+
+define filechk_config_mk
+(                                                                      \
+       echo "\$$(foreach config,\$$(filter CONFIG_%,           \
+               \$$(.VARIABLES)), \$$(eval undefine \$$(config)))";     \
+       if [ -f $(src)/include/jailhouse/config.h ]; then               \
+               sed -e "/^#define \([^[:space:]]*\)[[:space:]]*1/!d"    \
+                   -e "s/^#define \([^[:space:]]*\)[[:space:]]*1/\1=y/" \
+                       $(src)/include/jailhouse/config.h;              \
+       fi                                                              \
+)
+endef
+
+$(obj)/include/generated/config.mk: Makefile FORCE
+       $(call filechk,config_mk)
+
 define filechk_version
        $(src)/../scripts/gen_version_h $(src)/..
 endef
 
-clean-files := $(obj)/include/jailhouse/version.h
+clean-dirs += include/generated/
+
+define sed-y
+       "/^=>/{s:=>#\(.*\):/* \1 */:; \
+       s:^=>\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
+       s:^=>\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
+       s:=>::; p;}"
+endef
+
+quiet_cmd_defines = GEN     $@
+define cmd_defines
+       (set -e; \
+        echo "#ifndef _GENERATED_ASM_DEFINES_H"; \
+        echo "#define _GENERATED_ASM_DEFINES_H"; \
+        echo "/*"; \
+        echo " * This file is autogenerated. If you need to change it,"; \
+        echo " * edit arch/$(SRCARCH)/asm-defines.c instead."; \
+        echo " *"; \
+        echo " * ALL MANUAL CHANGES TO THIS FILE WILL BE LOST!"; \
+        echo " */"; \
+        echo ""; \
+        sed -ne $(sed-y) $<; \
+        echo ""; \
+        echo "#endif" ) > $@
+endef
+
+defines-file := include/generated/asm-defines.h
 
-$(obj)/include/jailhouse/version.h: $(src)/Makefile FORCE
+targets := $(defines-file) arch/$(SRCARCH)/asm-defines.s
+
+$(obj)/arch/$(SRCARCH)/asm-defines.s: $(src)/arch/$(SRCARCH)/asm-defines.c
+       $(call if_changed_dep,cc_s_c)
+
+$(obj)/$(defines-file): $(obj)/arch/$(SRCARCH)/asm-defines.s
+       $(Q)mkdir -p $(dir $@)
+       $(call cmd,defines)
+
+$(obj)/include/generated/version.h: $(src)/Makefile FORCE
        $(call filechk,version)
 
-$(obj)/setup.o: $(obj)/include/jailhouse/version.h
+$(foreach co,$(CORE_OBJECTS),\
+       $(eval $(obj)/$(co): $(obj)/$(defines-file)))
+
+$(obj)/setup.o: $(obj)/include/generated/version.h
 
-arch-builtin: FORCE
-       $(Q)$(MAKE) $(build)=$(obj)/arch/$(SRCARCH)
+arch-builtin: $(obj)/$(defines-file) $(obj)/include/generated/config.mk FORCE
+       $(Q)$(MAKE) $(build)=$(obj)/arch/$(SRCARCH) \
+               CONFIG_MK=$(obj)/include/generated/config.mk
 
 always :=
 
 define BUILD_JAILHOUSE_template
 always += jailhouse$(1).bin
 
-hypervisor$(1)-y := setup.o printk.o paging.o control.o lib.o \
-       arch/$$(SRCARCH)/built-in$(1).o hypervisor.lds
+hypervisor$(1)-y := $$(CORE_OBJECTS) arch/$$(SRCARCH)/built-in$(1).o \
+       hypervisor.lds
 targets += $$(hypervisor$(1)-y)
 
 # Need fake recipe here so make will consider this a volatile target