From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24BB7C31E46 for ; Wed, 12 Jun 2019 19:28:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6D9F215EA for ; Wed, 12 Jun 2019 19:27:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="RgStwM3F" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728873AbfFLT0z (ORCPT ); Wed, 12 Jun 2019 15:26:55 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39669 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728646AbfFLT0t (ORCPT ); Wed, 12 Jun 2019 15:26:49 -0400 Received: by mail-wr1-f68.google.com with SMTP id x4so15487559wrt.6 for ; Wed, 12 Jun 2019 12:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J+1CEghJOdVJx1KMtcZOum2NpwBrMVg9LcIl76Brzvw=; b=RgStwM3FGRzdCf/mvhCnGOfULHZaHdkSvdHk8+3Xx6rlwxOeWt435wlZmHaBZcxFFu /iJ9oCEtHmKdX8ESzD0XTQqWKxSqyUXQ38w6lBJ/jydrGwY/lRYRu5zqhLT2/d+3W3M6 Vnx0NUXPrWToOJjBu8VzWThQJlAuVgdQ3JuJ0ozDex/JanLidDUGTKTOjsYVds/jtfzg jZ4/zavy+bLPjV0e8CP+7AEhV5xV8lb4BLMnGBrJ40+cR0IuLWWT39gDbyzzdRNsb7j3 hV5ydO1aexpglVmABTYbvBrvjrxSKeGYlOrQ0QFuZHgapByRAG16woCuuSPzSn/dDRtx rDvg== 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=J+1CEghJOdVJx1KMtcZOum2NpwBrMVg9LcIl76Brzvw=; b=AyibZTV3aGlger7cJWRX3a3o7Btz1qLj+UiBZeFoZlW1i8meixtm4lH0qxRNS5WA9C eSgajMZr5UkjrYMIYTP8ma6+r2W/NRqKg1hYbtuoX3hhSaJcfUnGYPYh9bmERDkoS96O 1PGDjeApQXGMOEt4V3h5jF/aWSJjdW558GmO9sSwlDYpWWvWDEgCbES1QkN0My/5J0Yq wPJJenNRZPJ1v+6St8J4GEpQCFFzmcn7ns87Bm621OoNHPxNtEpPDlvqFMpGieEiMoVE piwWDwIRf5r/Yz+MVdh51hUsQYMDc9RNfRmo3LEZJwB1vIF4HqMgyJBlai4/61iYbGz9 BfnQ== X-Gm-Message-State: APjAAAWfL4a0XqaNAoAtuB2Ry36R1CpDPKDmL8F6Tdbo3ERZl5/B6P2+ oJtchoxRRwW7Rt0PNndOzFckowFDO5o= X-Google-Smtp-Source: APXvYqyPCNTB3qTUAqBTjh9VVAB8FdQppAuSzmkv5N47Ou/7X5w3THQsrWPOBSVxYOZuD1ZpzGO0XQ== X-Received: by 2002:adf:f50c:: with SMTP id q12mr28231447wro.300.1560367607176; Wed, 12 Jun 2019 12:26:47 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id r5sm612526wrg.10.2019.06.12.12.26.45 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 12 Jun 2019 12:26:46 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov , Adrian Reber , Andrei Vagin , Andy Lutomirski , Arnd Bergmann , Christian Brauner , Cyrill Gorcunov , Dmitry Safonov <0x7f454c46@gmail.com>, "Eric W. Biederman" , "H. Peter Anvin" , Ingo Molnar , Jann Horn , Jeff Dike , Oleg Nesterov , Pavel Emelyanov , Shuah Khan , Thomas Gleixner , Vincenzo Frascino , containers@lists.linux-foundation.org, criu@openvz.org, linux-api@vger.kernel.org, x86@kernel.org Subject: [PATCHv4 12/28] x86/vdso/Makefile: Add vobjs32 Date: Wed, 12 Jun 2019 20:26:11 +0100 Message-Id: <20190612192628.23797-13-dima@arista.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190612192628.23797-1-dima@arista.com> References: <20190612192628.23797-1-dima@arista.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Treat ia32/i386 objects in array the same As for 64-bit vdso objects. This is a preparation ground to avoid code duplication on introduction timens vdso. Co-developed-by: Andrei Vagin Signed-off-by: Andrei Vagin Signed-off-by: Dmitry Safonov --- arch/x86/entry/vdso/Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 42fe42e82baf..b58d34120fd8 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -18,6 +18,8 @@ VDSO32-$(CONFIG_IA32_EMULATION) := y # files to link into the vdso vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o +vobjs32-y := vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o +vobjs32-y += vdso32/vclock_gettime.o # files to link into kernel obj-y += vma.o @@ -31,10 +33,12 @@ vdso_img-$(VDSO32-y) += 32 obj-$(VDSO32-y) += vdso32-setup.o vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) +vobjs32 := $(foreach F,$(vobjs32-y),$(obj)/$F) $(obj)/vdso.o: $(obj)/vdso.so targets += vdso.lds $(vobjs-y) +targets += vdso32/vdso32.lds $(vobjs32-y) # Build the vDSO image C files and link them in. vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o) @@ -125,10 +129,6 @@ $(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds) VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -soname linux-gate.so.1 -targets += vdso32/vdso32.lds -targets += vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o -targets += vdso32/vclock_gettime.o - KBUILD_AFLAGS_32 := $(filter-out -m64,$(KBUILD_AFLAGS)) -DBUILD_VDSO $(obj)/vdso32.so.dbg: KBUILD_AFLAGS = $(KBUILD_AFLAGS_32) $(obj)/vdso32.so.dbg: asflags-$(CONFIG_X86_64) += -m32 @@ -153,12 +153,7 @@ endif $(obj)/vdso32.so.dbg: KBUILD_CFLAGS = $(KBUILD_CFLAGS_32) -$(obj)/vdso32.so.dbg: FORCE \ - $(obj)/vdso32/vdso32.lds \ - $(obj)/vdso32/vclock_gettime.o \ - $(obj)/vdso32/note.o \ - $(obj)/vdso32/system_call.o \ - $(obj)/vdso32/sigreturn.o +$(obj)/vdso32.so.dbg: $(obj)/vdso32/vdso32.lds $(vobjs32) FORCE $(call if_changed,vdso) # -- 2.22.0