Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2450496yba; Mon, 15 Apr 2019 11:54:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqxbaLK3mPTqmmjthByZ0EAXJGYYK+VulVEvkPpZUoY7IWy942f09ybxzshPa+dXuiwDlnBm X-Received: by 2002:aa7:91d5:: with SMTP id z21mr77223380pfa.222.1555354480700; Mon, 15 Apr 2019 11:54:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555354480; cv=none; d=google.com; s=arc-20160816; b=eetrtK5fQvfyYXUixyS3dtPOyMajeIlHQNfrGx9N8sEd1OQkPb8e1GyO8/P/3YklcF Z4rlyHFtonYGOQtwhOx+O7KF32kftml1nKWF1VxnzW4a+uruZdn28ufXjC//CzRndxAT e7RRn/jNCLjgYqYpfwJ641GHgGitx6crA2qoCoK5OTsJPc43c6FRmKX+eOdqw9UuZlIG RRnoMvXGeKOsI+OYRlKiDwf8aFsBLoEjQ1AI+C60KLPZYs51M0FvGElgw+osdOSpGbw+ 8lzeVrkwCqTkwtPBg+A2QzxyJwGCqyXZkUhhCiJ+YPx5kAxXLczsc48hUGEjlRShtkXT RfPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iZetsqH2SMnFBqQRqOTtDhVKsAlAfV8nZ3kT7LIvw6Y=; b=uL3MjQteLNjnQaYCg1GgQrqCu++p7/C9AC2Li+S3A8bGLNJKNSwd6/QxpPwUi1MQSO 2Dde9ufnSPSuXZNjKyMOJToHeK+26rc8xLdxMdRbIhXhVhKvqCCTdIeJWWeS/IlInyLL FSMhb5qm0qCtcRIJjxN9kqvcYhfE28VZVOJR3qJTtZfpiw5dieTYum6i9X+ViKBZM+eH /TiJ24gcC1Q8gXcQdloo2VQE//n+XCx7n2GPBXr5ZfpLBe7lt/T/TBVBU9FnBzltD/iw meKoCj1Dh/iGw1UBx8pILfYuoHX12y7GJtkag5vaCzy4H+i78khF6ni5CWQmV6SO/JPO 2W/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=B9DB6Jz+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 193si49495146pfv.108.2019.04.15.11.54.24; Mon, 15 Apr 2019 11:54:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=B9DB6Jz+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728327AbfDOSpP (ORCPT + 99 others); Mon, 15 Apr 2019 14:45:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:47428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728134AbfDOSpK (ORCPT ); Mon, 15 Apr 2019 14:45:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 709F02073F; Mon, 15 Apr 2019 18:45:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555353909; bh=dKiKhBwfxln1skxiM/F2Hvx38E5pV60JRLASeoFUhLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B9DB6Jz+lGLmejh/IxrtQQBQAt+x4z4HXHMregBCfI4Xvbb3Qk53vKQ4aAD7gY956 AFE0z2gs089OOLLDa+J2xhnEI2hep/DCyoX8V3+a3T6uR/kZGuhmNJDVBKP2M3zkNv 6TP3j1K8Uo/a5IG0IqVWDdyYk3fZO5oQf6KjU2/I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alistair Strachan , Thomas Gleixner , Andy Lutomirski , "H. Peter Anvin" , kernel-team@android.com, joel@joelfernandes.org, Andi Kleen , Nathan Chancellor , Sasha Levin Subject: [PATCH 4.9 07/76] x86: vdso: Use $LD instead of $CC to link Date: Mon, 15 Apr 2019 20:43:31 +0200 Message-Id: <20190415183709.105524388@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183707.712011689@linuxfoundation.org> References: <20190415183707.712011689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The vdso{32,64}.so can fail to link with CC=clang when clang tries to find a suitable GCC toolchain to link these libraries with. /usr/bin/ld: arch/x86/entry/vdso/vclock_gettime.o: access beyond end of merged section (782) This happens because the host environment leaked into the cross compiler environment due to the way clang searches for suitable GCC toolchains. Clang is a retargetable compiler, and each invocation of it must provide --target= --gcc-toolchain= to allow it to find the correct binutils for cross compilation. These flags had been added to KBUILD_CFLAGS, but the vdso code uses CC and not KBUILD_CFLAGS (for various reasons) which breaks clang's ability to find the correct linker when cross compiling. Most of the time this goes unnoticed because the host linker is new enough to work anyway, or is incompatible and skipped, but this cannot be reliably assumed. This change alters the vdso makefile to just use LD directly, which bypasses clang and thus the searching problem. The makefile will just use ${CROSS_COMPILE}ld instead, which is always what we want. This matches the method used to link vmlinux. This drops references to DISABLE_LTO; this option doesn't seem to be set anywhere, and not knowing what its possible values are, it's not clear how to convert it from CC to LD flag. Signed-off-by: Alistair Strachan Signed-off-by: Thomas Gleixner Acked-by: Andy Lutomirski Cc: "H. Peter Anvin" Cc: Greg Kroah-Hartman Cc: kernel-team@android.com Cc: joel@joelfernandes.org Cc: Andi Kleen Link: https://lkml.kernel.org/r/20180803173931.117515-1-astrachan@google.com Signed-off-by: Nathan Chancellor Signed-off-by: Sasha Levin --- arch/x86/entry/vdso/Makefile | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index d5409660f5de..2ae92c6b1de6 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -47,10 +47,8 @@ targets += $(vdso_img_sodbg) export CPPFLAGS_vdso.lds += -P -C -VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \ - -Wl,--no-undefined \ - -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 \ - $(DISABLE_LTO) +VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -soname linux-vdso.so.1 --no-undefined \ + -z max-page-size=4096 -z common-page-size=4096 $(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE $(call if_changed,vdso) @@ -96,10 +94,8 @@ CFLAGS_REMOVE_vvar.o = -pg # CPPFLAGS_vdsox32.lds = $(CPPFLAGS_vdso.lds) -VDSO_LDFLAGS_vdsox32.lds = -Wl,-m,elf32_x86_64 \ - -Wl,-soname=linux-vdso.so.1 \ - -Wl,-z,max-page-size=4096 \ - -Wl,-z,common-page-size=4096 +VDSO_LDFLAGS_vdsox32.lds = -m elf32_x86_64 -soname linux-vdso.so.1 \ + -z max-page-size=4096 -z common-page-size=4096 # 64-bit objects to re-brand as x32 vobjs64-for-x32 := $(filter-out $(vobjs-nox32),$(vobjs-y)) @@ -127,7 +123,7 @@ $(obj)/vdsox32.so.dbg: $(src)/vdsox32.lds $(vobjx32s) FORCE $(call if_changed,vdso) CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds) -VDSO_LDFLAGS_vdso32.lds = -m32 -Wl,-m,elf_i386 -Wl,-soname=linux-gate.so.1 +VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -soname linux-gate.so.1 # This makes sure the $(obj) subdirectory exists even though vdso32/ # is not a kbuild sub-make subdirectory. @@ -165,13 +161,13 @@ $(obj)/vdso32.so.dbg: FORCE \ # The DSO images are built using a special linker script. # quiet_cmd_vdso = VDSO $@ - cmd_vdso = $(CC) -nostdlib -o $@ \ + cmd_vdso = $(LD) -nostdlib -o $@ \ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ - -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ + -T $(filter %.lds,$^) $(filter %.o,$^) && \ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \ - $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS) +VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ + $(call ld-option, --build-id) -Bsymbolic GCOV_PROFILE := n # -- 2.19.1