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=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT 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 061C4C10F14 for ; Thu, 11 Apr 2019 13:58:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB44F21850 for ; Thu, 11 Apr 2019 13:58:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554991088; bh=0ndrvF4BklnBmd1y5uCZyOG0ysrb94dB/7e6r2HwANM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=sYl5cM/wU/hV0LGFKej9Md2imuGfjsAvKkSalDIpaOzDmPjCT44w2INiG4xnk7Y1L jejpDZnTEnGmvo38VEoBwpQfMAbd5M8/DVQWRgPECO2P/a2LLp2fcX5+Jq9Krz92ep /jNIcg0UWbDB3HI7gnPSFB6ItQjJtX7BnNBq4PYI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726723AbfDKN6I (ORCPT ); Thu, 11 Apr 2019 09:58:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:50128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726106AbfDKN6I (ORCPT ); Thu, 11 Apr 2019 09:58:08 -0400 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A2A8F2077C; Thu, 11 Apr 2019 13:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554991087; bh=0ndrvF4BklnBmd1y5uCZyOG0ysrb94dB/7e6r2HwANM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ey3x1rQWUPjDSUa+qPOiH+XCRYXwkedSEhWMRGTTj+ezvhEjXUyn+PTiQKGCj0OQ8 z47xVo3KTYcJnbPq5a6j4ETS98APJlBWeTGRNSOfTQzNgSBDA27FYY8FPeJWiSWYoz tiP16w1T9lv66ZoDrSXv+Zre6v+xwp2ssuh1+V2w= Date: Thu, 11 Apr 2019 09:58:04 -0400 From: Sasha Levin To: Nathan Chancellor Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alistair Strachan , Sami Tolvanen , Nick Desaulniers Subject: Re: LLD patches for x86_64 Message-ID: <20190411135804.GI11568@sasha-vm> References: <20190411035143.GA14196@archlinux-i9> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20190411035143.GA14196@archlinux-i9> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Wed, Apr 10, 2019 at 08:51:43PM -0700, Nathan Chancellor wrote: >Hi Greg and Sasha, > >Please apply the following mbox files to their respective trees. They >contain upstream patches that allow a tip of tree LLD to link an x86 >kernel image as well as a patch to avoid using $(LD) to check for >the location of binutils, which won't always be accurate when linking >with LLD. This was tested with both the upstream defconfig and Android's >x86_64_cuttlefish_defconfig in their respective trees (building/linking >with both Clang/LLD and GCC/ld.bfd then booting in QEMU). > >For 5.0, a simple cherry-pick of commit ad15006cc784 ("kbuild: clang: >choose GCC_TOOLCHAIN_DIR not on LD") will do. > >Greg, the merge into kernel/common will result in two conflicts: > >* Makefile: > Make the diff match upstream commit > ad15006cc784 ("kbuild: clang: choose GCC_TOOLCHAIN_DIR not on LD") > >* arch/x86/entry/vdso/Makefile: > Take the right hand side, effectively replacing common commit > 35b779802c2e ("x86: vdso: Fix leaky vdso linker with CC=clang.") > with the proper upstream commit > 379d98ddf413 ("x86: vdso: Use $LD instead of $CC to link") Nathan, I might be missing something, but ad15006cc784 does not touch arch/x86/entry/vdso/Makefile nor does it generate any conflicts. -- Thanks, Sasha