From patchwork Mon Jul 11 19:51:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 71759 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp116382qga; Mon, 11 Jul 2016 12:51:56 -0700 (PDT) X-Received: by 10.98.37.71 with SMTP id l68mr38301732pfl.38.1468266711321; Mon, 11 Jul 2016 12:51:51 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j10si1080327pax.283.2016.07.11.12.51.43; Mon, 11 Jul 2016 12:51:51 -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=@intel-com.20150623.gappssmtp.com; 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 S1752678AbcGKTvk (ORCPT + 30 others); Mon, 11 Jul 2016 15:51:40 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:37569 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932165AbcGKTvh (ORCPT ); Mon, 11 Jul 2016 15:51:37 -0400 Received: by mail-wm0-f52.google.com with SMTP id i5so32388403wmg.0 for ; Mon, 11 Jul 2016 12:51:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=UzU1ZSW/JT1JOFUbsxceCh/mFIlJ7lVQFE16FErb6dM=; b=1xHdNjKG4k3TJdZgHeJRjuFWDLivvfOZBYUYGNrk7Juy7H4hyr6+QrqoGvYJ9Vq5cO 2rLQ2nZMZRw4JGeCTPNA9zNdBD+vknqC9GVg68i66JjGkfFLuSsS1TTMhYoG1+VB8sqv COMXNE5YA4KtLjIE26cc1Y1nNfVK+7wwKysnSs/2Oq23dM/CNfNF9ckUK6MPhc4wrqA2 GzxiGx0mK0NTf1hHluSj3qzklMWAiZZX357zfM5SW+tVlHmSvjAaAZGNvdAvUEbSoJrm yxsW45kwNrSLA8VB6inXmfOB08/M3zHYPL7XSLQsTVW5EaO/DthME4LskZJtO98ZoSSH SbhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=UzU1ZSW/JT1JOFUbsxceCh/mFIlJ7lVQFE16FErb6dM=; b=WdSlRlR4/e6KGBBHiz4Fk/oDtM8+6eTIk066XIsIAA9sVKBMi1abylB0G/Uq/syKw5 GKkKnQ0To8/oemOfisc3pXXcmXxr5hZuriSctNQOf6MSY9OIP9s/jvrDZ43So1qVJDYs gRDDJEPxrXO+HC4ydi6Q7kixgd0Z8eE2VvpGqedB3CEZaTIzIMN1LOY//LZbaRHFw0s7 R5zFzBfp9TbYBgJjKr46I4C/y2ECbiZJRwjDBDGnvJlWNd+2tHn1IQ/YQLXZiYm+30fK e7qA9D4gu9FdgHbPm94EgtoqXiRyf64iSBsE3S8SY2UlsPdnCUHv6wPUF2KODhHSEM81 nbPQ== X-Gm-Message-State: ALyK8tIWcp3n4IOR3a2kgUFiK1ZAVw1RlUzOp8Xoqjyb4MnHKedb4Q9IVgg0wqSx2oDgh1rN X-Received: by 10.28.31.133 with SMTP id f127mr17326727wmf.90.1468266695111; Mon, 11 Jul 2016 12:51:35 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id c74sm24674569wme.1.2016.07.11.12.51.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jul 2016 12:51:34 -0700 (PDT) From: Ross Burton To: linux-kernel@vger.kernel.org Subject: [PATCH] scripts/recordmcount: improve EM_METAG define checks Date: Mon, 11 Jul 2016 20:51:27 +0100 Message-Id: <1468266687-11634-1-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 2.8.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Current glibc (as of c10f90, soon to be 2.24) has an elf.h which defines EM_METAG but doesn't also define R_METAG_ADDR32 and _NONE. This results in recordmcount not defining any of the META symbols, and the compile failing. Handle this by checking each #define individually instead of assuming the presence. Signed-off-by: Ross Burton --- scripts/recordmcount.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.8.1 diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index e1675927..44ce050 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c @@ -33,10 +33,14 @@ #include #include -#ifndef EM_METAG /* Remove this when these make it to the standard system elf.h. */ +#ifndef EM_METAG #define EM_METAG 174 +#endif +#ifndef R_METAG_ADDR32 #define R_METAG_ADDR32 2 +#endif +#ifndef R_METAG_NONE #define R_METAG_NONE 3 #endif