From patchwork Wed May 23 00:19:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 10419793 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B31DE6016C for ; Wed, 23 May 2018 00:20:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3A6228E66 for ; Wed, 23 May 2018 00:20:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97DFA28E6A; Wed, 23 May 2018 00:20:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4B1328E57 for ; Wed, 23 May 2018 00:20:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753573AbeEWAUC (ORCPT ); Tue, 22 May 2018 20:20:02 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:38056 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753619AbeEWATv (ORCPT ); Tue, 22 May 2018 20:19:51 -0400 Received: by mail-pl0-f66.google.com with SMTP id c11-v6so11875350plr.5 for ; Tue, 22 May 2018 17:19:51 -0700 (PDT) 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; bh=Y5f7r9Hpjmjb+DW22BfiZWFvyYog5w7bGmA8kDrysCk=; b=qqiGplrmpmNouFpADINXdLhiH1Y93efqPU6QUsl2G+Pu/semL0MtK9rib+s9d91NVu HGev5bdGQ0CGeBqEo6v9aaggAJFsdXMStyErAT2Dq+cfFuydfctIXs+CM0fZBtxJPN9b UGe8wMqTu6NSQ/hSQhle/PqnJUf4xV+rM0S/olgEtrrFHjSeT/ki/oXcJV7Ln/nbYsSM UuDSY9nkVnLvDL4KzJZ07WAEs5KYvxfK5iQfDChlGdeEbkwft7QsDgwUJqW2CeY/YP6V bCijaa8rVDWHZ82AkSrntQ4eGY9EFyC3KTeYCXXQsBh0rf7BeGlGsjdDK/dCiGRkpwwR IZQQ== X-Gm-Message-State: ALKqPwfx2icIic/R2jjLdQSiFmYo0O2fWC0SDQzF6nmavmkkKHZRw+UY dQXJtxRtVEQFsRCGLdhG9N1YLA== X-Google-Smtp-Source: AB8JxZqXfNW1LEoJFvuXLlGsLX8uFkw3vxpL/ilPWniefjWUAbYku3sP1lGgculT3yvd1FSvZ8kPlg== X-Received: by 2002:a17:902:781:: with SMTP id 1-v6mr634646plj.150.1527034791344; Tue, 22 May 2018 17:19:51 -0700 (PDT) Received: from localhost.net ([2601:602:9802:a8dc::4dc5]) by smtp.gmail.com with ESMTPSA id 206-v6sm29303145pfy.51.2018.05.22.17.19.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 May 2018 17:19:50 -0700 (PDT) From: Laura Abbott To: Andy Lutomirski , mjw@fedoraproject.org, "H . J . Lu" , Masahiro Yamada Cc: Laura Abbott , Linus Torvalds , X86 ML , linux-kernel@vger.kernel.org, Nick Clifton , Cary Coutant , linux-kbuild@vger.kernel.org Subject: [PATCHv3 2/2] x86/vdso: Add build salt to the vDSO Date: Tue, 22 May 2018 17:19:39 -0700 Message-Id: <20180523001939.9431-3-labbott@redhat.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523001939.9431-1-labbott@redhat.com> References: <20180523001939.9431-1-labbott@redhat.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The vDSO is linked separately from the kernel and modules. Ensure it picks up the comment section, if available. Signed-off-by: Laura Abbott --- v3: Invoke the generated linker script. The ".." nightmare is pretty ugly but I didn't see an easier way to pick up the generated file. That was actually part of my motivation for using an #include since paths for those are standardized. --- arch/x86/entry/vdso/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index d998a487c9b1..f54aa97dc9f0 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -162,7 +162,9 @@ $(obj)/vdso32.so.dbg: FORCE \ quiet_cmd_vdso = VDSO $@ cmd_vdso = $(CC) -nostdlib -o $@ \ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ - -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ + -Wl,-T,$(filter %.lds,$^) \ + -Wl,-T$(obj)/../../../../scripts/build-salt.lds \ + $(filter %.o,$^) && \ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \