From patchwork Fri Aug 14 10:52:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Fedin X-Patchwork-Id: 7014361 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B0D14C05AC for ; Fri, 14 Aug 2015 10:52:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E415E20737 for ; Fri, 14 Aug 2015 10:52:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 07CC320732 for ; Fri, 14 Aug 2015 10:52:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754180AbbHNKwV (ORCPT ); Fri, 14 Aug 2015 06:52:21 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:16471 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753903AbbHNKwV (ORCPT ); Fri, 14 Aug 2015 06:52:21 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NT200275JJ64S80@mailout2.w1.samsung.com> for linux-kbuild@vger.kernel.org; Fri, 14 Aug 2015 11:52:18 +0100 (BST) X-AuditID: cbfec7f4-f79c56d0000012ee-78-55cdc86217e5 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id DB.1E.04846.268CDC55; Fri, 14 Aug 2015 11:52:18 +0100 (BST) Received: from fedinw7x64.rnd.samsung.ru ([106.109.131.169]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NT20042EJJ1YQB0@eusync3.samsung.com>; Fri, 14 Aug 2015 11:52:18 +0100 (BST) From: Pavel Fedin To: linux-kbuild@vger.kernel.org Cc: trivial@kernel.org, mmarek@suse.com Subject: [PATCH TRIVIAL v2] Avoid conflict with host definitions when cross-compiling Date: Fri, 14 Aug 2015 13:52:13 +0300 Message-id: <1439549533-8716-1-git-send-email-p.fedin@samsung.com> X-Mailer: git-send-email 2.4.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLJMWRmVeSWpSXmKPExsVy+t/xq7pJJ86GGrz/IW7xZ9cOJos5rbPY LN7vv8zkwOyxaVUnm8f6LVdZPD5vkgtgjuKySUnNySxLLdK3S+DKeNNzi7HgKlvFnHv3mBoY d7J2MXJySAiYSEy4sZgRwhaTuHBvPRuILSSwlFFi/lrHLkYuILuNSeJ2+xp2kASbgLrE6a8f WEBsEQEFic6uX0wgNjNQfPPhr2BxYYFwiZ6ty8FsFgFViWULDoLV8Ao4Sew5so0JYpmcxJXr 09kmMHIvYGRYxSiaWppcUJyUnmuoV5yYW1yal66XnJ+7iRHi6S87GBcfszrEKMDBqMTDa9F2 NlSINbGsuDL3EKMEB7OSCO+NPKAQb0piZVVqUX58UWlOavEhRmkOFiVx3rm73ocICaQnlqRm p6YWpBbBZJk4OKUaGCMFulrDogtdAx5N6Xt1g6Fu8X0WaaGVL22qLH9FNm7YsGFGZJw8w9sC uY4U1f4fC47NM4yZvf/5u715T6bNab22PvvYt+DLYcmTHjLfXDop9J3YxdfaqufnzJr0cY7F M3Wxvc2xV/9yHNxft8rpufOSM9plO29Ecyk/Nuaf9Nku3sWJvVfvf6ASS3FGoqEWc1FxIgA+ b3/g8AEAAA== Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Certain platforms (e. g. BSD-based ones) define some ELF constants according to host. This patch fixes problems with cross-building Linux kernel on these platforms (e. g. building ARM 32-bit version on x86-64 host). Signed-off-by: Pavel Fedin --- v1 => v2 - Replaced "Cygwin" with "BSD-alike OS-es" --- scripts/mod/modpost.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 168b43d..6a5e151 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -11,6 +11,12 @@ #include "elfconfig.h" +/* On BSD-alike OSes elf.h defines these according to host's word size */ +#undef ELF_ST_BIND +#undef ELF_ST_TYPE +#undef ELF_R_SYM +#undef ELF_R_TYPE + #if KERNEL_ELFCLASS == ELFCLASS32 #define Elf_Ehdr Elf32_Ehdr