Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c48b108 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: take arch/um/sys-x86 to arch/x86/um 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 7bbe7204

arch/um/Makefile

+13 −9
Original line number Diff line number Diff line
@@ -30,13 +30,17 @@ ifeq ($(SUBARCH),x86_64) 
        HEADER_ARCH := x86

endif



HOST_DIR := arch/$(HEADER_ARCH)



include $(srctree)/$(ARCH_DIR)/Makefile-skas

include $(srctree)/$(ARCH_DIR)/Makefile-$(HEADER_ARCH)

include $(srctree)/$(HOST_DIR)/Makefile.um



core-y += $(HOST_DIR)/um/



SHARED_HEADERS	:= $(ARCH_DIR)/include/shared

ARCH_INCLUDE	:= -I$(srctree)/$(SHARED_HEADERS)

ARCH_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/sys-$(HEADER_ARCH)/shared

KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(HEADER_ARCH)

ARCH_INCLUDE	+= -I$(srctree)/$(HOST_DIR)/um/shared

KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/um



# -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.
@@ -60,7 +64,7 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\ 
#This will adjust *FLAGS accordingly to the platform.

include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)



KBUILD_CPPFLAGS += -I$(srctree)/arch/$(HEADER_ARCH)/include

KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/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
@@ -90,7 +94,7 @@ define archhelp 
  echo '		   find in the kernel root.'

endef



KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH)

KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig



archprepare: include/generated/user_constants.h
@@ -131,8 +135,8 @@ archclean: 


# Generated files



$(ARCH_DIR)/sys-$(HEADER_ARCH)/user-offsets.s: FORCE

	$(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(HEADER_ARCH) $@

$(HOST_DIR)/um/user-offsets.s: FORCE

	$(Q)$(MAKE) $(build)=$(HOST_DIR)/um $@



define filechk_gen-asm-offsets

        (set -e; \
@@ -147,7 +151,7 @@ define filechk_gen-asm-offsets 
         echo ""; )

endef



include/generated/user_constants.h: $(ARCH_DIR)/sys-$(HEADER_ARCH)/user-offsets.s

include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s

	$(call filechk,gen-asm-offsets)



export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH
 
export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH

arch/um/os-Linux/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


obj-y = aio.o execvp.o file.o helper.o irq.o main.o mem.o process.o \

	registers.o sigio.o signal.o start_up.o time.o tty.o \

	umid.o tls.o user_syms.o util.o drivers/ sys-$(HEADER_ARCH)/ skas/

	umid.o tls.o user_syms.o util.o drivers/ skas/



obj-$(CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA) += elf_aux.o

arch/um/scripts/Makefile.rules

+0 −5
Original line number Diff line number Diff line
@@ -25,8 +25,3 @@ $(UNPROFILE_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ 
define unprofile

	$(patsubst -pg,,$(patsubst -fprofile-arcs -ftest-coverage,,$(1)))

endef
 


ifdef subarch-obj-y

obj-y += subarch.o

subarch-y = $(addprefix ../../$(HEADER_ARCH)/,$(subarch-obj-y))

endif

arch/um/Makefile-x86→arch/x86/Makefile.um

+1 −1
Original line number Diff line number Diff line 
core-y += arch/um/sys-x86/ arch/x86/crypto/

core-y += arch/x86/crypto/



ifeq ($(CONFIG_X86_32),y)

START := 0x8048000

arch/um/Kconfig.x86→arch/x86/um/Kconfig

+0 −0

File moved.

View file