Merge pull request torvalds#456 from luckyluke/lkl_i386_fix

support i386

Author: thehajime

.circleci/config.yml

@@ -99,6 +99,13 @@ jobs:
      MKARG: "dpdk=yes"
    <<: *do_steps
 
+  i386:
+   docker:
+     - image: luckytmp/circleci-i386:latest
+   environment:
+     CROSS_COMPILE: ""
+   <<: *do_steps
+
   mingw32:
    docker:
      - image: lkldocker/circleci-mingw:0.6
@@ -165,6 +172,7 @@ workflows:
      - android-aarch64
      - freebsd11_x86_64
      - checkpatch
+     - i386
   nightly:
     triggers:
       - schedule:

arch/lkl/Makefile

@@ -2,7 +2,7 @@ include arch/lkl/auto.conf
 
 KBUILD_CFLAGS += -fno-builtin
 
-ifneq (,$(filter $(OUTPUT_FORMAT),elf64-x86-64 elf64-x86-64-freebsd elf32-littlearm elf64-littleaarch64))
+ifneq (,$(filter $(OUTPUT_FORMAT),elf64-x86-64 elf32-i386 elf64-x86-64-freebsd elf32-littlearm elf64-littleaarch64))
 KBUILD_CFLAGS += -fPIC
 else ifneq (,$(filter $(OUTPUT_FORMAT),pe-i386 pe-x86-64 ))
 ifneq ($(OUTPUT_FORMAT),pe-x86-64)
@@ -24,7 +24,13 @@ endif
 
 LDFLAGS_vmlinux += -r
 LKL_ENTRY_POINTS := lkl_start_kernel lkl_sys_halt lkl_syscall lkl_trigger_irq \
-	lkl_get_free_irq lkl_put_irq lkl_is_running
+	lkl_get_free_irq lkl_put_irq lkl_is_running lkl_bug lkl_printf
+
+ifeq ($(OUTPUT_FORMAT),elf32-i386)
+LKL_ENTRY_POINTS += \
+	__x86.get_pc_thunk.bx __x86.get_pc_thunk.dx __x86.get_pc_thunk.ax \
+	__x86.get_pc_thunk.cx __x86.get_pc_thunk.si __x86.get_pc_thunk.di
+endif
 
 core-y += arch/lkl/kernel/
 core-y += arch/lkl/mm/

arch/lkl/scripts/headers_install.py

@@ -178,6 +178,9 @@ def replace(h):
 q = re.compile("(\w+)\s*(,|=[^,]*|$)", re.M|re.S)
 find_enums(p, q, defines)
 
+# needed for i386
+defines.add("__NR_stime")
+
 def process_header(h):
     print("  REPLACE\t%s" % (out_dir + "/" + os.path.basename(h)))
     replace(h)

tools/lkl/Makefile.autoconf

@@ -58,6 +58,7 @@ define posix_host
   $(if $(strip $(call find_include,archive.h)),$(call set_autoconf_var,ARCHIVE,y))
   $(if $(strip $(call find_include,linux/if_tun.h)),$(call set_autoconf_var,VIRTIO_NET_MACVTAP,y))
   $(if $(filter $(1),elf64-x86-64-freebsd),$(call set_autoconf_var,NEEDS_LARGP,y))
+  $(if $(filter $(1),elf32-i386),$(call set_autoconf_var,I386,y))
 endef
 
 define nt64_host

tools/lkl/Targets

@@ -6,6 +6,7 @@ endif
 LDFLAGS_lib/hijack/liblkl-hijack-y += -shared -nodefaultlibs
 LDLIBS_lib/hijack/liblkl-hijack-y += -ldl
 LDLIBS_lib/hijack/liblkl-hijack-$(LKL_HOST_CONFIG_ANDROID) += -lgcc -lc
+LDLIBS_lib/hijack/liblkl-hijack-$(LKL_HOST_CONFIG_I386) += -lc_nonshared
 
 progs-$(LKL_HOST_CONFIG_FUSE) += lklfuse
 LDLIBS_lklfuse-y := -lfuse

tools/lkl/include/lkl.h

@@ -35,7 +35,7 @@ extern "C" {
 int inet_pton(int af, const char *src, void *dst);
 #endif
 
-#if defined(__ANDROID__) && __LKL__BITS_PER_LONG == 32
+#if __LKL__BITS_PER_LONG == 32 && (defined(__ANDROID__) || defined(__i386__))
 #define __lkl__NR_fcntl __lkl__NR_fcntl64
 #endif
 

tools/lkl/tests/disk.sh

@@ -10,7 +10,7 @@ function prepfs()
 
     file=`mktemp`
 
-    dd if=/dev/zero of=$file bs=1024 count=102400
+    dd if=/dev/zero of=$file bs=1024 count=204800
 
     yes | mkfs.$1 $file