From patchwork Sun Nov 4 13:51:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 150122 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1550198ljp; Sun, 4 Nov 2018 06:06:17 -0800 (PST) X-Google-Smtp-Source: AJdET5f+2RsBlY8ndAsmOD08js5yJOSj0Or9ZpfAbJyZNJjv/KlUq/OwssPkkEkp8ndn/omNd2ll X-Received: by 2002:a17:902:7241:: with SMTP id c1-v6mr12802510pll.143.1541340377074; Sun, 04 Nov 2018 06:06:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541340377; cv=none; d=google.com; s=arc-20160816; b=bdQe40Z7OBoIy51qpNSZk6swZkrp35oLpQaJ5SnMYIqknD49if1J8ZdMlO/si9J7Xt D4CdrOZJ8C3XDwR+KD3ylhPbd8kzsrsycSl3KK164ujqmmEcadIROn6Ds691+KPlDThG C3WsvuZeilsT44aLznOMYVdhGkl7BRrGX1Yt9hNRD24sxozobhniyUwUT/u+n4b2j3uw TWJvD6BnVRhlKZ4pFjVA4p/8XO+f+59P3flecV9HCCLwRhYNCEDkkT29EfJmNsOnevAZ wV7yEp8LdBUrVDDF7f4Mg/PJrWncRwN8oKwZWxcZgZRycP9gNUoHcnsUYNLIg3w0iKno VzMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=7oXcIrqtSmuyBPYUG1e+EHqqso2pIJMI76WGppdfM4s=; b=hCe89PSt/hNr6jWzHXLk1aQtw/KSgZNZ6+0QBhbuGtop1dNGLy3mAXh+L38KSUWKmV vGkEMRoiC7y40FuyX7GQJtt56VW3zfgOVy5HkIQON2OANHcA1X5oLkOiFeaAqIKs0DFT JhZsuR76ujgFbdSFBBQtylIRGNLj1PtPtxsvYb7gFxkMA0yixs/XIa93Od8xOtUtGaRU vBBRJaY6M1IQmw8XS+rsOCn4jpkIAjCefa55hlPan1sxuyWqrccJn0sg/6hZx1+aB0oI WyHaP6TbVLtZ+iwmSItnM/phx/Alo/YZMJNJDGCap5AzKa8LCmf3KLCVrC0c8mvXjZOH G9KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="HUeXV/TT"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u2-v6si39412220pgi.329.2018.11.04.06.06.16; Sun, 04 Nov 2018 06:06:17 -0800 (PST) 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="HUeXV/TT"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730708AbeKDXVW (ORCPT + 32 others); Sun, 4 Nov 2018 18:21:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:45258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730327AbeKDXH2 (ORCPT ); Sun, 4 Nov 2018 18:07:28 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A82B020868; Sun, 4 Nov 2018 13:52:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541339544; bh=M+nlvSSWJ6LODF+My80H6Ek0nsvcQgbQobsSHZ3QULs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HUeXV/TTlxlQJOHbAa6/9Hjb2KblbTxPVqROl74+H8HB+ZZU9iptb1fDisrXElfmL g425SIaF6zkG+6KtIbHZZKKsQii67ToBbnANHgW8eS9XjkROc7OJ24mFM18JWSqhFV F96MR9pFQlCLi5+vnMV/HhI9yL1/QVc21m2OTgZQ= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Joel Stanley , Michael Ellerman , Sasha Levin Subject: [PATCH AUTOSEL 4.19 39/57] powerpc/boot: Ensure _zimage_start is a weak symbol Date: Sun, 4 Nov 2018 08:51:26 -0500 Message-Id: <20181104135144.88324-39-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181104135144.88324-1-sashal@kernel.org> References: <20181104135144.88324-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joel Stanley [ Upstream commit ee9d21b3b3583712029a0db65a4b7c081d08d3b3 ] When building with clang crt0's _zimage_start is not marked weak, which breaks the build when linking the kernel image: $ objdump -t arch/powerpc/boot/crt0.o |grep _zimage_start$ 0000000000000058 g .text 0000000000000000 _zimage_start ld: arch/powerpc/boot/wrapper.a(crt0.o): in function '_zimage_start': (.text+0x58): multiple definition of '_zimage_start'; arch/powerpc/boot/pseries-head.o:(.text+0x0): first defined here Clang requires the .weak directive to appear after the symbol is declared. The binutils manual says: This directive sets the weak attribute on the comma separated list of symbol names. If the symbols do not already exist, they will be created. So it appears this is different with clang. The only reference I could see for this was an OpenBSD mailing list post[1]. Changing it to be after the declaration fixes building with Clang, and still works with GCC. $ objdump -t arch/powerpc/boot/crt0.o |grep _zimage_start$ 0000000000000058 w .text 0000000000000000 _zimage_start Reported to clang as https://bugs.llvm.org/show_bug.cgi?id=38921 [1] https://groups.google.com/forum/#!topic/fa.openbsd.tech/PAgKKen2YCY Signed-off-by: Joel Stanley Reviewed-by: Nick Desaulniers Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin --- arch/powerpc/boot/crt0.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/arch/powerpc/boot/crt0.S b/arch/powerpc/boot/crt0.S index dcf2f15e6797..32dfe6d083f3 100644 --- a/arch/powerpc/boot/crt0.S +++ b/arch/powerpc/boot/crt0.S @@ -47,8 +47,10 @@ p_end: .long _end p_pstack: .long _platform_stack_top #endif - .weak _zimage_start .globl _zimage_start + /* Clang appears to require the .weak directive to be after the symbol + * is defined. See https://bugs.llvm.org/show_bug.cgi?id=38921 */ + .weak _zimage_start _zimage_start: .globl _zimage_start_lib _zimage_start_lib: