From patchwork Thu Sep 24 07:12:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hajime Tazaki X-Patchwork-Id: 1370369 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=UFuOwfmb; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=PrbxtanW; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BxmWS73zrz9sSC for ; Thu, 24 Sep 2020 17:14:28 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=BpW7Yw5aDeuidOFMasY8hNdc9wyE/p1Ko+vL383LbdI=; b=UFuOwfmb/I/pL4ud7x7bgaJCm ozTvIQ/RR+Py+ye3ebqka75YnmgpqpzuGkAWchbxVbo8uOvYk5ZxsyvZTXIwqy1ISvEywOTmOmXUe 6Om8j/3aes9PmmcASv6u2Pfa1L+2zqxC00OxMnH9sV/U8d7sYeo6CvBwAKIQNw0SvhO0lSZMQU+VZ pM4BCCcGfzOXiigjxp3IBgMh5ELM/N8JP14DC2SK+4KfX4LAPLD+yKMTFCZ/QyG+WaHP7fLkJaPA8 fa+dtQVzshAHmICpzXziOgKPl/h2pqdBxy0JMlNI4yHoCzjh8PPmJlcsQURz7sUBBXNUqn/2BWfZp vTcrJ1KzQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLLST-0003GW-Sq; Thu, 24 Sep 2020 07:14:25 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLLSR-0003FG-Ep for linux-um@lists.infradead.org; Thu, 24 Sep 2020 07:14:24 +0000 Received: by mail-pg1-x544.google.com with SMTP id u24so1368033pgi.1 for ; Thu, 24 Sep 2020 00:14:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=47LI9gybmx8klq4KsxiEL3i23ye+Wbjeal49mNMq+js=; b=PrbxtanWZPrk4/P4t4XJcH42p58dhbzoAcZRrVniRvWo1M+gjwsxwzquEn0tMN/32B KEIDzBM3FZq4hse4PIK+Cuvpg/UOMiNLCtB1un7p/dq26GyZhhTFp0Yg75cULR1wpSJU 4PuQ/u2/Z8LO1+lX/7jXMEE0+G+KXFTsvmDcupI6W+gaApZSzMupNHblnKNaUy9DpbT/ wEju4Rug80kKWEL+ctonQqvXQUIm7+Nlg2ySviUOGzLgHPpm9qwbn5jY7Tkur5ZjFXkC B5zYYvNmTXY5uvLZNNu7pGzT16+gxcEaLl1aJFC8ebO+LVRbz3L5dX5fXcgwlx3UGWz+ kTjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=47LI9gybmx8klq4KsxiEL3i23ye+Wbjeal49mNMq+js=; b=SH2fu4gV0ipLOVdpBevUjNgjeXrfDphdSIbSCHj7us94uCjZN8nZ0Z+uLNG4QawmHD wSv5qWA9SjElJaOm0A4/YUYIVRpndqeKbYb5h9F83q4vG0ROI4d1Wf4F5V+Pcuf2mkdy jEq3dHwALMuJPZBbPCrts82xjBv3c6oWKa1rh99WyAP8AXlqaATvVBeA0N+dYyOzVpbF p/a3Y/KQrPxtO2VjE5/1mOb8N2v08YH6GvbtcG1FjjI7uNkQRInzn0qnxutYpPauk2xl XU4kFtF8fMagc/ahLrijCeeYz9obiD4op5D9xegCQWuIuvO7AZDY+0fC37mUnBllqjvl B0/Q== X-Gm-Message-State: AOAM533Gkw2/2mPf6SkdXqtzzbDvnJOFvKTSPVROUAxHOxTG8dE3KoqC nLWphbcH/b+Sm6MKdTsVP58= X-Google-Smtp-Source: ABdhPJzrCV7ckpkPuk3w1HYurznDoZxodAv8mOknAH184zS7pQyap2xs79T9r19ifBD5dV4iFRdCeg== X-Received: by 2002:a63:b44f:: with SMTP id n15mr2907772pgu.282.1600931661297; Thu, 24 Sep 2020 00:14:21 -0700 (PDT) Received: from earth-mac.local (219x123x138x129.ap219.ftth.ucom.ne.jp. [219.123.138.129]) by smtp.gmail.com with ESMTPSA id z1sm1687528pgu.80.2020.09.24.00.14.20 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Sep 2020 00:14:20 -0700 (PDT) Received: by earth-mac.local (Postfix, from userid 501) id 8273D2037C204E; Thu, 24 Sep 2020 16:14:18 +0900 (JST) From: Hajime Tazaki To: linux-um@lists.infradead.org, jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com Subject: [RFC v6 05/21] um: move arch/x86/um/os-Linux to tools/um/uml/ Date: Thu, 24 Sep 2020 16:12:45 +0900 Message-Id: <3e7c2da8fc1ad973d4b1df0a770e8ccfc75e45a6.1600922528.git.thehajime@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200924_031423_540571_FDCCE160 X-CRM114-Status: GOOD ( 15.54 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:544 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [thehajime[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tavi.purdila@gmail.com, linux-kernel-library@freelists.org, linux-arch@vger.kernel.org, Hajime Tazaki , retrage01@gmail.com Sender: "linux-um" Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Similar to arch/um/os-Linux code, arch/x86 also contains OS dependent part as well. This patch moves underlying OS dependent part to tools/um directory so that arch/x86 code does not need to build host build facilities (e.g., libc). Signed-off-by: Hajime Tazaki --- arch/x86/um/Makefile | 2 +- arch/x86/um/os-Linux/Makefile | 13 ------------- tools/um/Makefile | 2 +- tools/um/uml/Build | 2 ++ tools/um/uml/x86/Build | 11 +++++++++++ .../x86/um/os-Linux => tools/um/uml/x86}/mcontext.c | 0 {arch/x86/um/os-Linux => tools/um/uml/x86}/prctl.c | 0 .../um/os-Linux => tools/um/uml/x86}/registers.c | 0 .../um/os-Linux => tools/um/uml/x86}/task_size.c | 0 {arch/x86/um/os-Linux => tools/um/uml/x86}/tls.c | 0 10 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 arch/x86/um/os-Linux/Makefile create mode 100644 tools/um/uml/x86/Build rename {arch/x86/um/os-Linux => tools/um/uml/x86}/mcontext.c (100%) rename {arch/x86/um/os-Linux => tools/um/uml/x86}/prctl.c (100%) rename {arch/x86/um/os-Linux => tools/um/uml/x86}/registers.c (100%) rename {arch/x86/um/os-Linux => tools/um/uml/x86}/task_size.c (100%) rename {arch/x86/um/os-Linux => tools/um/uml/x86}/tls.c (100%) diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile index 77f70b969d14..25e9846b36a2 100644 --- a/arch/x86/um/Makefile +++ b/arch/x86/um/Makefile @@ -13,7 +13,7 @@ obj-y = bugs_$(BITS).o delay.o fault.o ldt.o \ ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \ stub_$(BITS).o stub_segv.o \ sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \ - mem_$(BITS).o subarch.o os-$(OS)/ + mem_$(BITS).o subarch.o ifeq ($(CONFIG_X86_32),y) diff --git a/arch/x86/um/os-Linux/Makefile b/arch/x86/um/os-Linux/Makefile deleted file mode 100644 index 253bfb8cb702..000000000000 --- a/arch/x86/um/os-Linux/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) -# Licensed under the GPL -# - -obj-y = registers.o task_size.o mcontext.o - -obj-$(CONFIG_X86_32) += tls.o -obj-$(CONFIG_64BIT) += prctl.o - -USER_OBJS := $(obj-y) - -include arch/um/scripts/Makefile.rules diff --git a/tools/um/Makefile b/tools/um/Makefile index 07b9b93ed817..552ed5f1edae 100644 --- a/tools/um/Makefile +++ b/tools/um/Makefile @@ -61,7 +61,7 @@ $(OUTPUT)%-in.o: FORCE $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(patsubst %/,%,$(dir $*)) obj=$(notdir $*) # rule to build objects -$(OUTPUT)%-in.o: $(OUTPUT)lib/linux.o +$(OUTPUT)%-in.o: $(OUTPUT)lib/linux.o FORCE $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(patsubst %/,%,$(dir $*)) obj=$(notdir $*) clean: diff --git a/tools/um/uml/Build b/tools/um/uml/Build index 8e0607ee8b0a..435a9670d3ff 100644 --- a/tools/um/uml/Build +++ b/tools/um/uml/Build @@ -12,6 +12,8 @@ liblinux-y += 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 user_syms.o util.o drivers/ skas/ +liblinux-y += x86/ + liblinux-$(CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA) += elf_aux.o export O = $(srctree) diff --git a/tools/um/uml/x86/Build b/tools/um/uml/x86/Build new file mode 100644 index 000000000000..16bbc7eb19d1 --- /dev/null +++ b/tools/um/uml/x86/Build @@ -0,0 +1,11 @@ +# +# Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) +# Licensed under the GPL +# + +include $(objtree)/include/config/auto.conf + +liblinux-y = registers.o task_size.o mcontext.o + +liblinux-$(CONFIG_X86_32) += tls.o +liblinux-$(CONFIG_64BIT) += prctl.o diff --git a/arch/x86/um/os-Linux/mcontext.c b/tools/um/uml/x86/mcontext.c similarity index 100% rename from arch/x86/um/os-Linux/mcontext.c rename to tools/um/uml/x86/mcontext.c diff --git a/arch/x86/um/os-Linux/prctl.c b/tools/um/uml/x86/prctl.c similarity index 100% rename from arch/x86/um/os-Linux/prctl.c rename to tools/um/uml/x86/prctl.c diff --git a/arch/x86/um/os-Linux/registers.c b/tools/um/uml/x86/registers.c similarity index 100% rename from arch/x86/um/os-Linux/registers.c rename to tools/um/uml/x86/registers.c diff --git a/arch/x86/um/os-Linux/task_size.c b/tools/um/uml/x86/task_size.c similarity index 100% rename from arch/x86/um/os-Linux/task_size.c rename to tools/um/uml/x86/task_size.c diff --git a/arch/x86/um/os-Linux/tls.c b/tools/um/uml/x86/tls.c similarity index 100% rename from arch/x86/um/os-Linux/tls.c rename to tools/um/uml/x86/tls.c