From patchwork Mon Feb 26 18:41:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Jarry X-Patchwork-Id: 10243071 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 E4294602DC for ; Mon, 26 Feb 2018 18:43:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D82CE2A183 for ; Mon, 26 Feb 2018 18:43:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCC822A1E7; Mon, 26 Feb 2018 18:43:19 +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_SIGNED, 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 6D3FE2A183 for ; Mon, 26 Feb 2018 18:43:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751570AbeBZSnS (ORCPT ); Mon, 26 Feb 2018 13:43:18 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33623 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbeBZSmo (ORCPT ); Mon, 26 Feb 2018 13:42:44 -0500 Received: by mail-wm0-f66.google.com with SMTP id s206so18275768wme.0 for ; Mon, 26 Feb 2018 10:42:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=x9eU/qsYCP030XprVPnQ6mb4Bcfv+wcwdqxneU12x3o=; b=Q1lQ/ASm/qJFGU2Lc33a8TWzV5zpLvfrmJ/HNYPpw8BYJAx0pECu1Zdxmp1D6bGNJ2 gP0ZJRmASGAoGnTp3dn5JQxIHVRv+fbQsEL11kNmw0zzDd+E80qUKz7wD9BUAGlGRvk6 hF3QfyGynMDx+xbjAPjj4dJwrUWk4pmytFR9QzBKWQIZU1fhJqIVwKvuHIolqQr0gtXw Qs7r1tWYu7nSyd5FC2CXlCcrbMaUuoffob3zaoe3MK/TQz5zHMIga2zP1dFtd2B27WMM KhkcRg/ktHioETkAY0C+Nt+0whP2CUnCZd9hWqc92lTH8RGRbyjX8P5gGKdKi87h0mEj qsCg== 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=x9eU/qsYCP030XprVPnQ6mb4Bcfv+wcwdqxneU12x3o=; b=VSUBpfvBhncE0aDhKtUiK2ljkvkVGtI5B2ewYIFBUV4X4nqrjhJVKjGN4s2opG+c/j ckARUGi37+qOPVzH8UsBEpeynNdPOF/PoaVq5EYmYW7CRslaW4GPFq51qrzjr0dPGzTU kj8GNa4aM7ZwpMMi/BWKZpafyVahDsXfJsq+D4owC3X34rV3HzG4cNIuFEpjhwwEsosf F1FYf1JXqQ0ts3nUh8DF0dwQuqXHvoTGXq1YLB9byWgDgtELw/3M/NgUj3zREjj1fNwP gXVwX5HGuN3BShqDamhWxLxoNsGqyTsYGPJfuHcqxwv3hR6WLDUuNf/NYBYj3H2h50k5 PKnQ== X-Gm-Message-State: APf1xPAoiSwSWW7A+EMPNK/exSQ7A34o5AznW72+B3FtNufUjl4SQvYp OzZJNGtP2VKnnZCEl+fhstX1fA== X-Google-Smtp-Source: AG47ELtzpR+My7EzBAkBKIH0pKQFNPCd6HF1YuVjSENKo0CmPA1iA4hDI6NCEU6NwYWSUaWWLHDlCg== X-Received: by 10.28.174.80 with SMTP id x77mr2162773wme.130.1519670563150; Mon, 26 Feb 2018 10:42:43 -0800 (PST) Received: from tom.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id l11sm7221746wrg.71.2018.02.26.10.42.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Feb 2018 10:42:42 -0800 (PST) From: Robin Jarry To: Masahiro Yamada , Michal Marek Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Josh Poimboeuf , Ingo Molnar Subject: [PATCH v2 3/3] objtool: use global host flags for compilation Date: Mon, 26 Feb 2018 19:41:48 +0100 Message-Id: <2fa138b613417581eca23afd8741aaf75fbf966a.1519668832.git.robin.jarry@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: 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 When libelf headers and libs are not found and CONFIG_UNWINDER_ORC is selected, there is a make error introduced by commit 3dd40cb320fe ("objtool: Upgrade libelf-devel warning to error for CONFIG_ORC_UNWINDER"). Host headers and libs may be in a non-standard location and the check is performed without host flags. Make sure to use host flags for the check and for building objtool. Remove duplicate flags. Fixes: 3b27a0c85d70 ("objtool: Detect and warn if libelf is missing and don't break the build") Signed-off-by: Robin Jarry Cc: Josh Poimboeuf Cc: Ingo Molnar --- Makefile | 2 +- tools/objtool/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f7c543cebfc6..c9dc35fe0e48 100644 --- a/Makefile +++ b/Makefile @@ -955,7 +955,7 @@ export mod_sign_cmd ifdef CONFIG_STACK_VALIDATION has_libelf := $(call try-run,\ - echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0) + echo "int main() {}" | $(HOSTCC) $(HOSTLDFLAGS) -xc -o /dev/null -lelf -,1,0) ifeq ($(has_libelf),1) objtool_target := tools/objtool FORCE else diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile index e6acc281dd37..4d4b810313e2 100644 --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile @@ -31,8 +31,8 @@ INCLUDES := -I$(srctree)/tools/include \ -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \ -I$(srctree)/tools/objtool/arch/$(ARCH)/include WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed -CFLAGS += -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES) -LDFLAGS += -lelf $(LIBSUBCMD) +CFLAGS += $(HOSTCFLAGS) -Werror $(WARNINGS) -g $(INCLUDES) +LDFLAGS += $(HOSTLDFLAGS) -lelf $(LIBSUBCMD) # Allow old libelf to be used: elfshdr := $(shell echo '\#include ' | $(CC) $(CFLAGS) -x c -E - | grep elf_getshdr)