From patchwork Wed Jun 21 07:56:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 9801035 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 5399F60234 for ; Wed, 21 Jun 2017 07:56:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41D6D28521 for ; Wed, 21 Jun 2017 07:56:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36B5028548; Wed, 21 Jun 2017 07:56:58 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 B306628521 for ; Wed, 21 Jun 2017 07:56:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751711AbdFUH45 (ORCPT ); Wed, 21 Jun 2017 03:56:57 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34387 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752339AbdFUH44 (ORCPT ); Wed, 21 Jun 2017 03:56:56 -0400 Received: by mail-pf0-f194.google.com with SMTP id d5so28344422pfe.1 for ; Wed, 21 Jun 2017 00:56:56 -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; bh=8e3BtTL7keG+mLi9ufXebsE53r5IZwau3oqegMjwVys=; b=pmZV6NVblOFmm81Mb3t4wJuRRrlnSkSuLhEBBUP2Vi3HJmoSpWQIoYRMXt5b1MDp/y E0P0gHaaJGWwRf3nJTrHtJ6sfIG+WCBqVjbxadbalOlzinqCc+VZc4adnchPAYKttgzD GSq1SCNv73Ckb8dide3BXz2rIB/D5jfz0+pPl+JOfzYH1ugwYYNi3+JhfhzNzBpQgIzk HO/6h7PGRMtK3oC9cn+5gsWlQn09dPoO5Abg9WNOZZDagl9rMGdUCLkq+ObMZACGDXgW DRn88h4r5nGc5ap4VB582g5ClxmFTnFLg7i7ir9niMt0ZLEH/lXJQAhFOOXbF/sAXmvP 8DYg== 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=8e3BtTL7keG+mLi9ufXebsE53r5IZwau3oqegMjwVys=; b=MUMh758ctOELyaVkMRj09Xhny2yq6GB9mkplB8Ol+IhUMEQWp70huWllyXRdnLFytv KoVwKhkdYVhGhb9ef4HvDVHg0Fkhf4jt8mYEup1e7nm8LsggZIOtEYKwwkANpSeT+1/i uXHDJdgViHAgnQKC5mqOnUX4Bsa+eQDXtSYlVWFkr9pZQDDbdIttmzJMdpHITl6dErQo gfTlwIieNTulAEBmg+rpe1DhZyWvlEPnNXyRIEfp6PcTEhI44Us0Q2vmoUXFi0aMX65q N3VFcmckfH5T4r6SCQbY+Fk/TytAC2tfSD1oc6XpOKlfkY0oEvm3u4tBVRSBIEaoM4A8 MsSA== X-Gm-Message-State: AKS2vOwpz2FmW6I+lyp3MF0bL0FIwx659Uc/UsQhj2z94WAbee0Ve/NP t31ANFfHb0KVGg== X-Received: by 10.101.72.207 with SMTP id o15mr35383098pgs.133.1498031816039; Wed, 21 Jun 2017 00:56:56 -0700 (PDT) Received: from roar.au.ibm.com ([210.185.119.63]) by smtp.gmail.com with ESMTPSA id i14sm31347241pgn.14.2017.06.21.00.56.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Jun 2017 00:56:55 -0700 (PDT) From: Nicholas Piggin To: Masahiro Yamada Cc: Nicholas Piggin , linux-kbuild@vger.kernel.org, Chris Metcalf Subject: [PATCH 2/2] tile: thin archives fix linking Date: Wed, 21 Jun 2017 17:56:38 +1000 Message-Id: <20170621075638.19251-3-npiggin@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170621075638.19251-1-npiggin@gmail.com> References: <20170621075638.19251-1-npiggin@gmail.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 symbols can't be linked into built-in.o when building with thin archives, so change this to linking them into the final link. Cc: Chris Metcalf Signed-off-by: Nicholas Piggin --- arch/tile/Makefile | 2 ++ arch/tile/kernel/vdso/Makefile | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/tile/Makefile b/arch/tile/Makefile index 4dc380a519d4..eb43ffb999b6 100644 --- a/arch/tile/Makefile +++ b/arch/tile/Makefile @@ -30,6 +30,8 @@ endif # In kernel modules, this causes load failures due to unsupported relocations. KBUILD_CFLAGS += -fno-asynchronous-unwind-tables +LDFLAGS_vmlinux += -R arch/tile/kernel/vdso/vdso-syms.o + LIBGCC_PATH := \ $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name) diff --git a/arch/tile/kernel/vdso/Makefile b/arch/tile/kernel/vdso/Makefile index c54fff37b5ff..84daaf2c5e2c 100644 --- a/arch/tile/kernel/vdso/Makefile +++ b/arch/tile/kernel/vdso/Makefile @@ -50,8 +50,6 @@ $(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) # table and layout of the linked DSO. With ld -R we can then refer to # these symbols in the kernel code rather than hand-coded addresses. extra-y += vdso-syms.o -$(obj)/built-in.o: $(obj)/vdso-syms.o -$(obj)/built-in.o: ld_flags += -R $(obj)/vdso-syms.o SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \ $(call cc-ldoption, -Wl$(comma)--hash-style=both)