From patchwork Wed Jun 21 07:56:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 9801033 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 707AA60234 for ; Wed, 21 Jun 2017 07:56:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DE8528521 for ; Wed, 21 Jun 2017 07:56:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 52C3D28548; Wed, 21 Jun 2017 07:56:55 +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 D2E6E28521 for ; Wed, 21 Jun 2017 07:56:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752252AbdFUH4y (ORCPT ); Wed, 21 Jun 2017 03:56:54 -0400 Received: from mail-yb0-f193.google.com ([209.85.213.193]:34520 "EHLO mail-yb0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751758AbdFUH4x (ORCPT ); Wed, 21 Jun 2017 03:56:53 -0400 Received: by mail-yb0-f193.google.com with SMTP id b63so7573289yba.1; Wed, 21 Jun 2017 00:56:53 -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=j8myi7wXq4Wv+vcQvO1/q3b7xpg2hlMZgZ+13W8BNss=; b=olcj0UekWCPOx0dAY5bZGGZugyBT1JBphBuGHtluJ9mZ74P4G4DkBbajYKnotuSyk5 TLeW0wCo/XrUyiylGlfG07+dnDRDCzkmtASCMztLuMV1RIfCzYVThGmbZ3n6FK9xSohB q4D7Ru4nM3j/Qq8CMA989ZP+QaaqNaKktEPXzDwzphHzwJ5BR5ei1yNf0wv4QyzO2/yy mxRLOnQmm4lWtmN7Kxh5PdcSN+U/19gxBnTmeDttOm79zSZ8oXfx/F0Hb1tSYEsQjVot xSSCVurs1CJOynSOMP4ftNfFlk+eYbMYg1Wgdbh/1i/WOHHHK0uAcHF4PRom0ZEHUgSk fRjw== 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=j8myi7wXq4Wv+vcQvO1/q3b7xpg2hlMZgZ+13W8BNss=; b=Cu6vM+BvZK9DgdQ1MXb2F5WHkVT739iAQpW2HEYG4OqMCTD0nBbdLuP65hWn5zsfdD zPfJ/Iv8N0Hf5xgKvl4BDjribrCpdfHX2Duaw4zJyep4WqWcLfgQm+JvAVkjZ/CKbM9c GL5I5PBz5h5ch+LZkddeIW/3uq4mEyRyMBl2BdULyvp0yZXW+BDFD4byAjN/+CJEWvt0 UsJ+Nibc5TG95wYg4IXGweLmViaz78s8RoiVLtUV+KfOx0xNkitZSezvOUHxOnP5jORQ P0jCGAf6GO+0aEed25XPvqb9DXQt6k7ac+FkIJxQJh4c8GswPgic4bYtEyJGaOx39Grl XwpQ== X-Gm-Message-State: AKS2vOxszkRaBmNbW/08p5MWYm3Zq3ya8vpEuVpkuFAfqTSiG+Q4Imtb awy3TWCPX2aChXTi X-Received: by 10.84.224.73 with SMTP id a9mr15210822plt.267.1498031812565; Wed, 21 Jun 2017 00:56:52 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Jun 2017 00:56:51 -0700 (PDT) From: Nicholas Piggin To: Masahiro Yamada Cc: Nicholas Piggin , linux-kbuild@vger.kernel.org, Tony Luck , Fenghua Yu , linux-ia64@vger.kernel.org Subject: [PATCH 1/2] ia64: thin archives fix linking Date: Wed, 21 Jun 2017 17:56:37 +1000 Message-Id: <20170621075638.19251-2-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: Tony Luck Cc: Fenghua Yu Cc: linux-ia64@vger.kernel.org Signed-off-by: Nicholas Piggin --- arch/ia64/Makefile | 1 + arch/ia64/kernel/Makefile.gate | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index c100d780f1eb..302f7edbcfd1 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile @@ -22,6 +22,7 @@ CHECKFLAGS += -m64 -D__ia64=1 -D__ia64__=1 -D_LP64 -D__LP64__ OBJCOPYFLAGS := --strip-all LDFLAGS_vmlinux := -static +LDFLAGS_vmlinux += -R arch/ia64/kernel/gate-syms.o KBUILD_LDFLAGS_MODULE += -T $(srctree)/arch/ia64/module.lds KBUILD_AFLAGS_KERNEL := -mconstant-gp EXTRA := diff --git a/arch/ia64/kernel/Makefile.gate b/arch/ia64/kernel/Makefile.gate index a32903ada016..9d9c69100d35 100644 --- a/arch/ia64/kernel/Makefile.gate +++ b/arch/ia64/kernel/Makefile.gate @@ -14,9 +14,6 @@ GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \ $(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE $(call if_changed,gate) -$(obj)/built-in.o: $(obj)/gate-syms.o -$(obj)/built-in.o: ld_flags += -R $(obj)/gate-syms.o - GATECFLAGS_gate-syms.o = -r $(obj)/gate-syms.o: $(obj)/gate.lds $(obj)/gate.o FORCE $(call if_changed,gate)