From patchwork Thu Mar 29 18:01:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 10315769 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 5D6BF60353 for ; Thu, 29 Mar 2018 18:01:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 432FC2A349 for ; Thu, 29 Mar 2018 18:01:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37AA32A35C; Thu, 29 Mar 2018 18:01:46 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable 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 D76792A349 for ; Thu, 29 Mar 2018 18:01:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751187AbeC2SB2 (ORCPT ); Thu, 29 Mar 2018 14:01:28 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:44808 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752125AbeC2SBW (ORCPT ); Thu, 29 Mar 2018 14:01:22 -0400 Received: by mail-pf0-f196.google.com with SMTP id m68so3753261pfm.11 for ; Thu, 29 Mar 2018 11:01:22 -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=4gZzQAlQ2S+bsrqYCRTqAjfz5DQ217oh4KxSZvCHLiw=; b=BVQAjF4XMd+jfDWB+KsWT6hmlMej12l/U87ujO/eUIJLCUbZaniAv25jhXn8sNOShi /48fUqH1ERRSJHTm5ZHwjfZIcgjnm6YBi5aWWFIR5cwKHOz/511fgybeXlszZrrAE3rF HN9udRQmoE+a2i1nX+CG44EfJYNq9ZkZZerFHk4CoYRIUPjv6XPqHQL6/ss4J0vwVUTl jIJIeeUy++FIyI5YxsHuUDcr48UpT61sJ958NQz0lAPvZtq+SNa1lmMqINO/8FWIMZn7 KOfmzv2LMKlG3FjzErAOEm883xMlC7G/rdxeJD06sLtauU0gyYf0Q/fRTY6GqrHs8nD9 0BRg== X-Gm-Message-State: AElRT7HdwhjZmnEkI3rdCzwISb2LsDy2ykcY+ff0zEDmkGe1q1inIDe7 jCZUdjpT8cqCRb221nBOH+ACZDUV96c= X-Google-Smtp-Source: AIpwx48VzqOQvGONhVAywcB2W2eKLUAKENU8U8b8VTAzKz2YytgDXKRc3e5Qk4zstRHzNnM55VrKLA== X-Received: by 2002:a17:902:ab88:: with SMTP id f8-v6mr3487150plr.34.1522346481857; Thu, 29 Mar 2018 11:01:21 -0700 (PDT) Received: from localhost.localdomain.utopia.net ([2601:602:9802:a8dc::19fb]) by smtp.gmail.com with ESMTPSA id m21sm4762432pgn.0.2018.03.29.11.01.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Mar 2018 11:01:20 -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: [RFCv2 PATCH 2/3] kbuild: Link with generated build-salt header Date: Thu, 29 Mar 2018 11:01:11 -0700 Message-Id: <20180329180112.11055-3-labbott@redhat.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180329180112.11055-1-labbott@redhat.com> References: <20180329180112.11055-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 Now that we have a header with appropriate data, link it into the kernel and modules. If BUILD_ID_SALT isn't set, the script should be empty. Signed-off-by: Laura Abbott --- v2: Changed names to be consistent --- Makefile | 4 +++- scripts/.gitignore | 1 + scripts/Makefile | 2 +- scripts/build-salt.lds.S | 5 +++++ scripts/link-vmlinux.sh | 3 ++- 5 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 scripts/build-salt.lds.S diff --git a/Makefile b/Makefile index b80c2d6d0854..171f82295e5e 100644 --- a/Makefile +++ b/Makefile @@ -425,7 +425,8 @@ KBUILD_AFLAGS_KERNEL := KBUILD_CFLAGS_KERNEL := KBUILD_AFLAGS_MODULE := -DMODULE KBUILD_CFLAGS_MODULE := -DMODULE -KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds +KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds \ + -T $(srctree)/scripts/build-salt.lds GCC_PLUGINS_CFLAGS := export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC @@ -1004,6 +1005,7 @@ export KBUILD_VMLINUX_INIT := $(head-y) $(init-y) export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-y) export KBUILD_VMLINUX_LIBS := $(libs-y1) export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds +export EXTRA_LDS := scripts/build-salt.lds export LDFLAGS_vmlinux # used by scripts/package/Makefile export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools) diff --git a/scripts/.gitignore b/scripts/.gitignore index 0442c06eefcb..1c840ef4f0c8 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -13,3 +13,4 @@ asn1_compiler extract-cert sign-file insert-sys-cert +build-salt.lds diff --git a/scripts/Makefile b/scripts/Makefile index 25ab143cbe14..47f6ed5b0bcd 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -25,7 +25,7 @@ HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include HOSTLOADLIBES_sign-file = -lcrypto HOSTLOADLIBES_extract-cert = -lcrypto -always := $(hostprogs-y) $(hostprogs-m) +always := $(hostprogs-y) $(hostprogs-m) build-salt.lds # The following hostprogs-y programs are only build on demand hostprogs-y += unifdef diff --git a/scripts/build-salt.lds.S b/scripts/build-salt.lds.S new file mode 100644 index 000000000000..f85981f1187e --- /dev/null +++ b/scripts/build-salt.lds.S @@ -0,0 +1,5 @@ +#include + +SECTIONS { + BUILD_ID_SALT +} diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index be56a1153014..2b57e0139acb 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -93,6 +93,7 @@ modpost_link() vmlinux_link() { local lds="${objtree}/${KBUILD_LDS}" + local extra_lds="${objtree}/${EXTRA_LDS}" local objects if [ "${SRCARCH}" != "um" ]; then @@ -114,7 +115,7 @@ vmlinux_link() fi ${LD} ${LDFLAGS} ${LDFLAGS_vmlinux} -o ${2} \ - -T ${lds} ${objects} + -T ${lds} -T ${extra_lds} ${objects} else if [ -n "${CONFIG_THIN_ARCHIVES}" ]; then objects="-Wl,--whole-archive \